Calendar modularization part 2