Fixing conflict
Putting in code that integrates playback and controller