Feature/83 cohort keeps counting days and weeks

I tested this code by visual inspection.