WIP: get map-reduce working with bucket types