WIP: Refactoring related to image upload/download.