Add class
Game class
Rename functions