Load up new defer functionality and fix a bunch of .end issues. Reorganization
0.1.2