Add another class for game session, refactor existing code and do some more tweaking