Hand-merging in @jasonkarns idea b/c I'm lame.

Closes #54