First steps of Multiblock, cleaned up code, fixed formatting.