Major Update

A great Big Update to the framework