Final commit before I start refactoring saving the game.