Made a couple of large changes to the framework