diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue
index e87321b8..18e995e1 100644
--- a/client/src/components/ContentBlock.vue
+++ b/client/src/components/ContentBlock.vue
@@ -23,11 +23,12 @@
 </template>
 
 <script>
-  import TextBlock from '@/components/content-blocks/TextBlock.vue';
-  import BasicKnowledgeWidget from '@/components/content-blocks/BasicKnowledgeWidget.vue';
-  import Task from '@/components/content-blocks/Task.vue';
-  import ImageBlock from '@/components/content-blocks/ImageBlock.vue';
-  import StudentEntry from '@/components/content-blocks/StudentEntry.vue';
+  import TextBlock from '@/components/content-blocks/TextBlock';
+  import BasicKnowledgeWidget from '@/components/content-blocks/BasicKnowledgeWidget';
+  import Task from '@/components/content-blocks/Task';
+  import ImageBlock from '@/components/content-blocks/ImageBlock';
+  import VideoBlock from '@/components/content-blocks/VideoBlock';
+  import StudentEntry from '@/components/content-blocks/StudentEntry';
   import AddContentBlockButton from '@/components/AddContentBlockButton';
   import EyeIcon from '@/components/icons/EyeIcon';
 
@@ -39,6 +40,7 @@
       'basic_knowledge': BasicKnowledgeWidget,
       'student_entry': StudentEntry,
       'image_block': ImageBlock,
+      'video_block': VideoBlock,
       Task,
       AddContentBlockButton,
       EyeIcon
diff --git a/client/src/components/NewContentBlockWizard.vue b/client/src/components/NewContentBlockWizard.vue
index cc8732bd..6d581a9c 100644
--- a/client/src/components/NewContentBlockWizard.vue
+++ b/client/src/components/NewContentBlockWizard.vue
@@ -33,7 +33,7 @@
 
 <script>
   import Modal from '@/components/Modal';
-  import ContentBlockChooserWidget from '@/components/ContentBlockChooserWidget';
+  import ContentBlockChooserWidget from '@/components/content-forms/ContentBlockChooserWidget';
   import ContentBlockTitleInput from '@/components/ContentBlockTitleInput';
   import AddContentElement from '@/components/AddContentElement';
   import LinkForm from '@/components/content-forms/LinkForm';
@@ -66,7 +66,7 @@
         switch (element.type) {
           case 'link':
             return 'link-form';
-          case 'video':
+          case 'video_block':
             return 'video-form';
           case 'image':
             return 'image-form';
@@ -124,6 +124,12 @@
               url: ''
             };
             break;
+          case 'video_block':
+            el = {
+              ...el,
+              url: ''
+            };
+            break;
         }
 
         this.elements.splice(index, 1, el);
diff --git a/client/src/components/content-blocks/VideoBlock.vue b/client/src/components/content-blocks/VideoBlock.vue
new file mode 100644
index 00000000..971b88aa
--- /dev/null
+++ b/client/src/components/content-blocks/VideoBlock.vue
@@ -0,0 +1,36 @@
+<template>
+  <div class="video-block">
+    <youtube-embed v-if="isYoutube" :url="value.url"></youtube-embed>
+    <vimeo-embed v-if="isVimeo" :url="value.url"></vimeo-embed>
+  </div>
+</template>
+
+<script>
+  import YoutubeEmbed from '@/components/videos/YoutubeEmbed';
+  import VimeoEmbed from '@/components/videos/VimeoEmbed';
+  import {isVimeoUrl, isYoutubeUrl} from '@/helpers/video';
+
+  export default {
+    props: ['value'],
+
+    components: {
+      YoutubeEmbed,
+      VimeoEmbed
+    },
+
+    computed: {
+      isYoutube() {
+        return isYoutubeUrl(this.value.url);
+      },
+      isVimeo() {
+        return isVimeoUrl(this.value.url);
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .video-block {
+    margin-bottom: 30px;
+  }
+</style>
diff --git a/client/src/components/ContentBlockChooserWidget.vue b/client/src/components/content-forms/ContentBlockChooserWidget.vue
similarity index 98%
rename from client/src/components/ContentBlockChooserWidget.vue
rename to client/src/components/content-forms/ContentBlockChooserWidget.vue
index 809085cb..3262c65e 100644
--- a/client/src/components/ContentBlockChooserWidget.vue
+++ b/client/src/components/content-forms/ContentBlockChooserWidget.vue
@@ -4,7 +4,7 @@
       <link-icon class="content-block-chooser-widget__link-icon"></link-icon>
       <div class="content-block-chooser-widget__link-title">Link</div>
     </div>
-    <div class="content-block-chooser-widget__link" v-on:click="$emit('change-type', index, 'video')">
+    <div class="content-block-chooser-widget__link" v-on:click="$emit('change-type', index, 'video_block')">
       <video-icon class="content-block-chooser-widget__link-icon"></video-icon>
       <div class="content-block-chooser-widget__link-title">Video</div>
     </div>
diff --git a/client/src/components/content-forms/VideoForm.vue b/client/src/components/content-forms/VideoForm.vue
index 56e44e5f..f0aba251 100644
--- a/client/src/components/content-forms/VideoForm.vue
+++ b/client/src/components/content-forms/VideoForm.vue
@@ -15,14 +15,10 @@
     </div>
 
     <div v-if="isYoutube">
-      <iframe id="ytplayer" type="text/html"
-              rel="0"
-              :src="`https://www.youtube.com/embed/${videoId}`"
-              frameborder="0"></iframe>
+      <youtube-embed :url="url"></youtube-embed>
     </div>
     <div v-if="isVimeo">
-      <iframe :src="`https://player.vimeo.com/video/${videoId}`" frameborder="0"
-              webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+      <vimeo-embed :url="url"></vimeo-embed>
     </div>
 
   </div>
@@ -30,32 +26,25 @@
 
 <script>
   import InfoIcon from '@/components/icons/InfoIcon';
-
-  const YOUTUBE = /^(?:https:\/\/)?(?:www.)?youtube.com\/watch\?v=([a-zA-Z0-9]*)$/;
-  const VIMEO = /^(?:https:\/\/)?(?:www.)?vimeo.com\/([a-zA-Z0-9]*)$/;
+  import YoutubeEmbed from '@/components/videos/YoutubeEmbed';
+  import VimeoEmbed from '@/components/videos/VimeoEmbed';
+  import {isVimeoUrl, isYoutubeUrl} from '@/helpers/video';
 
   export default {
     props: ['url', 'index'],
 
     components: {
-      InfoIcon
+      InfoIcon,
+      YoutubeEmbed,
+      VimeoEmbed
     },
 
     computed: {
       isYoutube() {
-        return YOUTUBE.test(this.url);
+        return isYoutubeUrl(this.url);
       },
       isVimeo() {
-        return VIMEO.test(this.url);
-      },
-      videoId() {
-        if (this.isYoutube) {
-          return YOUTUBE.exec(this.url)[1];
-        } else if (this.isVimeo) {
-          return VIMEO.exec(this.url)[1];
-        } else {
-          return '';
-        }
+        return isVimeoUrl(this.url);
       }
     }
   }
@@ -95,9 +84,5 @@
 
   }
 
-  iframe {
-    width: 100%;
-    height: 350px;
-  }
 
 </style>
diff --git a/client/src/components/videos/VimeoEmbed.vue b/client/src/components/videos/VimeoEmbed.vue
new file mode 100644
index 00000000..5b5a9694
--- /dev/null
+++ b/client/src/components/videos/VimeoEmbed.vue
@@ -0,0 +1,25 @@
+<template>
+  <iframe class="vimeo-embed" :src="`https://player.vimeo.com/video/${videoId}`" frameborder="0"
+          webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+</template>
+
+<script>
+  import {getVideoId} from '@/helpers/video';
+
+  export default {
+    props: ['url'],
+
+    computed: {
+      videoId() {
+        return getVideoId(this.url);
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .vimeo-embed {
+    width: 100%;
+    height: 350px;
+  }
+</style>
diff --git a/client/src/components/videos/YoutubeEmbed.vue b/client/src/components/videos/YoutubeEmbed.vue
new file mode 100644
index 00000000..4a24d1c1
--- /dev/null
+++ b/client/src/components/videos/YoutubeEmbed.vue
@@ -0,0 +1,27 @@
+<template>
+  <iframe class="youtube-embed" id="ytplayer" type="text/html"
+          rel="0"
+          :src="`https://www.youtube.com/embed/${videoId}`"
+          frameborder="0"></iframe>
+</template>
+
+<script>
+  import {getVideoId} from '@/helpers/video';
+
+  export default {
+    props: ['url'],
+
+    computed: {
+      videoId() {
+        return getVideoId(this.url);
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .youtube-embed {
+    width: 100%;
+    height: 350px;
+  }
+</style>
diff --git a/client/src/helpers/video.js b/client/src/helpers/video.js
new file mode 100644
index 00000000..2e4b4e87
--- /dev/null
+++ b/client/src/helpers/video.js
@@ -0,0 +1,20 @@
+const YOUTUBE = /^(?:https:\/\/)?(?:www.)?youtube.com\/watch\?v=([a-zA-Z0-9_-]{11})$/;
+const VIMEO = /^(?:https:\/\/)?(?:www.)?vimeo.com\/([a-zA-Z0-9]*)$/;
+
+export function isYoutubeUrl(url) {
+  return YOUTUBE.test(url);
+}
+
+export function isVimeoUrl(url) {
+  return VIMEO.test(url);
+}
+
+export function getVideoId(url) {
+  if (isYoutubeUrl(url)) {
+    return YOUTUBE.exec(url)[1];
+  } else if (isVimeoUrl(url)) {
+    return VIMEO.exec(url)[1];
+  } else {
+    return '';
+  }
+}
diff --git a/server/book/blocks.py b/server/book/blocks.py
index c96802f5..99c515f5 100644
--- a/server/book/blocks.py
+++ b/server/book/blocks.py
@@ -31,6 +31,11 @@ class StudentEntryBlock(blocks.StructBlock):
     task_text = blocks.RichTextBlock()
 
 
+# 'video_block'
+class VideoBlock(blocks.StructBlock):
+    url = blocks.URLBlock()
+
+
 # 'text_block' 'task' 'basic_knowledge' 'student_entry' 'image_block'
 #
 # url = blocks.URLBlock()
diff --git a/server/book/models/contentblock.py b/server/book/models/contentblock.py
index 4625b2e6..0ef9da15 100644
--- a/server/book/models/contentblock.py
+++ b/server/book/models/contentblock.py
@@ -5,7 +5,7 @@ from wagtail.admin.edit_handlers import FieldPanel, TabbedInterface, ObjectList,
 from wagtail.core.fields import StreamField
 from wagtail.images.blocks import ImageChooserBlock
 
-from book.blocks import TextBlock, BasicKnowledgeBlock, StudentEntryBlock, LinkBlock
+from book.blocks import TextBlock, BasicKnowledgeBlock, StudentEntryBlock, LinkBlock, VideoBlock
 from core.wagtail_utils import StrictHierarchyPage
 from user.models import UserGroup
 
@@ -35,7 +35,8 @@ class ContentBlock(StrictHierarchyPage):
         ('student_entry', StudentEntryBlock(icon='download')),
         ('image_block', ImageChooserBlock(icon='image')),
         ('link_block', LinkBlock(icon='link')),
-        ('task', TextBlock(icon='tick'))
+        ('task', TextBlock(icon='tick')),
+        ('video_block', VideoBlock(icon='media')),
     ], null=True, blank=True)
 
     type = models.CharField(
diff --git a/server/book/schema/mutations.py b/server/book/schema/mutations.py
index 8aa8052e..e2abbe22 100644
--- a/server/book/schema/mutations.py
+++ b/server/book/schema/mutations.py
@@ -31,7 +31,11 @@ def handle_content_blocks(content_data):
         elif content['type'] == 'task':
             pass
         elif content['type'] == 'video_block':
-            pass
+            new_contents.append({
+                'type': 'video_block',
+                'value': {
+                    'url': bleach.clean(content['url'])
+                }})
         elif content['type'] == 'document_block':
             pass
     return new_contents