Continued game logic
One line conflict in ObjectClient... nice...