Starting to work on S3 integration.