Replaced 'Player' code to individual class