Continued work on player