More Refactoring
Framework  Blocks do not appear. need to fix