Moving things back to upload, part 1