Updates to game and major refactoring