Work on the newly refactored Image component