32 tests passing; pretty close now to finishing