Framework Update

Pushed to feature instead... Should have been in master.