Working on some more game logic