Need o rework how s3 uploading works