Remove some of the player logic into player class
Continue condensing player logic
Logic overhaul