Did some more work on Image