Add S3 Support, changing the API a bit.

Avoid using {...} for multi-line blocks.