Add s3 and uploader
Add s3 logic