Changed setting to allow game to run on desktop
Rearranged where the logic was processed to keep class behaviour separate