28 tests passing, 13 to go