Refactored playback code [#4]
Fix commit?