Prepping to implement fix_buckets