bucket to data set

DO NOT MERGE

Breaks collectors, review and merge with