Finished initial implementation of new game logic