Move to CalendarInterval and add better notifications