Add starter calendar logic