Lot's of work on Map stuff.  Tweaked code to work with groovy version of OpenCV.