Added parameters to CohortMethod so we can turn on/off more covariate options.   Also changed age to 5-yr buckets