almost done, 9/13 tests OK