More progress but still not there.