continue refactoring game state