Moved stuff around and a list is returned from make_predictors.