First commit of dividing up methods into separate files/classes for more maintainability