Cleaned up template, added game classes