CLEANED UP: player has it's own class now