More work on the player infrastructure.