diff --git a/toast_ui.blazor_calendar.TestProject/toast_ui.blazor_calendar.TestProject/ViewModels/CalendarViewModel.cs b/toast_ui.blazor_calendar.TestProject/toast_ui.blazor_calendar.TestProject/ViewModels/CalendarViewModel.cs
index e71d340..f1d7b8c 100644
--- a/toast_ui.blazor_calendar.TestProject/toast_ui.blazor_calendar.TestProject/ViewModels/CalendarViewModel.cs
+++ b/toast_ui.blazor_calendar.TestProject/toast_ui.blazor_calendar.TestProject/ViewModels/CalendarViewModel.cs
@@ -91,7 +91,10 @@ public async Task InitCalendarDataAsync()
             {
                 useCreationPopup = true,
                 useDetailPopup = true,
-                defaultView = TUICalendarViewName.Month
+                defaultView = TUICalendarViewName.Month,
+                taskView = false,
+                scheduleView = true
+                
             };
 
             var calendarProps = new List<TUICalendarProps>();
diff --git a/toast_ui.blazor_calendar/Models/TUICalendarOptions.cs b/toast_ui.blazor_calendar/Models/TUICalendarOptions.cs
index d1753a3..988ad75 100644
--- a/toast_ui.blazor_calendar/Models/TUICalendarOptions.cs
+++ b/toast_ui.blazor_calendar/Models/TUICalendarOptions.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Text.Json.Serialization;
 using toast_ui.blazor_calendar.Services;
+using toast_ui.blazor_calendar.Services.JsonConverters;
 
 namespace toast_ui.blazor_calendar.Models
 {
@@ -22,14 +23,16 @@ public class TUICalendarOptions
         /// Show the milestone and task in weekly, daily view.
         /// The default value is true. If the value is array, it can be ['milestone', 'task'].
         /// </summary>
-        public string[] taskView { get; set; } = new[] {"milestone", "task"};
+        //[JsonConverter(typeof(TUITaskViewJsonConverter))]
+        public bool taskView { get; set; } = true;
 
         /// <summary>
         /// Show the all day and time grid in weekly, daily view.
         /// The default value is false.
         /// If the value is array, it can be ['allday', 'time'].
         /// </summary>
-        public string[] scheduleView { get; set; } = new[] { "allday", "time" };
+        //public string[] scheduleView { get; set; } = new[] { "allday", "time" };
+        public bool scheduleView { get; set; } = true; 
 
         /// <summary>
         /// themeConfig for custom style.
@@ -122,11 +125,11 @@ private bool CompareMembers(TUICalendarOptions options)
             {
                 return false;
             }
-            if (!taskView.SequenceEqual(options.taskView))
+            if (!taskView.Equals(options.taskView))
             {
                 return false;
             }
-            if (!scheduleView.SequenceEqual(options.scheduleView))
+            if (!scheduleView.Equals(options.scheduleView))
             {
                 return false;
             }
@@ -199,4 +202,17 @@ private TUICalendarViewName(string value)
 
     }
 
+public class TUITaskView
+{
+    private TUITaskView(string[] value)
+    {
+        Value = value;
+    }
+    public string[] Value { get; set; }
+
+    public static TUITaskView MilestoneAndTask { get { return new TUITaskView(new[] { "milestone", "task" });  }}
+    public static TUITaskView Milestone { get { return new TUITaskView(new[] { "milestone" }); } }
+    public static TUITaskView Task { get { return new TUITaskView(new[] { "task" }); } }
+    public static TUITaskView None { get { return new TUITaskView(new[] { "" }); } }
+}
 }
\ No newline at end of file
diff --git a/toast_ui.blazor_calendar/Models/TUISchedule.cs b/toast_ui.blazor_calendar/Models/TUISchedule.cs
index 95a9d72..a48d9bb 100644
--- a/toast_ui.blazor_calendar/Models/TUISchedule.cs
+++ b/toast_ui.blazor_calendar/Models/TUISchedule.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Text.Json.Serialization;
 using toast_ui.blazor_calendar.Services;
+using toast_ui.blazor_calendar.Services.JsonConverters;
 
 namespace toast_ui.blazor_calendar.Models
 {
diff --git a/toast_ui.blazor_calendar/NpmJS/src/index.js b/toast_ui.blazor_calendar/NpmJS/src/index.js
index 62e0478..03251ab 100644
--- a/toast_ui.blazor_calendar/NpmJS/src/index.js
+++ b/toast_ui.blazor_calendar/NpmJS/src/index.js
@@ -131,4 +131,8 @@ window.TUICalendar = {
         return TUICalendar.calendarRef.getDateRangeEnd();
     },
 
+    scrollToNow: function () {
+        TUICalendar.calendarRef.scrollToNow();
+    }
+
 }
\ No newline at end of file
diff --git a/toast_ui.blazor_calendar/Services/ITUICalendarInteropService.cs b/toast_ui.blazor_calendar/Services/ITUICalendarInteropService.cs
index 1348986..0682238 100644
--- a/toast_ui.blazor_calendar/Services/ITUICalendarInteropService.cs
+++ b/toast_ui.blazor_calendar/Services/ITUICalendarInteropService.cs
@@ -20,5 +20,7 @@ public interface ITUICalendarInteropService
         ValueTask<DateTimeOffset?> GetDateRangeStart();
         ValueTask<DateTimeOffset?> GetDateRangeEnd();
         ValueTask SetCalendarOptionsAsync(TUICalendarOptions calendarOptions);
+        void ScrollToNow();
+
     }
 }
\ No newline at end of file
diff --git a/toast_ui.blazor_calendar/Services/TUICalendarViewNameJsonConverter.cs b/toast_ui.blazor_calendar/Services/JsonConverters/TUICalendarViewNameJsonConverter.cs
similarity index 96%
rename from toast_ui.blazor_calendar/Services/TUICalendarViewNameJsonConverter.cs
rename to toast_ui.blazor_calendar/Services/JsonConverters/TUICalendarViewNameJsonConverter.cs
index 48440c8..a23a081 100644
--- a/toast_ui.blazor_calendar/Services/TUICalendarViewNameJsonConverter.cs
+++ b/toast_ui.blazor_calendar/Services/JsonConverters/TUICalendarViewNameJsonConverter.cs
@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using toast_ui.blazor_calendar.Models;
 
-namespace toast_ui.blazor_calendar.Services
+namespace toast_ui.blazor_calendar.Services.JsonConverters
 {
     class TUICalendarViewNameJsonConverter : JsonConverter<TUICalendarViewName>
     {
diff --git a/toast_ui.blazor_calendar/Services/TZDateJsonConverter.cs b/toast_ui.blazor_calendar/Services/JsonConverters/TZDateJsonConverter.cs
similarity index 97%
rename from toast_ui.blazor_calendar/Services/TZDateJsonConverter.cs
rename to toast_ui.blazor_calendar/Services/JsonConverters/TZDateJsonConverter.cs
index a5baf01..7854725 100644
--- a/toast_ui.blazor_calendar/Services/TZDateJsonConverter.cs
+++ b/toast_ui.blazor_calendar/Services/JsonConverters/TZDateJsonConverter.cs
@@ -7,7 +7,7 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace toast_ui.blazor_calendar.Services
+namespace toast_ui.blazor_calendar.Services.JsonConverters
 {
     class TZDateJsonConverter : JsonConverter<DateTimeOffset>
     {
diff --git a/toast_ui.blazor_calendar/Services/TUICalendarInteropService.cs b/toast_ui.blazor_calendar/Services/TUICalendarInteropService.cs
index 6ee80ba..6d75189 100644
--- a/toast_ui.blazor_calendar/Services/TUICalendarInteropService.cs
+++ b/toast_ui.blazor_calendar/Services/TUICalendarInteropService.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.JSInterop;
 using toast_ui.blazor_calendar.Models;
+using toast_ui.blazor_calendar.Services.JsonConverters;
 
 namespace toast_ui.blazor_calendar.Services
 {
@@ -15,7 +15,6 @@ namespace toast_ui.blazor_calendar.Services
     /// </summary>
     public class TUICalendarInteropService : ITUICalendarInteropService, IAsyncDisposable
     {
-
         private readonly IJSRuntime _JSRuntime;
 
         //private DotNetObjectReference<TUICalendar> ObjectReference;
@@ -25,24 +24,9 @@ public TUICalendarInteropService(IJSRuntime jsRuntime)
             _JSRuntime = jsRuntime;
         }
 
-        /// <summary>
-        /// Initialize the Calendar
-        /// </summary>
-        /// <param name="objectReference"></param>
-        /// <returns></returns>
-        public async ValueTask InitCalendarAsync(DotNetObjectReference<TUICalendar> objectReference, TUICalendarOptions calendarOptions)
-        {
-            await _JSRuntime.InvokeVoidAsync("TUICalendar.initializeCalendar", objectReference, calendarOptions);
-        }
-
-        /// <summary>
-        /// Sets Calendar Options
-        /// </summary>
-        /// <param name="calendarOptions"></param>
-        /// <returns></returns>
-        public async ValueTask SetCalendarOptionsAsync(TUICalendarOptions calendarOptions)
+        public async ValueTask ChangeView(TUICalendarViewName viewName)
         {
-            await _JSRuntime.InvokeVoidAsync("TUICalendar.setCalendarOptions", calendarOptions);
+            await _JSRuntime.InvokeVoidAsync("TUICalendar.changeView", viewName.Value);
         }
 
         /// <summary>
@@ -58,27 +42,41 @@ public async ValueTask CreateSchedulesAsync(IEnumerable<TUISchedule> schedules)
             }
         }
 
-        /// <summary>
-        /// Set the calendars' properties via TUICalendarProps 
-        /// </summary>
-        /// <param name="calendars"></param>
-        /// <returns></returns>
-        public async ValueTask SetCalendars(IEnumerable<TUICalendarProps> calendars)
+        public ValueTask DisposeAsync()
         {
-            if (calendars is not null)
-            {
-                await _JSRuntime.InvokeVoidAsync("TUICalendar.setCalendars", calendars);
-            }
+            return new ValueTask();
+            //throw new NotImplementedException();
         }
 
-        public async ValueTask ChangeView(TUICalendarViewName viewName)
+        public async ValueTask<DateTimeOffset?> GetDateRangeEnd()
         {
-            await _JSRuntime.InvokeVoidAsync("TUICalendar.changeView", viewName.Value);
+            var result = await _JSRuntime.InvokeAsync<JsonElement>("TUICalendar.getDateRangeEnd");
+            var deserializeOptions = new JsonSerializerOptions();
+            deserializeOptions.Converters.Add(new TZDateJsonConverter());
+            return JsonSerializer.Deserialize<DateTimeOffset?>(result.ToString(), deserializeOptions);
         }
 
-        public TUISchedule UpdateSchedule(TUISchedule scheduleToModify, JsonElement changedSchedule)
+        public async ValueTask<DateTimeOffset?> GetDateRangeStart()
         {
-            return CombineTuiSchedule(scheduleToModify, changedSchedule);
+            var result = await _JSRuntime.InvokeAsync<JsonElement>("TUICalendar.getDateRangeStart");
+            var deserializeOptions = new JsonSerializerOptions();
+            deserializeOptions.Converters.Add(new TZDateJsonConverter());
+            return JsonSerializer.Deserialize<DateTimeOffset?>(result.ToString(), deserializeOptions);
+        }
+
+        public async ValueTask HideShowCalendar(string calendarId, bool hide)
+        {
+            await _JSRuntime.InvokeVoidAsync("hideShowCalendar", calendarId, hide);
+        }
+
+        /// <summary>
+        /// Initialize the Calendar
+        /// </summary>
+        /// <param name="objectReference"></param>
+        /// <returns></returns>
+        public async ValueTask InitCalendarAsync(DotNetObjectReference<TUICalendar> objectReference, TUICalendarOptions calendarOptions)
+        {
+            await _JSRuntime.InvokeVoidAsync("TUICalendar.initializeCalendar", objectReference, calendarOptions);
         }
 
         /// <summary>
@@ -94,9 +92,11 @@ public async ValueTask MoveCalendar(CalendarMove moveTo)
                 case CalendarMove.Next:
                     value = 1;
                     break;
+
                 case CalendarMove.Previous:
                     value = -1;
                     break;
+
                 case CalendarMove.Today:
                     value = 0;
                     break;
@@ -104,6 +104,53 @@ public async ValueTask MoveCalendar(CalendarMove moveTo)
             await _JSRuntime.InvokeVoidAsync("TUICalendar.moveToNextOrPreviousOrToday", value);
         }
 
+        /// <summary>
+        /// Scroll to current time on today in daily or weekly view
+        /// </summary>
+        public void ScrollToNow()
+        {
+            _JSRuntime.InvokeVoidAsync("TUICalendar.scrollToNow");
+        }
+
+        /// <summary>
+        /// Sets Calendar Options
+        /// </summary>
+        /// <param name="calendarOptions"></param>
+        /// <returns></returns>
+        public async ValueTask SetCalendarOptionsAsync(TUICalendarOptions calendarOptions)
+        {
+            await _JSRuntime.InvokeVoidAsync("TUICalendar.setCalendarOptions", calendarOptions);
+        }
+        /// <summary>
+        /// Set the calendars' properties via TUICalendarProps
+        /// </summary>
+        /// <param name="calendars"></param>
+        /// <returns></returns>
+        public async ValueTask SetCalendars(IEnumerable<TUICalendarProps> calendars)
+        {
+            if (calendars is not null)
+            {
+                await _JSRuntime.InvokeVoidAsync("TUICalendar.setCalendars", calendars);
+            }
+        }
+        public async ValueTask SetDate(DateTimeOffset? dateToDisplay)
+        {
+            if (dateToDisplay is not null)
+            {
+                await _JSRuntime.InvokeVoidAsync("TUICalendar.setDate", dateToDisplay);
+            }
+        }
+
+        /// <summary>
+        /// Call when an updated schedule has been returned from the calendar
+        /// </summary>
+        /// <param name="scheduleToModify">Current Schedule Object</param>
+        /// <param name="changedSchedule">The changes made to the schedule</param>
+        /// <returns>The changed schedule ready to further processing and/or saving</returns>
+        public TUISchedule UpdateSchedule(TUISchedule scheduleToModify, JsonElement changedSchedule)
+        {
+            return CombineTuiSchedule(scheduleToModify, changedSchedule);
+        }
         private TUISchedule CombineTuiSchedule(TUISchedule schedule, JsonElement changes)
         {
             var c = JsonSerializer.Deserialize<TUISchedule>(changes.ToString());
@@ -125,42 +172,5 @@ private void CopyValues<T>(T target, T source)
                     prop.SetValue(target, value, null);
             }
         }
-
-        public ValueTask DisposeAsync()
-        {
-            return new ValueTask();
-            //throw new NotImplementedException();
-        }
-
-        public async ValueTask HideShowCalendar(string calendarId, bool hide)
-        {
-            await _JSRuntime.InvokeVoidAsync("hideShowCalendar", calendarId, hide);
-        }
-
-        public async ValueTask SetDate(DateTimeOffset? dateToDisplay)
-        {
-            if (dateToDisplay is not null)
-            {
-                await _JSRuntime.InvokeVoidAsync("TUICalendar.setDate", dateToDisplay);
-            }
-        }
-
-        public async ValueTask<DateTimeOffset?> GetDateRangeStart()
-        {
-            var result = await _JSRuntime.InvokeAsync<JsonElement>("TUICalendar.getDateRangeStart");
-            var deserializeOptions = new JsonSerializerOptions();
-            deserializeOptions.Converters.Add(new TZDateJsonConverter());
-            return JsonSerializer.Deserialize<DateTimeOffset?>(result.ToString(), deserializeOptions);
-            
-        }
-
-        public async ValueTask<DateTimeOffset?> GetDateRangeEnd()
-        {
-            var result = await _JSRuntime.InvokeAsync<JsonElement>("TUICalendar.getDateRangeEnd");
-            var deserializeOptions = new JsonSerializerOptions();
-            deserializeOptions.Converters.Add(new TZDateJsonConverter());
-            return JsonSerializer.Deserialize<DateTimeOffset?>(result.ToString(), deserializeOptions);
-        }
-
     }
-}
+}
\ No newline at end of file
diff --git a/toast_ui.blazor_calendar/TUICalendar.razor.cs b/toast_ui.blazor_calendar/TUICalendar.razor.cs
index 3e2def4..c75173f 100644
--- a/toast_ui.blazor_calendar/TUICalendar.razor.cs
+++ b/toast_ui.blazor_calendar/TUICalendar.razor.cs
@@ -15,41 +15,30 @@
 
 namespace toast_ui.blazor_calendar
 {
-    public partial class TUICalendar : ComponentBase, IDisposable
+    /// <summary>
+    /// Enum Used to Advance the Calendar Forward, Reverse, or to Today
+    /// </summary>
+    public enum CalendarMove
     {
+        Next,
+        Previous,
+        Today
+    }
 
-        public TUICalendarInteropService CalendarInterop { get; private set; } = null;
-
-        [Inject]
-        public IJSRuntime jsRuntime { get; set; }
-
-        [Parameter]
-        public EventCallback<TUISchedule> OnChangeCalendarEventOrTask { get; set; }
-
-        [Parameter]
-        public EventCallback<TUISchedule> OnCreateCalendarEventOrTask { get; set; }
-
-        [Parameter]
-        public EventCallback<string> OnClickCalendarEventOrTask { get; set; }
+    public partial class TUICalendar : ComponentBase, IDisposable
+    {
 
-        [Parameter]
-        public EventCallback<string> OnDeleteCalendarEventOrTask { get; set; }
+        private DotNetObjectReference<TUICalendar> _ObjectReference;
         
         /// <summary>
-        /// Not Working
+        /// Used to Queue events in SetParametersAsync. Code cannot be left until after all parameters have been set
         /// </summary>
-        /*
-        [Parameter]
-        public EventCallback<string> OnDoubleClickCalendarEventOrTask { get; set; }
-        */
-
+        private Queue<Task> _OnParameterChangeEvents = new Queue<Task>();
 
         /// <summary>
-        /// IEnumerable of all events/tasks etc of type TUISchedule.
-        /// The initial set to be loaded
+        /// Direct access to some calendar functions via the Interop
         /// </summary>
-        [Parameter]
-        public IEnumerable<TUISchedule> Schedules { get; set; }
+        public TUICalendarInteropService CalendarInterop { get; private set; } = null;
 
         /// <summary>
         /// Calendar display options and defaults, can be null
@@ -82,18 +71,48 @@ public partial class TUICalendar : ComponentBase, IDisposable
         [Parameter]
         public DateTimeOffset? GoToDate { get; set; }
 
+        [Inject]
+        public IJSRuntime jsRuntime { get; set; }
+
         /// <summary>
-        /// The Start Date of the Range of days displayed on the calendar
+        /// Invoked when a calendar Event or Task is changed
         /// </summary>
         [Parameter]
-        public DateTimeOffset? VisibleStartDateRange { get; set; }
+        public EventCallback<TUISchedule> OnChangeCalendarEventOrTask { get; set; }
+
+        /// <summary>
+        /// Invoked when a calendar Event or Task is Clicked
+        /// </summary>
+        [Parameter]
+        public EventCallback<string> OnClickCalendarEventOrTask { get; set; }
+
+        /// <summary>
+        /// Raised when a calendar Event or Task is Created
+        /// </summary>
+        [Parameter]
+        public EventCallback<TUISchedule> OnCreateCalendarEventOrTask { get; set; }
         
         /// <summary>
-        /// The Start Date of the Range of days displayed on the calendar
+        /// Raised when a calendar Event or Task is Deleted
         /// </summary>
         [Parameter]
-        public EventCallback<DateTimeOffset?> VisibleStartDateRangeChanged { get; set; }
+        public EventCallback<string> OnDeleteCalendarEventOrTask { get; set; }
+        
+        /// <summary>
+        /// Not Working
+        /// </summary>
+        /*
+        [Parameter]
+        public EventCallback<string> OnDoubleClickCalendarEventOrTask { get; set; }
+        */
 
+        /// <summary>
+        /// IEnumerable of all events/tasks etc of type TUISchedule.
+        /// This is the initial set of schedules/events to be loaded
+        /// </summary>
+        [Parameter]
+        public IEnumerable<TUISchedule> Schedules { get; set; }
+        
         /// <summary>
         /// The End Date of the Range of days displated on the calendar
         /// </summary>
@@ -107,32 +126,22 @@ public partial class TUICalendar : ComponentBase, IDisposable
         public EventCallback<DateTimeOffset?> VisibleEndDateRangeChanged { get; set; }
 
         /// <summary>
-        /// Call this method and Advance the calendar, in any view, forward,backward, or to today.
+        /// The Start Date of the Range of days displayed on the calendar
         /// </summary>
-        /// <param name="moveTo">Previous, Next, or Today</param>
-        /// <returns></returns>
-        public async ValueTask MoveCalendar(CalendarMove moveTo)
-        {
-            await CalendarInterop.MoveCalendar(moveTo);
-            await SetDateRange();
-        }
-
-        private DotNetObjectReference<TUICalendar> _ObjectReference;
+        [Parameter]
+        public DateTimeOffset? VisibleStartDateRange { get; set; }
         
         /// <summary>
-        /// Used to Queue events in SetParametersAsync. Code cannot be left until after all parameters have been set
+        /// The Start Date of the Range of days displayed on the calendar
         /// </summary>
-        private Queue<Task> _OnParameterChangeEvents = new Queue<Task>();
-
-        [JSInvokable("UpdateSchedule")]
-        public async Task UpdateSchedule(dynamic scheduleBeingModified, dynamic updatedScheduleFields)
-        {
-            var currentSchedule = JsonSerializer.Deserialize<TUISchedule>(scheduleBeingModified.ToString());
-            var updatedSchedule = CalendarInterop.UpdateSchedule(currentSchedule, updatedScheduleFields); //Todo: Combine changes with actual schedule
-            await OnChangeCalendarEventOrTask.InvokeAsync(updatedSchedule); //Todo: Test This callback!
-            Debug.WriteLine($"Schedule {currentSchedule.Id} Modified");
-        }
-
+        [Parameter]
+        public EventCallback<DateTimeOffset?> VisibleStartDateRangeChanged { get; set; }
+        
+        /// <summary>
+        /// When the user created a new schedule from the UI
+        /// </summary>
+        /// <param name="newSchedule"></param>
+        /// <returns></returns>
         [JSInvokable("CreateSchedule")]
         public async Task CreateSchedule(JsonElement newSchedule)
         {
@@ -141,23 +150,33 @@ public async Task CreateSchedule(JsonElement newSchedule)
             await OnCreateCalendarEventOrTask.InvokeAsync(schedule);
             Debug.WriteLine("New Schedule Created");
         }
-        
-        [JSInvokable("OnClickSchedule")]
-        public async Task OnScheduleClick(string scheduleId)
+
+        public void Dispose()
         {
-            await OnClickCalendarEventOrTask.InvokeAsync(scheduleId);
-            Debug.WriteLine($"Schedule {scheduleId} Clicked!");
+            GC.SuppressFinalize(this);
+            if (_ObjectReference != null)
+            {
+                //Now dispose our object reference so our component can be garbage collected
+                _ObjectReference.Dispose();
+            }
         }
 
-        /*@Todo: Waiting for Double click in TUI API
-        [JSInvokable("OnDoubleClickSchedule")]
-        public async Task OnScheduleDoubleClick(string scheduleId)
+        /// <summary>
+        /// Call this method and Advance the calendar, in any view, forward,backward, or to today.
+        /// </summary>
+        /// <param name="moveTo">Previous, Next, or Today</param>
+        /// <returns></returns>
+        public async ValueTask MoveCalendar(CalendarMove moveTo)
         {
-            await OnDoubleClickCalendarEventOrTask.InvokeAsync(scheduleId);
-            Debug.WriteLine($"Schedule {scheduleId} Double-Clicked!");
+            await CalendarInterop.MoveCalendar(moveTo);
+            await SetDateRange();
         }
-        */
-
+        
+        /// <summary>
+        /// When a schedule is deleted from calendar UI, this is invoked        
+        /// </summary>
+        /// <param name="scheduleId"></param>
+        /// <returns></returns>
         [JSInvokable("DeleteSchedule")]
         public async Task OnDeleteSchedule(string scheduleId)
         {
@@ -165,13 +184,16 @@ public async Task OnDeleteSchedule(string scheduleId)
             Debug.WriteLine($"Schedule {scheduleId} Deleted!");
         }
 
-        protected override void OnInitialized()
+        /// <summary>
+        /// When a schedule is clicked from the calendar UI, this is invoked
+        /// </summary>
+        /// <param name="scheduleId"></param>
+        /// <returns></returns>
+        [JSInvokable("OnClickSchedule")]
+        public async Task OnScheduleClick(string scheduleId)
         {
-            _ObjectReference = DotNetObjectReference.Create(this);
-            if (CalendarInterop is null)
-            {
-                CalendarInterop = new TUICalendarInteropService(jsRuntime);
-            }
+            await OnClickCalendarEventOrTask.InvokeAsync(scheduleId);
+            Debug.WriteLine($"Schedule {scheduleId} Clicked!");
         }
 
         /// <summary>
@@ -188,7 +210,7 @@ public override async Task SetParametersAsync(ParameterView parameters)
                 _OnParameterChangeEvents.Enqueue(CalendarInterop?.ChangeView(viewName).AsTask());
                 _OnParameterChangeEvents.Enqueue(SetDateRange());
             }
-            
+
             var newDateDisplay = parameters.GetValueOrDefault<DateTimeOffset?>("GoToDate");
             if (newDateDisplay != GoToDate)
             {
@@ -209,7 +231,7 @@ public override async Task SetParametersAsync(ParameterView parameters)
             }
             CalendarProperties = parameters.GetValueOrDefault<IEnumerable<TUICalendarProps>>("CalendarProperties");
             Schedules = parameters.GetValueOrDefault<IEnumerable<TUISchedule>>("Schedules");
-            
+
             //Visible Date Range
             VisibleEndDateRange = parameters.GetValueOrDefault<DateTimeOffset?>("VisibleEndDateRange");
             VisibleStartDateRange = parameters.GetValueOrDefault<DateTimeOffset?>("VisibleStartDateRange");
@@ -226,12 +248,49 @@ public override async Task SetParametersAsync(ParameterView parameters)
 
         }
 
-        protected override bool ShouldRender()
+        /// <summary>
+        /// When an schedule is updated from the UI, this is invoked.
+        /// </summary>
+        /// <param name="scheduleBeingModified"></param>
+        /// <param name="updatedScheduleFields"></param>
+        /// <returns></returns>
+        [JSInvokable("UpdateSchedule")]
+        public async Task UpdateSchedule(dynamic scheduleBeingModified, dynamic updatedScheduleFields)
         {
-            return false;
-            //return shouldRender;
+            var currentSchedule = JsonSerializer.Deserialize<TUISchedule>(scheduleBeingModified.ToString());
+            var updatedSchedule = CalendarInterop.UpdateSchedule(currentSchedule, updatedScheduleFields); //Todo: Combine changes with actual schedule
+            await OnChangeCalendarEventOrTask.InvokeAsync(updatedSchedule); //Todo: Test This callback!
+            Debug.WriteLine($"Schedule {currentSchedule.Id} Modified");
+        }
+        
+        /*@Todo: Waiting for Double click in TUI API
+        [JSInvokable("OnDoubleClickSchedule")]
+        public async Task OnScheduleDoubleClick(string scheduleId)
+        {
+            await OnDoubleClickCalendarEventOrTask.InvokeAsync(scheduleId);
+            Debug.WriteLine($"Schedule {scheduleId} Double-Clicked!");
+        }
+        */
+        
+        protected override async Task OnAfterRenderAsync(bool firstRender)
+        {
+            if (firstRender)
+            {
+                await CalendarInterop.InitCalendarAsync(_ObjectReference, CalendarOptions);
+                await CalendarInterop.SetCalendars(CalendarProperties);
+                await CalendarInterop.CreateSchedulesAsync(Schedules);
+                await SetDateRange();
+            }
         }
 
+        protected override void OnInitialized()
+        {
+            _ObjectReference = DotNetObjectReference.Create(this);
+            if (CalendarInterop is null)
+            {
+                CalendarInterop = new TUICalendarInteropService(jsRuntime);
+            }
+        }
         protected override async Task OnParametersSetAsync()
         {
             if (CalendarInterop is not null)
@@ -250,50 +309,31 @@ protected override async Task OnParametersSetAsync()
             }
         }
 
-        protected override async Task OnAfterRenderAsync(bool firstRender)
+        /// <summary>
+        /// Since there is no subsequent rendering required by blazor after the first render, this set to false
+        /// </summary>
+        /// <returns></returns>
+        protected override bool ShouldRender()
         {
-            if (firstRender)
-            {
-                await CalendarInterop.InitCalendarAsync(_ObjectReference, CalendarOptions);
-                await CalendarInterop.SetCalendars(CalendarProperties);
-                await CalendarInterop.CreateSchedulesAsync(Schedules);
-                await SetDateRange();
-            }
+            return false;
         }
-
-        //@Bug: Bound Properties are being set when invoking the change event.
+        
+        /// <summary>
+        /// Each time there is a view change or advance of the calendar, ask the calendar what date range is visible
+        /// </summary>
+        /// <returns></returns>
         private async Task SetDateRange()
         {
             if (CalendarInterop is not null)
             {
-                //VisibleStartDateRange = ;
                 await VisibleStartDateRangeChanged.InvokeAsync(await CalendarInterop.GetDateRangeStart());
-                //VisibleEndDateRange = ;
                 await VisibleEndDateRangeChanged.InvokeAsync(await CalendarInterop.GetDateRangeEnd());
             }
         }
-
-        public void Dispose()
-        {
-            GC.SuppressFinalize(this);
-            if (_ObjectReference != null)
-            {
-                //Now dispose our object reference so our component can be garbage collected
-                _ObjectReference.Dispose();
-            }
-        }
-    }
-    /// <summary>
-    /// Enum Used to Advance the Calendar Forward, Reverse, or to Today
-    /// </summary>
-    public enum CalendarMove
-    {
-        Next,
-        Previous,
-        Today
     }
 }
 
+//SOME REFERENCE CODE
 /*
  * if (!_hasSetInitialParameters)
             {