Added multi-file upload for S3, need to rewrite more DRY-ly