More refactoring, deciding where things need to be and adding functionality.