Finished up section 2 complete refactorings