Refactor playback

Related Work Items: #6
Refactored playback

Related Work Items: #6