Most tests pass, 95% done ...