First semi-successful pass at Desync.
Last bit of clean up.