Added more hiararchy for blocks.  New system for registering blocks tested and workes