Switched to simpler map, tests, getting ready for image processing.
Start of image processing