Moved some responsibility back from Player to Game