moveable playhead
Merge branch 'player'