More progress on Image Uploader