Calendar modularization part 2 r=millermedeiros