Refactor game. Begin buildout of tools