Progress . . . still not there yet though