Initial commit, begun refactoring and conversion to more readable OOP system design