+ ScheduleBuilder - Started converting it all into a control