Updated game logic to allow whole game run-through