Finishing moving cohort definitions into EMR module