diff --git a/Management.Web/Pages/Calendar.razor b/Management.Web/Pages/Calendar.razor
index 8eb97a3..9f8e2e9 100644
--- a/Management.Web/Pages/Calendar.razor
+++ b/Management.Web/Pages/Calendar.razor
@@ -7,7 +7,6 @@
 
 @code
 {
-
   private SemesterPlanner? semester { get; set; }
   protected override void OnParametersSet()
   {
diff --git a/Management.Web/Pages/Drag.razor b/Management.Web/Pages/Drag.razor
index 3632710..41da2a5 100644
--- a/Management.Web/Pages/Drag.razor
+++ b/Management.Web/Pages/Drag.razor
@@ -24,8 +24,9 @@
 }
 
 <div draggable="true"
-     @ondragstart="OnDragStart">
-     Drag me!
+  @ondragstart="OnDragStart"
+>
+  Drag me!
 </div>
 
 <div 
diff --git a/Management.Web/Program.cs b/Management.Web/Program.cs
index a677f10..a129a07 100644
--- a/Management.Web/Program.cs
+++ b/Management.Web/Program.cs
@@ -17,6 +17,7 @@ builder.Services.AddSingleton<IWebRequestor, WebRequestor>();
 builder.Services.AddSingleton<ICanvasService, CanvasService>();
 builder.Services.AddSingleton<IConfigurationManagement, ConfigurationManagement>();
 builder.Services.AddSingleton<IModuleManager, ModuleManager>();
+builder.Services.AddSingleton<AssignmentDragContainer>();
 
 var app = builder.Build();
 
diff --git a/Management.Web/Shared/Module/Assignment/AssignmentCard.razor b/Management.Web/Shared/Module/Assignment/AssignmentCard.razor
new file mode 100644
index 0000000..49c4840
--- /dev/null
+++ b/Management.Web/Shared/Module/Assignment/AssignmentCard.razor
@@ -0,0 +1,23 @@
+@inject AssignmentDragContainer dragContainer
+
+@code {
+  [Parameter]
+  [Required]
+  public LocalAssignment assignment { get; set; } = new();
+  private  async Task HandleDragStart()
+  {
+    dragContainer.AssignmentBeingDragged = assignment;
+  }
+}
+
+<div 
+  draggable="true"
+  ondragstart="HandleDragStart"
+  class="col-2"
+>
+  <div class="card">
+    <div class="card-body">
+      <div class="card-title">@assignment.name</div>
+    </div>
+  </div>
+</div>
diff --git a/Management.Web/Shared/Module/ModuleDetail.razor b/Management.Web/Shared/Module/ModuleDetail.razor
index a8e380c..8a2aad0 100644
--- a/Management.Web/Shared/Module/ModuleDetail.razor
+++ b/Management.Web/Shared/Module/ModuleDetail.razor
@@ -1,11 +1,9 @@
 @using Management.Web.Shared.Module.Assignment
-
-
 @inject IModuleManager moduleManager
 
 @code {
-  [Parameter, EditorRequired]
-  public int ModuleIndex { get; set; }
+    [Parameter, EditorRequired]
+    public int ModuleIndex { get; set; }
 
   private bool showAddAssignment { get; set; } = false;
 
@@ -20,32 +18,23 @@
 
 @if (module != null)
 {
-  <h3 class="text-center">@module.Name</h3>
-  <button class="btn btn-primary" @onclick="() => showAddAssignment = true">Add Assignment</button>
-  @if (showAddAssignment)
-  {
-    <div class="ms-5 ">
-      <div class="bg-light border rounded m-3 p-3">
-        <NewAssignment ModuleIndex="ModuleIndex" OnSubmit="() => showAddAssignment = false" />
-      </div>
-    </div>
-  }
-
-  <h5>Assignments</h5>
-  <div class="row">
-
-  @foreach (var assignment in module.Assignments)
-  {
-    <div class="col-2">
-      <div class="card">
-        <div class="card-body">
-          <div class="card-title">
-            @assignment.name
-          </div>
+    <h3 class="text-center">@module.Name</h3>
+    <button class="btn btn-primary" @onclick="() => showAddAssignment = true">Add Assignment</button>
+    @if (showAddAssignment)
+    {
+      <div class="ms-5 ">
+        <div class="bg-light border rounded m-3 p-3">
+          <NewAssignment ModuleIndex="ModuleIndex" OnSubmit="() => showAddAssignment = false" />
         </div>
       </div>
-    </div>
-  }
-  </div>
+    }
 
+    <h5>Assignments</h5>
+    <div class="row">
+
+    @foreach (var a in module.Assignments)
+    {
+      <AssignmentCard assignment="a" />
+    }
+  </div>
 }
\ No newline at end of file
diff --git a/Management.Web/Utils/AssignmentDragContainer.cs b/Management.Web/Utils/AssignmentDragContainer.cs
new file mode 100644
index 0000000..a165e40
--- /dev/null
+++ b/Management.Web/Utils/AssignmentDragContainer.cs
@@ -0,0 +1,4 @@
+public class AssignmentDragContainer
+{
+  public LocalAssignment? AssignmentBeingDragged { get; set; }
+}
\ No newline at end of file