Find a mechanism to handle cross-validation