Fixed recursion, started working on game class