diff --git a/ServerManagement/Components/Pages/ToDoList.razor b/ServerManagement/Components/Pages/ToDoList.razor
index b8c56c3..abe3697 100644
--- a/ServerManagement/Components/Pages/ToDoList.razor
+++ b/ServerManagement/Components/Pages/ToDoList.razor
@@ -9,12 +9,30 @@
 <br/>
 @if (items != null && items.Count > 0)
 {
-  <ul>
+  <ul class="list-unstyled">
     @foreach (var item in items)
     {
       <li @key="item.Id">
-        <div class="mb-2">
-          <input type="text" class="form-control border-0" @bind-value="item.Name"/>
+        <div class="row mb-2">
+          <div class="col-1" style="width: 30px;">
+            <input type="checkbox" class="form-check-input" style="vertical-align: middle" @bind-value="item.IsCompleted" checked="@item.IsCompleted"/>
+          </div>
+          <div class="col">
+            @if (item.IsCompleted)
+            {
+              <input type="text" class="form-control border-0 text-decoration-line-through" style="vertical-align: middle" @bind-value="item.Name" disabled/>
+            }
+            else
+            {
+              <input type="text" class="form-control border-0" style="vertical-align: middle" @bind-value="item.Name"/>
+            }
+          </div>
+          <div class="col">
+            @if (item.IsCompleted)
+            {
+              <text>Completed at: @item.DateCompleted.ToLongDateString()</text>
+            }
+          </div>
         </div>
       </li>
     }
diff --git a/ServerManagement/Models/ToDoItem.cs b/ServerManagement/Models/ToDoItem.cs
index 060a463..0286d6e 100644
--- a/ServerManagement/Models/ToDoItem.cs
+++ b/ServerManagement/Models/ToDoItem.cs
@@ -4,7 +4,18 @@ namespace ServerManagement.Models
   {
     public int Id { get; set; }
     public string Name { get; set; } = "";
-    public bool IsCompleted { get; set; }
+    private bool _isCompleted;
+    public bool IsCompleted {
+      get => _isCompleted;
+      set
+      {
+        _isCompleted = value;
+        if (value)
+        {
+          DateCompleted = DateTime.Now;
+        }
+      }
+    }
     public DateTime DateCompleted { get; set; }
   }
 }
\ No newline at end of file