Made a new Game class, need more refactoring