Tweaked classes and added game logic