diff --git a/polls/templates/polls/detail.html b/polls/templates/polls/detail.html
new file mode 100644
index 0000000..3bbdd2a
--- /dev/null
+++ b/polls/templates/polls/detail.html
@@ -0,0 +1 @@
+{{ question }}
\ No newline at end of file
diff --git a/polls/views.py b/polls/views.py
index 42410b6..74e7a95 100644
--- a/polls/views.py
+++ b/polls/views.py
@@ -1,5 +1,5 @@
 from django.shortcuts import render
-from django.http import HttpResponse
+from django.http import HttpResponse, Http404
 from django.template import loader
 
 from .models import Question
@@ -14,7 +14,11 @@ def index(request):
 
 
 def detail(request, question_id):
-    return HttpResponse("You're looking at question %s." % question_id)
+    try:
+        question = Question.objects.get(pk=question_id)
+    except Question.DoesNotExist:
+        raise Http404("Question does not exist")
+    return render(request, "polls/detail.html", {"question": question})
 
 
 def results(request, question_id):