diff --git a/src/frontend/urls.py b/src/frontend/urls.py
index d241245..7bc23ad 100755
--- a/src/frontend/urls.py
+++ b/src/frontend/urls.py
@@ -25,6 +25,7 @@ urlpatterns = [
     path("prev_page/<bookset>", views.prev_page, name="prev_page"),
     path("next_page/<bookset>", views.next_page, name="next_page"),
     path("search/<query>", views.search, name="search"),
+    path("search/", views.search, name="search"),
 ]
 if settings.DEBUG:
     import debug_toolbar
diff --git a/src/interface/models.py b/src/interface/models.py
index 3e58a4b..929eed2 100755
--- a/src/interface/models.py
+++ b/src/interface/models.py
@@ -35,7 +35,10 @@ class Books(models.Model):
         return reverse("model-detail-view", args=[str(self.id)])
 
     def generic_search(self, query):
-        results = Books.objects.annotate(
-            search=SearchVector("author", "title", "file_name")
-        ).filter(str(query))
+        try:
+            results = Books.objects.annotate(
+                search=SearchVector("author", "title", "file_name"),
+            ).filter(search=query)
+        except Exception as e:
+            raise
         return results
diff --git a/src/interface/static/js/pyshelf_ux.js b/src/interface/static/js/pyshelf_ux.js
index e69de29..f846b49 100644
--- a/src/interface/static/js/pyshelf_ux.js
+++ b/src/interface/static/js/pyshelf_ux.js
@@ -0,0 +1,7 @@
+$(document).ready(function(){
+        $(".search_submit").click(function(){
+                var query = $('.nav_search').val();
+                console.log(query);
+                window.location.href = '/search/'+query;
+        })
+})
diff --git a/src/interface/templates/index.html b/src/interface/templates/index.html
index be55ec3..6bfcbd9 100755
--- a/src/interface/templates/index.html
+++ b/src/interface/templates/index.html
@@ -38,7 +38,7 @@
                 <input class="nav_button prev_page" type="button" value="<< Prev Page" onclick="window.location.href = '/prev_page/{{ Set }}'">
             </div>
             <div class="nav_center_top">
-                <input class="nav_search" type="text" size="25" value="-- Not Yet Implemented --"><input class="nav_button" type="submit" value="Search">
+                <input class="nav_search" type="text" size="25" value=""><input class="nav_button search_submit" type="submit" value="Search">
             </div>
             <div class="nav_right_top">
                     <input class="nav_button next_page" type="button" value="Next Page >>" onclick="window.location.href = '/next_page/{{ Set }}'">
diff --git a/src/interface/views.py b/src/interface/views.py
index 5683b03..35636be 100755
--- a/src/interface/views.py
+++ b/src/interface/views.py
@@ -42,15 +42,13 @@ def prev_page(request, bookset):
 
 
 def search(request, query=None):
-    breakpoint()
-    if query == None:
-        return False
-    else:
-        try:
-            _r = Books().generic_search(query)
-            return _r
-        except Exception as e:
-            return e
+    if query is None:
+        return render(request, "index.html", {"Books": None})
+    try:
+        _r = Books().generic_search(query)
+        return render(request, "index.html", {"Books": _r})
+    except Exception as e:
+        raise
 
 
 def book_set(_limit=None, _set=1):