Checking in work in progress on S3 support as well as a few other things.