Rewrite #63 on top of the new master with the tests that already exist there.