Improved CV, actually ready for kFold!