Grabbing Good Things from a Revert

Adapting Edits from previously reverted version that were valid to the
new one. Includes OffContact methods and new tracking data.