diff --git a/CodingEventsDemo/CodingEventsDemo.csproj b/CodingEventsDemo/CodingEventsDemo.csproj
index 7f6b0bf5..12eac4f4 100644
--- a/CodingEventsDemo/CodingEventsDemo.csproj
+++ b/CodingEventsDemo/CodingEventsDemo.csproj
@@ -7,7 +7,6 @@
 
 
   <ItemGroup>
-    <Folder Include="Views\Events\" />
     <Folder Include="Data\" />
   </ItemGroup>
 </Project>
diff --git a/CodingEventsDemo/Controllers/EventsController.cs b/CodingEventsDemo/Controllers/EventsController.cs
index 48e08159..8083a654 100644
--- a/CodingEventsDemo/Controllers/EventsController.cs
+++ b/CodingEventsDemo/Controllers/EventsController.cs
@@ -16,9 +16,9 @@ public class EventsController : Controller
         // GET: /<controller>/
         public IActionResult Index()
         {
-            ViewBag.events = EventData.GetAll();
+            List<Event> events = new List<Event>(EventData.GetAll());
 
-            return View();
+            return View(events);
         }
 
         public IActionResult Add()
@@ -53,5 +53,27 @@ public IActionResult Delete(int[] eventIds)
 
             return Redirect("/Events");
         }
+
+        [HttpGet]
+        [Route("Events/Edit/{eventId}")]
+        public IActionResult Edit(int eventId)
+        {
+            //controller code will go here
+            Event editingEvent = EventData.GetById(eventId);
+            ViewBag.eventToEdit = editingEvent;
+            ViewBag.title = "Edit Event " + editingEvent.Name + "(id = " + editingEvent.Id + ")";
+            return View();
+        }
+
+        [HttpPost]
+        [Route("Events/Edit")]
+        public IActionResult SubmitEditEventForm(int eventId, string name, string desc)
+        {
+            //controller code will go here
+            Event editingEvent = EventData.GetById(eventId);
+            editingEvent.Name = name;
+            editingEvent.Description = desc;
+            return Redirect("/Events");
+        }
     }
 }
diff --git a/CodingEventsDemo/Models/Event.cs b/CodingEventsDemo/Models/Event.cs
index fd754eb0..3e0442e0 100644
--- a/CodingEventsDemo/Models/Event.cs
+++ b/CodingEventsDemo/Models/Event.cs
@@ -7,6 +7,7 @@ public class Event
     {
         public string Name { get; set; }
 
+        //[FromForm(Name="desc")]
         public string Description { get; set; }
 
         public int Id { get; }
@@ -22,6 +23,7 @@ public Event(string name, string description) : this()
         {
             Name = name;
             Description = description;
+
         }
 
         public override string ToString()
diff --git a/CodingEventsDemo/Views/Events/Add.cshtml b/CodingEventsDemo/Views/Events/Add.cshtml
index 01ae3966..a8cab2c2 100644
--- a/CodingEventsDemo/Views/Events/Add.cshtml
+++ b/CodingEventsDemo/Views/Events/Add.cshtml
@@ -3,11 +3,14 @@
 <form method="post">
     <div class="form-group">
         <label for="name">Name</label>
-        <input name="name" type="text" />
+            <input type ="text" name="name" class="form-control">
+        </div>       
+        <div>
+        <label>
+            Description
+            <input type="text" name="description" class="form-control"/>
+        </label>
+       
     </div>
-    <div class="form-group">
-        <label for="description">Description</label>
-        <input name="description" />
-    </div>
-    <input type="submit" value="Add Event" />
+<input type="submit" value="Add Event" />
 </form>
diff --git a/CodingEventsDemo/Views/Events/Edit.cshtml b/CodingEventsDemo/Views/Events/Edit.cshtml
new file mode 100644
index 00000000..cf004d18
--- /dev/null
+++ b/CodingEventsDemo/Views/Events/Edit.cshtml
@@ -0,0 +1,34 @@
+@*<h1>@ViewBag.title</h1>
+
+<form method="post" action="/events/edit">
+    <div class="form-group">
+        <label>
+            Name
+            <input type ="text" name="name" value="@ViewBag.eventToEdit.Name"/>
+        </label>        
+        <label>
+            Description
+            <input type="text" name="description" value="@ViewBag.eventToEdit.Description"/>
+        </label>
+
+    </div>
+    <input type="hidden" value="@ViewBag.eventToEdit.Id" name="eventId">
+    <input type="submit" value="Edit Event" />
+    
+    </form>*@
+
+   <h1>@ViewBag.title</h1>
+
+   <form method="post" action="/events/edit">
+      <div class="form-group">
+         <label for="name">Name</label>
+         <input name="name" type="text" value="@ViewBag.eventToEdit.Name"/>
+      </div>
+      <div class="form-group">
+         <label for="description">Description</label>
+         <input name="description" type="text" value="@ViewBag.eventToEdit.Description" />
+      </div>
+      <input type="hidden" value="@ViewBag.eventToEdit.Id" name="eventId">
+      <input type="submit" value="Edit Event" />
+
+   </form>
diff --git a/CodingEventsDemo/Views/Events/Index.cshtml b/CodingEventsDemo/Views/Events/Index.cshtml
index 1e0e2c12..ca4590d1 100644
--- a/CodingEventsDemo/Views/Events/Index.cshtml
+++ b/CodingEventsDemo/Views/Events/Index.cshtml
@@ -1,4 +1,8 @@
-<h1>Coding Events</h1>
+@using CodingEventsDemo.Models;
+
+@model List<Event>
+
+<h1>Coding Events</h1>
 
 <p>
     <a asp-controller="Events" asp-action="Add">Add Event</a>
@@ -9,7 +13,7 @@
     <a asp-controller="Events" asp-action="Delete">Delete Event</a>
 </p>
 
-@if (ViewBag.events.Count == 0)
+@if (Model.Count == 0)
 {
     <p>No events yet!</p>
 }
@@ -27,12 +31,14 @@ else
                 Description
             </th>
         </tr>
-        @foreach (var evt in ViewBag.events)
+        @foreach (var evt in Model)
         {
             <tr>
                 <td>@evt.Id</td>
                 <td>@evt.Name</td>
                 <td>@evt.Description</td>
+                <td>@evt.Id</td>
+                <td><a asp-controller="Events" asp-action="Edit" asp-route-id="@evt.Id">Edit Event</a></td>
             </tr>
         }
     </table>