Beginning multiblock work and big code cleanup