Not fully functional GameController
Resolving merge conflicts