Committing draft - s3 implementation is WIP