Getting ready to rewrite main game class