Finished Framework

Working on integration