Fixing issue #182 and moved blocks onto the focii themselves
Merge errors fixed