More refactoring; starting S3 signing