(wip): staging work in progress changes