Yes... I have a partial update here.  I am working on the other half which are the additions for the cc stuff.
What I can do is get all that working and then update this PR for review and we can decide how we want to merge.
Should be later today.