Cohort events

@dan-f @jimabramson @mulby Please review

@stroilova FYI
OK