Settings derp
Reorganize s3 upload logic