Implemented refactoring, compiles, but doesn't run yet
made and then undid some minor edits. Still unable to test.