Another ScheduleItem Refactor + Calender Intent Changes