Finished moving over basic framework code