Adding more actual game code- a lot of skeleton filler
Fixing main class merge conflict