Working more on game logic