Adding in the rest of the framework, still needs to be filled out.