Work in progress on player