Getting closer; more diags.