Finished redoing the framework