Still working on the framework