This PR is getting ready.. any more reviewers before we merge?

I'll comment there, but LGTM and it'll be cool to have!