Sync up changes

This is an intermediate sync…just in case
Refining hmac process

Previous version being tossed out with massive restructure in progress