Refactor complete, or at least the game runs now. There are some weird issues with inhertiance between Entity and Player that need fixing, but they can wait a bit. Some re-encapsulation might also be necessary.