Finished objectifying and refactoring all code