lots of work improving `mapper findnew`