wip.
resolving merge conflict.
uploading working again. still working on background thread processing of thumbnails.
getting rid of background job for now.
merging with aws