Thoughts on extracting this S3 logic to a new class? There's a decent amount of stuff in `Driver` already.