Refactor (make lots of stuff private and add Game)