Moved some functionality out of the model to the player class. More to be moved.