Add S3 Support, changing the API a bit.

Also, he really hates multi-line blocks.