diff --git a/oef/templates/oef/format_search.html b/oef/templates/oef/format_search.html
new file mode 100644
index 00000000..066c14d6
--- /dev/null
+++ b/oef/templates/oef/format_search.html
@@ -0,0 +1,19 @@
+{% extends 'oef/base.html' %}
+
+
+{% block content %}
+
+<h2>Search</h2>
+
+<form action="" method="post">
+    <textarea name="search" rows="10" cols="50"></textarea>
+    <input type="button" value="Search"
+    hx-post="{% url 'oef:format_search' %}"
+    hx-target="#search-results"
+    >
+</form>
+
+<div id="search-results"></div>
+    
+
+{% endblock %}
\ No newline at end of file
diff --git a/oef/templates/oef/format_search_results.html b/oef/templates/oef/format_search_results.html
new file mode 100644
index 00000000..c8e290f0
--- /dev/null
+++ b/oef/templates/oef/format_search_results.html
@@ -0,0 +1,10 @@
+<ul>
+{% for entry in entries %}
+
+<li>
+{{ entry.exam_code}} - {{ entry.exam_name }} (<a href='{{entry.get_absolute_url}}'>view</a>)
+</li>
+    
+{% endfor %}
+</ul>
+    
\ No newline at end of file
diff --git a/oef/templates/oef/questions.html b/oef/templates/oef/questions.html
index a2e82db8..e50dd432 100644
--- a/oef/templates/oef/questions.html
+++ b/oef/templates/oef/questions.html
@@ -43,7 +43,7 @@
             <li class="question {% if format %}named{% else %}unnamed{% endif %}">
                 <span class="format-name">
                     {% if format %}
-                        <a href='{% url "oef:format_update" format.pk %}'>{{format.name}}</a>
+                        Name: <a href='{% url "oef:format_update" format.pk %}'>{{format.name}}</a>
                     {% endif %}
                 </span>
         <pre class="pre-question" title="{{ question }}">{{ question }}</pre>
diff --git a/oef/urls.py b/oef/urls.py
index d3a7e5af..15dddbe1 100644
--- a/oef/urls.py
+++ b/oef/urls.py
@@ -20,6 +20,9 @@ urlpatterns = [
     path(
         "formats/create", views.FormatsCreateView.as_view(), name="format_create"
     ),
+    path(
+        "formats/search", views.format_search, name="format_search"
+    ),
     path(
         "entries/replace_questions", views.replace_questions, name="replace_questions"
     ),
diff --git a/oef/views.py b/oef/views.py
index eb4ac544..5a6e90b8 100644
--- a/oef/views.py
+++ b/oef/views.py
@@ -95,6 +95,17 @@ def entries(request):
     entries = Entry.objects.all().order_by("exam_code")
     return render(request, "oef/entries.html", {"entries": entries})
 
+def format_search(request):
+    if request.method == "POST":
+        search = request.POST.get("search")
+
+        entries = Entry.objects.filter(questions__icontains=search)
+
+
+
+        return render(request, "oef/format_search_results.html", {"entries": entries})
+    return render(request, "oef/format_search.html",)
+
 
 def questions(request):
     questions = set(Entry.objects.filter(inactive=False).values_list("questions", flat=True))