diff --git a/django/mysite/polls/templates/polls/detail.html b/django/mysite/polls/templates/polls/detail.html
index e38ffba..63c4259 100644
--- a/django/mysite/polls/templates/polls/detail.html
+++ b/django/mysite/polls/templates/polls/detail.html
@@ -1,6 +1,13 @@
 <h1>{{ question.question_text }}</h1>
-<ul>
-    {% for choice in question.choice_set.all %}
-    <li>{{ choice.choice_text }}</li>
-    {% endfor %}
-</ul>
\ No newline at end of file
+
+{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
+
+<form action="{% url 'polls:vote' question.id %}" method="post">
+{% csrf_token %}
+{% for choice in question.choice_set.all %}
+    <input type="radio" name="choice" id="choice{{ forloop.counter }}" value="{{ choice.id }}" />
+    <label for="choice{{ forloop.counter }}">{{ choice.choice_text }}</label><br />
+{% endfor %}
+    <input type="submit" value="Vote" />
+
+</form>
\ No newline at end of file
diff --git a/django/mysite/polls/urls.py b/django/mysite/polls/urls.py
index 293729b..eff2be0 100644
--- a/django/mysite/polls/urls.py
+++ b/django/mysite/polls/urls.py
@@ -4,8 +4,8 @@ from . import views
 
 app_name = 'polls'
 urlpatterns = [
-    path('', views.index, name='index'),
-    path('<int:question_id>/', views.detail, name='detail'),
-    path('<int:question_id>/results/', views.results, name='results'),
+    path('', views.IndexView.as_view(), name='index'),
+    path('<int:pk>/', views.DetailView.as_view(), name='detail'),
+    path('<int:pk>/results/', views.ResultsView.as_view(), name='results'),
     path('<int:question_id>/vote/', views.vote, name='vote'),
 ]
diff --git a/django/mysite/polls/views.py b/django/mysite/polls/views.py
index 4ae3f90..16f582c 100644
--- a/django/mysite/polls/views.py
+++ b/django/mysite/polls/views.py
@@ -1,23 +1,43 @@
-from django.http import HttpResponse, Http404
 from django.shortcuts import get_object_or_404, render
+from django.http import HttpResponseRedirect
+from django.urls import reverse
+from django.views import generic
 
-from . import models
+from .models import Choice, Question
+
+class IndexView(generic.ListView):
+    template_name = 'polls/index.html'
+    context_object_name = 'latest_questions'
+
+    def get_queryset(self):
+        """Returns the last five published questions."""
+        return Question.objects.order_by('-pub_date')[:5]
 
 
-# Create your views here.
-def index(request):
-    latest_questions = models.Question.objects.order_by('-pub_date')[:5]
-    ctx = {'latest_questions': latest_questions}
-    return render(request, 'polls/index.html', ctx)
+class DetailView(generic.DetailView):
+    model = Question
+    template_name = 'polls/detail.html'
 
-def detail(request, question_id):
-    q = get_object_or_404(models.Question, pk=question_id)
-    return render(request, 'polls/detail.html', {'question': q})
 
-def results(request, question_id):
-    response = "Tally for \"{}\":".format(question_id)
-    return HttpResponse(response)
+class ResultsView(generic.DetailView):
+    model = Choice
+    template_name = 'polls/results.html'
+
 
 def vote(request, question_id):
-    return HttpResponse("You're voting on {}".format(question_id))
-
+    question = get_object_or_404(Question, pk=question_id)
+    try:
+        selected_choice = question.choice_set.get(pk=request.POST['choice'])
+    except (KeyError, Choice.DoesNotExist):
+        # Redisplay the question voting form.
+        return render(request, 'polls/detail.html', {
+            'question': question,
+            'error_message': "You didn't select a choice.",
+        })
+    else:
+        selected_choice.votes += 1
+        selected_choice.save()
+        # Always return an HttpResponseRedirect after successfully dealing
+        # with POST data. This prevents data from being posted twice if a
+        # user hits the Back button.
+        return HttpResponseRedirect(reverse('polls:results', args=(question.id,)))
\ No newline at end of file
diff --git a/django/mysite/progress.txt b/django/mysite/progress.txt
index 54235c3..23a19a0 100644
--- a/django/mysite/progress.txt
+++ b/django/mysite/progress.txt
@@ -1 +1,3 @@
 https://docs.djangoproject.com/en/2.0/intro/tutorial03/
+https://docs.djangoproject.com/en/2.0/intro/tutorial04/
+