Full ack. I'll update my branch and ping the PR when ready.