Simplified the player class and implemented some more internal classes. Massive improvement.