The beginnings of a proper diff/estimate feature.