Major refactor in Game code