Tracking WIP patch math
Major cleanup V1
Major cleanup V2
Support for encode/decode data working V1
code cleanup