Work on the new Image component