S3 storage driver for next gen modifications

This still needs some more minor debugging.
No worries, glad we caught it.