Some Updates with S3

Working? No.