Much progress, still need more tests.