Adds cross validation for CBRs, but also flattens buckets implementation temporarily so we can produce metrics
Adds stuff I forgot to add before