diff --git a/.gitignore b/.gitignore
index b66db70..6be2033 100755
--- a/.gitignore
+++ b/.gitignore
@@ -111,3 +111,4 @@ config.json
 .idea/
 .DS_Store
 
+uploads
diff --git a/mooc/migrations/0003_topic_video.py b/mooc/migrations/0003_topic_video.py
new file mode 100644
index 0000000..f029c40
--- /dev/null
+++ b/mooc/migrations/0003_topic_video.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.3 on 2017-08-06 18:09
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mooc', '0002_topic_title'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='topic',
+            name='video',
+            field=models.FileField(default='video', upload_to='videos/'),
+        ),
+    ]
diff --git a/mooc/models.py b/mooc/models.py
index 23248f2..50b8de9 100644
--- a/mooc/models.py
+++ b/mooc/models.py
@@ -1,7 +1,9 @@
 from django.db import models
 
 # Create your models here.
+
+
 class Topic(models.Model):
     content = models.CharField(max_length=10000)
-    title = models.CharField(max_length=40, default='Title')    
-
+    title = models.CharField(max_length=40, default='Title')
+    video = models.FileField(upload_to='videos/', default="video")
diff --git a/mooc/templates/mooc/topic.html b/mooc/templates/mooc/topic.html
index 8ffa702..2b7b134 100644
--- a/mooc/templates/mooc/topic.html
+++ b/mooc/templates/mooc/topic.html
@@ -1,5 +1,7 @@
 {% extends 'mooc/_base.html' %}
 {% block styles %}
+{% load staticfiles %}
+
 <style type="text/css">
 	#chatbox {
 		width: 380px;
@@ -29,6 +31,11 @@ <h2>{{topic.title}}</h2>
 <div id="chatbox">
 	{% include 'bot/chatbox.html' %}
 </div>
+
+<video width="320" height="240" controls autoplay>
+<source src="{% static video %}" type="video/mp4">
+</video>
+
 {% endblock content %}
 {% block script %}
 {% include 'bot/scripts.html' %}
diff --git a/mooc/urls.py b/mooc/urls.py
index 66d4ce7..a62feeb 100644
--- a/mooc/urls.py
+++ b/mooc/urls.py
@@ -1,6 +1,7 @@
 from django.conf.urls import url
 from mooc.views import *
-
+from mooc_chatbot import settings
+from django.conf.urls.static import static
 
 urlpatterns = [
     url(r'^$', home, name='home'),
diff --git a/mooc/views.py b/mooc/views.py
index f2cdb41..ca06955 100644
--- a/mooc/views.py
+++ b/mooc/views.py
@@ -1,21 +1,28 @@
 from django.shortcuts import render
 from mooc.models import Topic
+
 # Create your views here.
+
+
 def home(request):
     print('home')
     return render(request, 'mooc/home.html')
 
+
 def search(request):
     print('search')
     if request.GET and request.GET.get('query'):
-        search_results = Topic.objects.filter(title__icontains=request.GET.get('query'))
+        search_results = Topic.objects.filter(
+            title__icontains=request.GET.get('query'))
     return render(request, 'mooc/search_results.html', context={'results': search_results})
 
+
 def topic(request):
-    topic_id=request.GET.get('id')
+    topic_id = request.GET.get('id')
     topic = Topic.objects.filter(id=topic_id).first()
-    # if topic:
-    #     topic_content = topic.content
-    # else:
-    #     topic_content =None    
-    return render(request, 'mooc/topic.html',context={'topic_id':topic_id, 'topic': topic})
\ No newline at end of file
+    if topic:
+        topic_content = topic.content
+    else:
+        topic_content =None
+    video_d = str(topic.video)
+    return render(request, 'mooc/topic.html', context={'topic_id': topic_id, 'topic': topic, 'content': topic_content, 'video': video_d})
diff --git a/mooc_chatbot/__pycache__/settings.cpython-35.pyc b/mooc_chatbot/__pycache__/settings.cpython-35.pyc
index 182bbf6..b822649 100644
Binary files a/mooc_chatbot/__pycache__/settings.cpython-35.pyc and b/mooc_chatbot/__pycache__/settings.cpython-35.pyc differ
diff --git a/mooc_chatbot/__pycache__/urls.cpython-35.pyc b/mooc_chatbot/__pycache__/urls.cpython-35.pyc
index 7d70da0..af148fb 100644
Binary files a/mooc_chatbot/__pycache__/urls.cpython-35.pyc and b/mooc_chatbot/__pycache__/urls.cpython-35.pyc differ
diff --git a/mooc_chatbot/settings.py b/mooc_chatbot/settings.py
index e5c9ce6..add337d 100644
--- a/mooc_chatbot/settings.py
+++ b/mooc_chatbot/settings.py
@@ -14,7 +14,7 @@
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
+STATICFILES_DIRS = (os.path.join(BASE_DIR, "uploads/"), )
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/