Added Part 1 bucketing functionality