wip: continue migration; delete stack-blowing cont-m