first stab at adding s3 support everywherel