Refactor of ScheduleItem + Started work on calendar