Slight restructuring, added player class