diff --git a/src/main/java/org/launchcode/codingevents/controllers/EventController.java b/src/main/java/org/launchcode/codingevents/controllers/EventController.java
index 2e837d2b0..1497984fe 100644
--- a/src/main/java/org/launchcode/codingevents/controllers/EventController.java
+++ b/src/main/java/org/launchcode/codingevents/controllers/EventController.java
@@ -8,6 +8,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -17,11 +18,15 @@
 @RequestMapping("events")
 public class EventController {
 
-    private static List<String> events = new ArrayList<>();
+    private static HashMap<String, String> events = new HashMap<>();
 
     @GetMapping
     public String displayAllEvents(Model model) {
         model.addAttribute("title", "All Events");
+//        model.addAttribute("events", events);
+        events.put("WWDC", "Apple Developer Conference");
+        events.put("LaunchCode", "LiftOff");
+        events.put("WWT", "Apprenticeship");
         model.addAttribute("events", events);
         return "events/index";
     }
@@ -32,10 +37,10 @@ public String displayCreateEventForm(Model model) {
         return "events/create";
     }
 
-    @PostMapping("create")
-    public String processCreateEventForm(@RequestParam String eventName) {
-        events.add(eventName);
-        return "redirect:";
-    }
+//    @PostMapping("create")
+//    public String processCreateEventForm(@RequestParam String eventName) {
+//        events.put(eventName);
+//        return "redirect:";
+//    }
 
 }
diff --git a/src/main/resources/templates/events/index.html b/src/main/resources/templates/events/index.html
index 561ce87e2..6089fb04f 100644
--- a/src/main/resources/templates/events/index.html
+++ b/src/main/resources/templates/events/index.html
@@ -4,12 +4,25 @@
 <body>
 
 <header th:replace="fragments :: header"></header>
-
-<ul>
+<table class="table table-striped">
+    <tr>
+        <th>Event Name</th>
+        <th>Description</th>
+        <th>Address</th>
+    </tr>
     <th:block th:each="event : ${events}">
-        <li th:text="${event}"></li>
+        <tr>
+            <td th:text="${event.getKey()}"></td>
+            <td th:text="${event.getValue()}"></td>
+            <td th:replace ="fragments :: address"></td>
+        </tr>
     </th:block>
-</ul>
+</table>
+<!--<ul>-->
+<!--    <th:block th:each="event : ${events}">-->
+<!--        <li th:text="${event}"></li>-->
+<!--    </th:block>-->
+<!--</ul>-->
 
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html
index 4b40f4599..d2b4a38fe 100644
--- a/src/main/resources/templates/fragments.html
+++ b/src/main/resources/templates/fragments.html
@@ -16,5 +16,7 @@ <h1 th:text="${title}">Coding Events</h1>
     </ul>
 </nav>
 
+<td th:fragment="address">54321 Descending address BLVD</td>
+
 </body>
 </html>
\ No newline at end of file
