Cohort events

@dan-f @jimabramson @mulby Please review

@stroilova FYI
OK; l I will do this move last to avoid losing comments on the PR