Update

I think I got this all right, tests pass and all that jazz.

Let me know and I can just push this directly instead of having a merge commit for a merge commit.

cc @benjamn, @jeffmo