Added Game model, refactored