Enough for tonight; got 9/14 tests passing