Add Week increment & pull grouping logic out of CSV section