Start of image uploader
Resolved conflict