Preliminary work on s3 storage.