diff --git a/Management.Web/Program.cs b/Management.Web/Program.cs
index 57c0c3b..eeab58c 100644
--- a/Management.Web/Program.cs
+++ b/Management.Web/Program.cs
@@ -40,6 +40,7 @@ builder.Services.AddScoped<CanvasService, CanvasService>();
 builder.Services.AddScoped<YamlManager>();
 builder.Services.AddScoped<CoursePlanner>();
 builder.Services.AddScoped<AssignmentEditorContext>();
+builder.Services.AddScoped<QuizEditorContext>();
 builder.Services.AddScoped<DragContainer>();
 
 var app = builder.Build();
diff --git a/Management.Web/Shared/Components/AssignmentForm/AssignmentDescriptionEditor.razor b/Management.Web/Shared/Components/AssignmentForm/AssignmentDescriptionEditor.razor
index 56c911f..93d1057 100644
--- a/Management.Web/Shared/Components/AssignmentForm/AssignmentDescriptionEditor.razor
+++ b/Management.Web/Shared/Components/AssignmentForm/AssignmentDescriptionEditor.razor
@@ -15,8 +15,6 @@
     if (assignmentContext.Assignment != null)
     {
       Description = assignmentContext.Assignment.Description;
-      Console.WriteLine("loaded description");
-      Console.WriteLine(Description);
       Preview = Markdown.ToHtml(Description);
       TemplateId = assignmentContext.Assignment.TemplateId;
       UseTemplate = TemplateId != null && TemplateId != "";
diff --git a/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
index 4743825..9d4a3de 100644
--- a/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
+++ b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
@@ -118,39 +118,37 @@
   <Body>
     @if (assignmentContext.Assignment != null)
     {
-      <form @onsubmit:preventDefault="true">
-        <div class="m-1">
-          <label class="form-label">
-            Name
-          </label>
-          <input 
-            class="form-control" 
-            @bind="name"
-            @oninput="handleNameChange" 
-          />
-        </div>
-        <div class="m-1">
-          <AssignmentDescriptionEditor />
-        </div>
+      <div class="m-1">
+        <label class="form-label">
+          Name
+        </label>
+        <input 
+          class="form-control" 
+          @bind="name"
+          @oninput="handleNameChange" 
+        />
+      </div>
+      <div class="m-1">
+        <AssignmentDescriptionEditor />
+      </div>
 
-        <div class="form-check m-1">
-          <input 
-            class="form-check-input" 
-            id="lockAtDueDate" 
-            type="checkbox" 
-            @bind="lockAtDueDate"
-            @oninput="handleLockAtDueDateChange" 
-          />
-          <label 
-            class="form-check-label" 
-            for="lockAtDueDate"
-          >
-            Lock At Due Date
-          </label>
-        </div>
-        <RubricEditor />
-        <SubmissionTypeSelector />
-      </form>
+      <div class="form-check m-1">
+        <input 
+          class="form-check-input" 
+          id="lockAtDueDate" 
+          type="checkbox" 
+          @bind="lockAtDueDate"
+          @oninput="handleLockAtDueDateChange" 
+        />
+        <label 
+          class="form-check-label" 
+          for="lockAtDueDate"
+        >
+          Lock At Due Date
+        </label>
+      </div>
+      <RubricEditor />
+      <SubmissionTypeSelector />
     }
   </Body>
   <Footer>
diff --git a/Management.Web/Shared/Components/Quiz/QuizForm.razor b/Management.Web/Shared/Components/Quiz/QuizForm.razor
index 5e45884..d6f0e90 100644
--- a/Management.Web/Shared/Components/Quiz/QuizForm.razor
+++ b/Management.Web/Shared/Components/Quiz/QuizForm.razor
@@ -1,42 +1,41 @@
 @using Management.Web.Shared.Components
+@inject QuizEditorContext quizContext
 
 @code {
-  public LocalModule Module { get; set; } = default!;
+  private Modal? modal { get; set; }
 
-  [Parameter]
-  [EditorRequired]
-  public LocalQuiz Quiz
+  protected override void OnInitialized()
   {
-    get;
-    set;
-  } = default!;
-
-  [Parameter]
-  [EditorRequired]
-  public bool Show { get; set; }
-
-  [Parameter] 
-  public Action OnHide { get; set; } = () => { }; 
-  private Modal? Modal { get; set; }
-
-  private void submitHandler ()
+    quizContext.StateHasChanged += reload;
+  }
+  private void reload()
   {
-
+    if (quizContext.Quiz != null)
+    {
+      //initialize
+      modal?.Show();
+      this.InvokeAsync(this.StateHasChanged);
+    }
+  }
+  public void Dispose()
+  {
+    quizContext.StateHasChanged -= reload;
   }
 }
 
-<Modal @ref="Modal" OnHide="@(() => OnHide())">
+<Modal @ref="modal" OnHide="() => quizContext.Quiz = null" >
   <Title>
-    @Quiz.Name
+    @quizContext.Quiz?.Name
   </Title>
   <Body>
-    <form @onsubmit:preventDefault="true" @onsubmit="submitHandler">
 
-    </form>
   </Body>
   <Footer>
-    <button class="btn btn-primary" @onclick="submitHandler">
-      Save
+    <button 
+      class="btn btn-primary" 
+      @onclick="() => modal?.Hide()"
+    >
+      Done
     </button>
   </Footer>
 </Modal>
diff --git a/Management.Web/Shared/Course/CourseDetails.razor b/Management.Web/Shared/Course/CourseDetails.razor
index 0c3ff4f..25182c3 100644
--- a/Management.Web/Shared/Course/CourseDetails.razor
+++ b/Management.Web/Shared/Course/CourseDetails.razor
@@ -3,6 +3,7 @@
 @using Management.Web.Shared.Module
 @using Management.Web.Shared.Semester
 @using Management.Web.Shared.Components.AssignmentForm
+@using Management.Web.Shared.Components.Quiz
 
 @inject CanvasService canvas
 @inject CoursePlanner planner
@@ -40,6 +41,7 @@
 }
 
 <AssignmentForm />
+<QuizForm />
 
 <div class="row">
   <div class="col overflow-y-auto border rounded " style="max-height: 95vh;">
diff --git a/Management.Web/Shared/Module/QuizDetail.razor b/Management.Web/Shared/Module/QuizDetail.razor
index 2101b92..894d46d 100644
--- a/Management.Web/Shared/Module/QuizDetail.razor
+++ b/Management.Web/Shared/Module/QuizDetail.razor
@@ -1,14 +1,12 @@
 @using Management.Web.Shared.Components.Quiz
 
 @inject DragContainer dragContainer
+@inject QuizEditorContext quizContext
 
 @inherits DroppableQuiz
 
 @code {
 
-  private bool showUpdateForm { get; set; } = false;
-
-
   private void HandleDragStart()
   {
     dragContainer.DropCallback = dropCallback;
@@ -26,7 +24,7 @@
   draggable="true"
   @ondragstart="HandleDragStart"
   @ondragend="HandleDragEnd"
-  @onclick="@(() => showUpdateForm = true)"
+  @onclick="@(() => quizContext.Quiz = Quiz)"
   role="button"
 >
   <div class="card">
diff --git a/Management.Web/Shared/Semester/AssignmentInDay.razor b/Management.Web/Shared/Semester/Day/AssignmentInDay.razor
similarity index 98%
rename from Management.Web/Shared/Semester/AssignmentInDay.razor
rename to Management.Web/Shared/Semester/Day/AssignmentInDay.razor
index 523fe66..867b12f 100644
--- a/Management.Web/Shared/Semester/AssignmentInDay.razor
+++ b/Management.Web/Shared/Semester/Day/AssignmentInDay.razor
@@ -1,4 +1,3 @@
-@using Management.Web.Shared.Components.AssignmentForm
 
 @inject DragContainer dragContainer
 @inject CoursePlanner planner
diff --git a/Management.Web/Shared/Semester/Day.razor b/Management.Web/Shared/Semester/Day/Day.razor
similarity index 83%
rename from Management.Web/Shared/Semester/Day.razor
rename to Management.Web/Shared/Semester/Day/Day.razor
index 4303811..51aac21 100644
--- a/Management.Web/Shared/Semester/Day.razor
+++ b/Management.Web/Shared/Semester/Day/Day.razor
@@ -27,7 +27,8 @@
   }
   
 
-  private IEnumerable<LocalAssignment> TodaysAssignments {
+  private IEnumerable<LocalAssignment> TodaysAssignments 
+    {
     get
     {
       if(planner.LocalCourse == null || date == null)
@@ -38,6 +39,19 @@
           .Where(a => a.DueAt.Date == date?.Date);
     }
   }
+
+  private IEnumerable<LocalQuiz> todaysQuizzes 
+    {
+      get
+      {
+        if(planner.LocalCourse == null || date == null)
+          return Enumerable.Empty<LocalQuiz>();
+        else
+          return planner.LocalCourse.Modules
+            .SelectMany(m => m.Quizzes)
+            .Where(q => q.DueAt.Date == date?.Date);
+      }
+    }
   private string calculatedClass
   {
     get
@@ -78,7 +92,6 @@
 
   void OnDrop()
   {
-    @* System.Console.WriteLine("on drop"); *@
     dragging = false;
     if(dragContainer.DropCallback == null){
       System.Console.WriteLine("no drop callback set");
@@ -105,5 +118,10 @@
   {
     <AssignmentInDay Assignment="assignment" @key="@assignment" />
   }
+
+  @foreach(var quiz in todaysQuizzes)
+  {
+    <QuizInDay Quiz="quiz" @key="@quiz" />
+  }
   </div>
 </div>
diff --git a/Management.Web/Shared/Semester/Day/QuizInDay.razor b/Management.Web/Shared/Semester/Day/QuizInDay.razor
new file mode 100644
index 0000000..61c0137
--- /dev/null
+++ b/Management.Web/Shared/Semester/Day/QuizInDay.razor
@@ -0,0 +1,29 @@
+@using Management.Web.Shared.Components.Quiz
+@inject DragContainer dragContainer
+@inject CoursePlanner planner
+@inject QuizEditorContext quizContext
+
+@inherits DroppableQuiz
+
+@code {
+
+  private void HandleDragStart()
+  {
+    dragContainer.DropCallback = dropCallback;
+  }
+
+  private void HandleDragEnd()
+  {
+    dragContainer.DropCallback = null;
+  }
+}
+
+<div
+  draggable="true"
+  @ondragstart="HandleDragStart"
+  @ondragend="HandleDragEnd"
+  @onclick="@(() => quizContext.Quiz = Quiz)"
+  role="button"
+>
+  @Quiz.Name
+</div>
\ No newline at end of file
diff --git a/Management.Web/Shared/Semester/MonthDetail.razor b/Management.Web/Shared/Semester/MonthDetail.razor
index bd5e2d6..c28e4ec 100644
--- a/Management.Web/Shared/Semester/MonthDetail.razor
+++ b/Management.Web/Shared/Semester/MonthDetail.razor
@@ -1,4 +1,5 @@
 @using System.Linq
+@using Management.Web.Shared.Semester.Day
 
 @inject CoursePlanner planner
 
diff --git a/Management/Features/Configuration/AssignmentEditorContext.cs b/Management/Features/Configuration/AssignmentEditorContext.cs
index b583a64..df5f70d 100644
--- a/Management/Features/Configuration/AssignmentEditorContext.cs
+++ b/Management/Features/Configuration/AssignmentEditorContext.cs
@@ -14,12 +14,11 @@ public class AssignmentEditorContext
   private LocalAssignment? _assignment;
   public LocalAssignment? Assignment
   {
-    get  =>_assignment;
+    get => _assignment;
     set
     {
       _assignment = value;
       StateHasChanged?.Invoke();
-      Console.WriteLine("new assignment");
     }
   }
 
@@ -30,7 +29,7 @@ public class AssignmentEditorContext
       var currentModule =
         planner.LocalCourse.Modules.First(
           m => m.Assignments.Select(a => a.Id).Contains(newAssignment.Id)
-        ) ?? throw new Exception("could not find current module in assignment description form");
+        ) ?? throw new Exception("could not find current module in assignment editor context");
 
       var updatedModules = planner.LocalCourse.Modules
         .Select(
diff --git a/Management/Features/Configuration/QuizEditorContext.cs b/Management/Features/Configuration/QuizEditorContext.cs
new file mode 100644
index 0000000..76bbe85
--- /dev/null
+++ b/Management/Features/Configuration/QuizEditorContext.cs
@@ -0,0 +1,50 @@
+using LocalModels;
+using Management.Planner;
+
+public class QuizEditorContext
+{
+  public event Action? StateHasChanged;
+  private CoursePlanner planner { get; }
+
+  public QuizEditorContext(CoursePlanner planner)
+  {
+    this.planner = planner;
+  }
+
+  private LocalQuiz? _quiz;
+  public LocalQuiz? Quiz
+  {
+    get => _quiz;
+    set
+    {
+      _quiz = value;
+      StateHasChanged?.Invoke();
+    }
+  }
+
+  public void SaveQuiz(LocalQuiz newQuiz)
+  {
+    if (planner.LocalCourse != null)
+    {
+      var currentModule =
+        planner.LocalCourse.Modules.First(m => m.Quizzes.Select(q => q.Id).Contains(newQuiz.Id))
+        ?? throw new Exception("could not find current module in quiz editor context");
+
+      var updatedModules = planner.LocalCourse.Modules
+        .Select(
+          m =>
+            m.Name == currentModule.Name
+              ? currentModule with
+              {
+                Quizzes = currentModule.Quizzes
+                  .Select(q => q.Id == newQuiz.Id ? newQuiz : q)
+                  .ToArray()
+              }
+              : m
+        )
+        .ToArray();
+
+      planner.LocalCourse = planner.LocalCourse with { Modules = updatedModules };
+    }
+  }
+}
