Refactored classes some more. In the process of moving more options to the GameOptions class