Ongoing work on Image API

Some adjustments in the image handler API.
Implement the Mac side of things.