some progress, far from done...