diff --git a/README.md b/README.md
index e233c12..5e72b0f 100644
--- a/README.md
+++ b/README.md
@@ -15,11 +15,6 @@ protected async override Task OnInitAsync()
 }
 ```
 
-## Note about the sample project
-
-The Todo page does not work fully. The TodoForm that allows you to edit an item or add a new item is not working correctly. The OnInitAsync in the 
-child component is not firing. However, since BlazorDB itself it working, I decided to publish the version and figure out the Sample app afterwards.
-
 ## Docs
 
 ### Install
diff --git a/src/BlazorDB/BlazorDB.csproj b/src/BlazorDB/BlazorDB.csproj
index 01a1673..67900db 100644
--- a/src/BlazorDB/BlazorDB.csproj
+++ b/src/BlazorDB/BlazorDB.csproj
@@ -7,7 +7,7 @@
     <BlazorLinkOnBuild>false</BlazorLinkOnBuild>
     <LangVersion>7.3</LangVersion>
     <PackageId>BlazorDB</PackageId>
-    <Version>0.7.0</Version>
+    <Version>0.7.1</Version>
     <Authors>Chanan Braunstein</Authors>
     <Title>Blazor localStorage Database</Title>
     <Description>In memory, persisted to localstorage, database for .net Blazor browser framework</Description>
diff --git a/src/BlazorDB/StorageContext.cs b/src/BlazorDB/StorageContext.cs
index 52b31f4..a007362 100644
--- a/src/BlazorDB/StorageContext.cs
+++ b/src/BlazorDB/StorageContext.cs
@@ -6,6 +6,7 @@ namespace BlazorDB
     public class StorageContext : IStorageContext
     {
         protected IStorageManager StorageManager { get; set; }
+        private bool _initalized = false;
         public async Task LogToConsole()
         {
             await Logger.StartContextType(GetType(), false);
@@ -26,6 +27,8 @@ public Task<int> SaveChanges()
 
         public Task Initialize()
         {
+            if (_initalized) return Task.CompletedTask;
+            _initalized = true;
             return StorageManager.LoadContextFromLocalStorage(this);
         }
     }
diff --git a/src/Sample/Pages/TodoItemForm.cshtml b/src/Sample/Pages/TodoItemForm.cshtml
index 76c6b36..08f3eec 100644
--- a/src/Sample/Pages/TodoItemForm.cshtml
+++ b/src/Sample/Pages/TodoItemForm.cshtml
@@ -21,7 +21,7 @@
         </div>
     </div>
     <div class="col-sm-10 offset-sm-2">
-        <button type="submit" class="btn btn-primary" onclick="@onclick">Submit</button>
+        <button type="button" class="btn btn-primary" onclick="@onclick">Submit</button>
     </div>
 </form>
 
@@ -33,23 +33,14 @@
 
     protected async override Task OnInitAsync()
     {
-        Console.WriteLine("OnInitAsync");
-        await Context.Initialize();
+        if (Context.Todos == null) await Context.Initialize();
         if (SelectedId == 0) Todo = new TodoItem();
-        else
-        {
-            SetTodo();
-        }
+        else SetTodo();
     }
 
     protected async override Task OnParametersSetAsync()
     {
-        Console.WriteLine("OnParametersSetAsync");
-        if (Context.Todos == null)
-        {
-            Console.WriteLine("OnParametersSetAsync - init");
-            await Context.Initialize();
-        }
+        if (Context.Todos == null) await Context.Initialize();
         SetTodo();
     }
 
diff --git a/src/Sample/Pages/Todos.cshtml b/src/Sample/Pages/Todos.cshtml
index c408cc5..60cf6ce 100644
--- a/src/Sample/Pages/Todos.cshtml
+++ b/src/Sample/Pages/Todos.cshtml
@@ -26,7 +26,7 @@
 </BlazorTable>
 <button class="btn btn-primary" type="button" onclick="@addNewClick">Add New</button>
 <h2>Selected Item</h2>
-<TodoItemForm  />
+<TodoItemForm SelectedId="@SelectedId" NewTodoAdded="@NewTodoAdded" />
 
 @functions {  
     string Filter { get; set; }
@@ -64,7 +64,6 @@
 
     void onClickItem(int i)
     {
-        Console.WriteLine("Todos onClickItem: {0}", i);
         SelectedId = i;
         StateHasChanged();
     }