Added more of the framework, modified the base files slightly.