Right, I'll be happy to update the pull request when we're a bit closer to getting this mergable/merged.