Finish refactoring old code, start writing player code