Move player specific code to player object only