Data over OTR

This is a redo of #233 for the latest master.