(wip): initial steps outline for #604