Rework of the player wrapper in-progress.