Added some failed multiblock code, and did some cleanup