Working ok, about to overhaul playback.