Sure, I can at least get this started, but I'm not sure it should block this pull or a release.