A gentle ping on this issue - updates and build fixes.

Let me know if I need to rebase or adjust it.

Thanks,

Okeg