progress committ #67 moved the calendar but still some small cleanup to do on old calendar code