Redo bucket props

Operations are now builder based.

Pulled out the conversion code into a static util class. 

Adjusted/fixed tests.