added some of the framework