Finally passing some test. Hooray. Lots more work to do.