Removed test code which slipped into commit
Laid out new construct for Image