first pass: connect-pb-bucket args passed as map

Rough first pass: feedback welcome! Not sure if this is quite what you wanted, so please feel free to tell me to complete redo it. :)