First-and-a-half pass

Now with no test failures! (I think)