working on player class
merged