Trying to make some more progress on image uploading... slowly