Start of refactor for player.