WIP: more multiblock refactoring