@joshleibsly maybe we can look at this when you're back so we can get this into master :]