Cleaned up old code to use refactored version. Need to debug playback