#26 - Refactor Log Cohort

#26