Making progress. Lots more to do.