bucket to data set

Merge this after the collector ones have happened