moar s3 stuff done