Perfect. Okay, I'm gonna merge this, but not cut a gem yet.

I think we can accomplish the remaining TODO comment before a new gem release. Sound good?