diff --git a/AUTHORS b/AUTHORS
index 94963e4630..2f4d7efead 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -89,3 +89,4 @@ Akshay Jagadeesh <akjags@gmail.com>
 Nick Parlante <nick.parlante@cs.stanford.edu>
 Marko Seric <marko.seric@math.uzh.ch>
 Felipe Montoya <felipe.montoya@edunext.co>
+Julia Hansbrough <julia@edx.org>
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3a9eb76165..49e5841712 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,8 +5,21 @@ These are notable changes in edx-platform.  This is a rolling list of changes,
 in roughly chronological order, most recent first.  Add your entries at or near
 the top.  Include a label indicating the component affected.
 
+Blades: Hovering over CC button in video player, when transcripts are hidden,
+will cause them to show up. Moving the mouse from the CC button will auto hide
+them. You can hover over the CC button and then move the mouse to the
+transcripts which will allow you to select some video position in 1 click.
+
+Blades: Add possibility to use multiple LTI tools per page.
+
+Blades: LTI module can now load external content in a new window.
+
 LMS: Disable data download buttons on the instructor dashboard for large courses
 
+LMS: Ported bulk emailing to the beta instructor dashboard.
+
+LMS: Add monitoring of bulk email subtasks to display progress on instructor dash.
+
 LMS: Refactor and clean student dashboard templates.
 
 LMS: Fix issue with CourseMode expiration dates
@@ -22,6 +35,8 @@ Studio: Switched to loading Javascript using require.js
 
 Studio: Better feedback during the course import process
 
+Studio: Improve drag and drop on the course overview and subsection views.
+
 LMS: Add split testing functionality for internal use.
 
 CMS: Add edit_course_tabs management command, providing a primitive
@@ -73,6 +88,11 @@ Common: Allow instructors to input complicated expressions as answers to
 `NumericalResponse`s. Prior to the change only numbers were allowed, now any
 answer from '1/3' to 'sqrt(12)*(1-1/3^2+1/5/3^2)' are valid.
 
+Studio/LMS: Allow for 'preview' and 'published' in a single LMS instance. Use
+middlware components to retain the incoming Django request and put in thread
+local storage. It is recommended that all developers define a 'preview.localhost'
+which maps to the same IP address as localhost in his/her HOSTS file.
+
 LMS: Enable beta instructor dashboard. The beta dashboard is a rearchitecture
 of the existing instructor dashboard and is available by clicking a link at
 the top right of the existing dashboard.
diff --git a/cms/djangoapps/contentstore/features/common.py b/cms/djangoapps/contentstore/features/common.py
index 992de9301c..8a34a2faea 100644
--- a/cms/djangoapps/contentstore/features/common.py
+++ b/cms/djangoapps/contentstore/features/common.py
@@ -2,7 +2,7 @@
 # pylint: disable=W0621
 
 from lettuce import world, step
-from nose.tools import assert_true, assert_equal, assert_in, assert_false  # pylint: disable=E0611
+from nose.tools import assert_true, assert_in, assert_false  # pylint: disable=E0611
 
 from auth.authz import get_user_by_email, get_course_groupname_for_role
 from django.conf import settings
@@ -224,14 +224,50 @@ def i_enabled_the_advanced_module(step, module):
     press_the_notification_button(step, 'Save')
 
 
-@step('I have clicked the new unit button')
-def open_new_unit(step):
-    step.given('I have opened a new course section in Studio')
-    step.given('I have added a new subsection')
-    step.given('I expand the first section')
-    old_url = world.browser.url
-    world.css_click('a.new-unit-item')
-    world.wait_for(lambda x: world.browser.url != old_url)
+@world.absorb
+def create_course_with_unit():
+    """
+    Prepare for tests by creating a course with a section, subsection, and unit.
+    Performs the following:
+        Clear out all courseware
+        Create a course with a section, subsection, and unit
+        Create a user and make that user a course author
+        Log the user into studio
+        Open the course from the dashboard
+        Expand the section and click on the New Unit link
+    The end result is the page where the user is editing the new unit
+    """
+    world.clear_courses()
+    course = world.CourseFactory.create()
+    world.scenario_dict['COURSE'] = course
+    section = world.ItemFactory.create(parent_location=course.location)
+    world.ItemFactory.create(
+        parent_location=section.location,
+        category='sequential',
+        display_name='Subsection One',
+    )
+    user = create_studio_user(is_staff=False)
+    add_course_author(user, course)
+
+    log_into_studio()
+    world.css_click('a.course-link')
+
+    css_selectors = [
+        'div.section-item a.expand-collapse-icon', 'a.new-unit-item'
+    ]
+    for selector in css_selectors:
+        world.css_click(selector)
+
+    world.wait_for_mathjax()
+    world.wait_for_xmodule()
+
+    assert world.is_css_present('ul.new-component-type')
+
+
+@step('I have clicked the new unit button$')
+@step(u'I am in Studio editing a new unit$')
+def edit_new_unit(step):
+    create_course_with_unit()
 
 
 @step('the save notification button is disabled')
@@ -267,9 +303,9 @@ def confirm_the_prompt(step):
     assert_false(world.css_find(btn_css).visible)
 
 
-@step(u'I am shown a (.*)$')
-def i_am_shown_a_notification(step, notification_type):
-    assert world.is_css_present('.wrapper-%s' % notification_type)
+@step(u'I am shown a prompt$')
+def i_am_shown_a_notification(step):
+    assert world.is_css_present('.wrapper-prompt')
 
 
 def type_in_codemirror(index, text):
diff --git a/cms/djangoapps/contentstore/features/component.feature b/cms/djangoapps/contentstore/features/component.feature
index 3877cccc55..7f31eb6d69 100644
--- a/cms/djangoapps/contentstore/features/component.feature
+++ b/cms/djangoapps/contentstore/features/component.feature
@@ -80,9 +80,3 @@ Feature: CMS.Component Adding
         And I add a "Blank Advanced Problem" "Advanced Problem" component
         And I delete all components
         Then I see no components
-
-    Scenario: I see a notification on save
-        Given I am in Studio editing a new unit
-        And I add a "Discussion" "single step" component
-        And I edit and save a component
-        Then I am shown a notification
diff --git a/cms/djangoapps/contentstore/features/component.py b/cms/djangoapps/contentstore/features/component.py
index bec0c9431b..f8425a3600 100644
--- a/cms/djangoapps/contentstore/features/component.py
+++ b/cms/djangoapps/contentstore/features/component.py
@@ -2,43 +2,19 @@
 #pylint: disable=W0621
 
 from lettuce import world, step
-from nose.tools import assert_true, assert_in, assert_equal  # pylint: disable=E0611
-from common import create_studio_user, add_course_author, log_into_studio
-
-
-@step(u'I am in Studio editing a new unit$')
-def add_unit(step):
-    world.clear_courses()
-    course = world.CourseFactory.create()
-    section = world.ItemFactory.create(parent_location=course.location)
-    world.ItemFactory.create(
-        parent_location=section.location,
-        category='sequential',
-        display_name='Subsection One',)
-    user = create_studio_user(is_staff=False)
-    add_course_author(user, course)
-    log_into_studio()
-    world.wait_for_requirejs([
-        "jquery", "js/models/course", "coffee/src/models/module",
-        "coffee/src/views/unit", "jquery.ui",
-    ])
-    world.wait_for_mathjax()
-    css_selectors = [
-        'a.course-link', 'div.section-item a.expand-collapse-icon',
-        'a.new-unit-item',
-    ]
-    for selector in css_selectors:
-        world.css_click(selector)
+from nose.tools import assert_true, assert_in  # pylint: disable=E0611
 
 
 @step(u'I add this type of single step component:$')
 def add_a_single_step_component(step):
-    world.wait_for_xmodule()
     for step_hash in step.hashes:
         component = step_hash['Component']
         assert_in(component, ['Discussion', 'Video'])
-        css_selector = 'a[data-type="{}"]'.format(component.lower())
-        world.css_click(css_selector)
+
+        world.create_component_instance(
+            step=step,
+            category='{}'.format(component.lower()),
+        )
 
 
 @step(u'I see this type of single step component:$')
@@ -53,51 +29,24 @@ def see_a_single_step_component(step):
 
 @step(u'I add this type of( Advanced)? (HTML|Problem) component:$')
 def add_a_multi_step_component(step, is_advanced, category):
-    def click_advanced():
-        css = 'ul.problem-type-tabs a[href="#tab2"]'
-        world.css_click(css)
-        my_css = 'ul.problem-type-tabs li.ui-state-active a[href="#tab2"]'
-        assert(world.css_find(my_css))
-
-    def find_matching_link():
-        """
-        Find the link with the specified text. There should be one and only one.
-        """
-        # The tab shows links for the given category
-        links = world.css_find('div.new-component-{} a'.format(category))
-
-        # Find the link whose text matches what you're looking for
-        matched_links = [link for link in links if link.text == step_hash['Component']]
-
-        # There should be one and only one
-        assert_equal(len(matched_links), 1)
-        return matched_links[0]
-
-    def click_link():
-        link.click()
-
-    world.wait_for_xmodule()
-    category = category.lower()
     for step_hash in step.hashes:
-        css_selector = 'a[data-type="{}"]'.format(category)
-        world.css_click(css_selector)
-        world.wait_for_invisible(css_selector)
-
-        if is_advanced:
-            # Sometimes this click does not work if you go too fast.
-            world.retry_on_exception(click_advanced, max_attempts=5, ignored_exceptions=AssertionError)
-
-        # Retry this in case the list is empty because you tried too fast.
-        link = world.retry_on_exception(func=find_matching_link, ignored_exceptions=AssertionError)
-
-        # Wait for the link to be clickable. If you go too fast it is not.
-        world.retry_on_exception(click_link)
+        world.create_component_instance(
+            step=step,
+            category='{}'.format(category.lower()),
+            component_type=step_hash['Component'],
+            is_advanced=bool(is_advanced),
+        )
 
 
 @step(u'I see (HTML|Problem) components in this order:')
 def see_a_multi_step_component(step, category):
-    components = world.css_find('li.component section.xmodule_display')
+
+    # Wait for all components to finish rendering
+    selector = 'li.component section.xmodule_display'
+    world.wait_for(lambda _: len(world.css_find(selector)) == len(step.hashes))
+
     for idx, step_hash in enumerate(step.hashes):
+
         if category == 'HTML':
             html_matcher = {
                 'Text':
@@ -107,9 +56,11 @@ def see_a_multi_step_component(step, category):
                 'E-text Written in LaTeX':
                     '<h2>Example: E-text page</h2>',
             }
-            assert_in(html_matcher[step_hash['Component']], components[idx].html)
+            actual_html = world.css_html(selector, index=idx)
+            assert_in(html_matcher[step_hash['Component']], actual_html)
         else:
-            assert_in(step_hash['Component'].upper(), components[idx].text)
+            actual_text = world.css_text(selector, index=idx)
+            assert_in(step_hash['Component'].upper(), actual_text)
 
 
 @step(u'I add a "([^"]*)" "([^"]*)" component$')
diff --git a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
index 9881290eba..d816e6e4bb 100644
--- a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
+++ b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
@@ -2,30 +2,35 @@
 #pylint: disable=C0111
 
 from lettuce import world
-from nose.tools import assert_equal, assert_true  # pylint: disable=E0611
+from nose.tools import assert_equal, assert_true, assert_in  # pylint: disable=E0611
 from terrain.steps import reload_the_page
 
 
 @world.absorb
-def create_component_instance(step, component_button_css, category,
-                              expected_css, boilerplate=None,
-                              has_multiple_templates=True):
+def create_component_instance(step, category, component_type=None, is_advanced=False):
+    """
+    Create a new component in a Unit.
 
-    click_new_component_button(step, component_button_css)
+    Parameters
+    ----------
+    category: component type (discussion, html, problem, video)
+    component_type: for components with multiple templates, the link text in the menu
+    is_advanced: for html and problem, is the desired component under the
+                 advanced menu
+    """
+    assert_in(category, ['problem', 'html', 'video', 'discussion'])
+
+    component_button_css = '.large-{}-icon'.format(category.lower())
+    world.css_click(component_button_css)
 
     if category in ('problem', 'html'):
+        world.wait_for_invisible(component_button_css)
+        click_component_from_menu(category, component_type, is_advanced)
 
-        def animation_done(_driver):
-            script = "$('div.new-component').css('display')"
-            return world.browser.evaluate_script(script) == 'none'
-
-        world.wait_for(animation_done)
-
-    if has_multiple_templates:
-        click_component_from_menu(category, boilerplate, expected_css)
-
-    if category in ('video',):
-        world.wait_for_xmodule()
+    if category == 'problem':
+        expected_css = 'section.xmodule_CapaModule'
+    else:
+        expected_css = 'section.xmodule_{}Module'.format(category.title())
 
     assert_true(world.is_css_present(expected_css))
 
@@ -33,29 +38,53 @@ def create_component_instance(step, component_button_css, category,
 @world.absorb
 def click_new_component_button(step, component_button_css):
     step.given('I have clicked the new unit button')
-    world.wait_for_requirejs(
-        ["jquery", "js/models/course", "coffee/src/models/module",
-         "coffee/src/views/unit", "jquery.ui"]
-    )
     world.css_click(component_button_css)
 
 
-@world.absorb
-def click_component_from_menu(category, boilerplate, expected_css):
+def _click_advanced():
+    css = 'ul.problem-type-tabs a[href="#tab2"]'
+    world.css_click(css)
+    my_css = 'ul.problem-type-tabs li.ui-state-active a[href="#tab2"]'
+    assert(world.css_find(my_css))
+
+
+def _find_matching_link(category, component_type):
     """
-    Creates a component from `instance_id`. For components with more
-    than one template, clicks on `elem_css` to create the new
-    component. Components with only one template are created as soon
-    as the user clicks the appropriate button, so we assert that the
-    expected component is present.
+    Find the link with the specified text. There should be one and only one.
     """
-    if boilerplate:
-        elem_css = "a[data-category='{}'][data-boilerplate='{}']".format(category, boilerplate)
-    else:
-        elem_css = "a[data-category='{}']:not([data-boilerplate])".format(category)
-    elements = world.css_find(elem_css)
-    assert_equal(len(elements), 1)
-    world.css_click(elem_css)
+
+    # The tab shows links for the given category
+    links = world.css_find('div.new-component-{} a'.format(category))
+
+    # Find the link whose text matches what you're looking for
+    matched_links = [link for link in links if link.text == component_type]
+
+    # There should be one and only one
+    assert_equal(len(matched_links), 1)
+    return matched_links[0]
+
+
+def click_component_from_menu(category, component_type, is_advanced):
+    """
+    Creates a component for a category with more
+    than one template, i.e. HTML and Problem.
+    For some problem types, it is necessary to click to
+    the Advanced tab.
+    The component_type is the link text, e.g. "Blank Common Problem"
+    """
+    if is_advanced:
+        # Sometimes this click does not work if you go too fast.
+        world.retry_on_exception(_click_advanced,
+            ignored_exceptions=AssertionError)
+
+    # Retry this in case the list is empty because you tried too fast.
+    link = world.retry_on_exception(
+        lambda: _find_matching_link(category, component_type),
+        ignored_exceptions=AssertionError
+    )
+
+    # Wait for the link to be clickable. If you go too fast it is not.
+    world.retry_on_exception(lambda: link.click())
 
 
 @world.absorb
diff --git a/cms/djangoapps/contentstore/features/course-overview.feature b/cms/djangoapps/contentstore/features/course-overview.feature
index 80b400a58e..a10237de5d 100644
--- a/cms/djangoapps/contentstore/features/course-overview.feature
+++ b/cms/djangoapps/contentstore/features/course-overview.feature
@@ -58,20 +58,3 @@ Feature: CMS.Course Overview
         And I click the "Expand All Sections" link
         Then I see the "Collapse All Sections" link
         And all sections are expanded
-
-   Scenario: Notification is shown on grading status changes
-        Given I have a course with 1 section
-        When I navigate to the course overview page
-        And I change an assignment's grading status
-        Then I am shown a notification
-
-    # Notification is not shown on reorder for IE
-    # Safari does not have moveMouseTo implemented
-    @skip_internetexplorer
-    @skip_safari
-    Scenario: Notification is shown on subsection reorder
-        Given I have opened a new course section in Studio
-        And I have added a new subsection
-        And I have added a new subsection
-        When I reorder subsections
-        Then I am shown a notification
diff --git a/cms/djangoapps/contentstore/features/course-overview.py b/cms/djangoapps/contentstore/features/course-overview.py
index 57e9d13501..6890e39491 100644
--- a/cms/djangoapps/contentstore/features/course-overview.py
+++ b/cms/djangoapps/contentstore/features/course-overview.py
@@ -91,8 +91,7 @@ def i_expand_a_section(step):
 @step(u'I see the "([^"]*)" link$')
 def i_see_the_span_with_text(step, text):
     span_locator = '.toggle-button-sections span'
-    assert_true(world.is_css_present(span_locator))
-    assert_equal(world.css_value(span_locator), text)
+    assert_true(world.css_has_value(span_locator, text))
     assert_true(world.css_visible(span_locator))
 
 
@@ -128,10 +127,10 @@ def change_grading_status(step):
 
 @step(u'I reorder subsections')
 def reorder_subsections(_step):
-    draggable_css = 'a.drag-handle'
+    draggable_css = '.subsection-drag-handle'
     ele = world.css_find(draggable_css).first
     ele.action_chains.drag_and_drop_by_offset(
         ele._element,
-        30,
-        0
+        0,
+        25
     ).perform()
diff --git a/cms/djangoapps/contentstore/features/course-settings.py b/cms/djangoapps/contentstore/features/course-settings.py
index 7ec6a1071a..f92df428ef 100644
--- a/cms/djangoapps/contentstore/features/course-settings.py
+++ b/cms/djangoapps/contentstore/features/course-settings.py
@@ -151,9 +151,10 @@ def i_see_new_course_image(_step):
     assert len(images) == 1
     img = images[0]
     expected_src = '/c4x/MITx/999/asset/image.jpg'
+
     # Don't worry about the domain in the URL
-    assert img['src'].endswith(expected_src), "Was looking for {expected}, found {actual}".format(
-        expected=expected_src, actual=img['src'])
+    success_func = lambda _: img['src'].endswith(expected_src)
+    world.wait_for(success_func)
 
 
 @step('the image URL should be present in the field')
diff --git a/cms/djangoapps/contentstore/features/course-team.py b/cms/djangoapps/contentstore/features/course-team.py
index deba2d820d..4ccac98020 100644
--- a/cms/djangoapps/contentstore/features/course-team.py
+++ b/cms/djangoapps/contentstore/features/course-team.py
@@ -50,8 +50,8 @@ def other_delete_self(_step):
 
 @step(u'I make "([^"]*)" a course team admin')
 def make_course_team_admin(_step, name):
-    admin_btn_css = '.user-item[data-email="{email}"] .user-actions .add-admin-role'.format(
-        email=name+'@edx.org')
+    admin_btn_css = '.user-item[data-email="{name}@edx.org"] .user-actions .add-admin-role'.format(
+        name=name)
     world.css_click(admin_btn_css)
 
 
@@ -80,8 +80,8 @@ def see_course(_step, do_not_see, gender='self'):
 
 @step(u'"([^"]*)" should( not)? be marked as an admin')
 def marked_as_admin(_step, name, not_marked_admin):
-    flag_css = '.user-item[data-email="{email}"] .flag-role.flag-role-admin'.format(
-        email=name+'@edx.org')
+    flag_css = '.user-item[data-email="{name}@edx.org"] .flag-role.flag-role-admin'.format(
+        name=name)
     if not_marked_admin:
         assert world.is_css_not_present(flag_css)
     else:
diff --git a/cms/djangoapps/contentstore/features/course_import.py b/cms/djangoapps/contentstore/features/course_import.py
new file mode 100644
index 0000000000..84b7affe30
--- /dev/null
+++ b/cms/djangoapps/contentstore/features/course_import.py
@@ -0,0 +1,21 @@
+import os
+from lettuce import world
+from django.conf import settings
+
+
+def import_file(filename):
+    world.browser.execute_script("$('input.file-input').css('display', 'block')")
+    path = os.path.join(settings.COMMON_TEST_DATA_ROOT, "imports", filename)
+    world.browser.attach_file('course-data', os.path.abspath(path))
+    world.css_click('input.submit-button')
+    # Go to course outline
+    world.click_course_content()
+    outline_css = 'li.nav-course-courseware-outline a'
+    world.css_click(outline_css)
+
+
+def go_to_import():
+    menu_css = 'li.nav-course-tools'
+    import_css = 'li.nav-course-tools-import a'
+    world.css_click(menu_css)
+    world.css_click(import_css)
diff --git a/cms/djangoapps/contentstore/features/discussion-editor.feature b/cms/djangoapps/contentstore/features/discussion-editor.feature
index 7278accf0b..17904e8820 100644
--- a/cms/djangoapps/contentstore/features/discussion-editor.feature
+++ b/cms/djangoapps/contentstore/features/discussion-editor.feature
@@ -2,7 +2,7 @@
 Feature: CMS.Discussion Component Editor
   As a course author, I want to be able to create discussion components.
 
-  Scenario: User can view metadata
+  Scenario: User can view discussion component metadata
     Given I have created a Discussion Tag
     And I edit and select Settings
     Then I see three alphabetized settings and their expected values
@@ -14,7 +14,3 @@ Feature: CMS.Discussion Component Editor
     And I edit and select Settings
     Then I can modify the display name
     And my display name change is persisted on save
-
-  Scenario: Creating a discussion takes a single click
-    Given I have clicked the new unit button
-    Then creating a discussion takes a single click
diff --git a/cms/djangoapps/contentstore/features/discussion-editor.py b/cms/djangoapps/contentstore/features/discussion-editor.py
index d68860ff49..0bae84459f 100644
--- a/cms/djangoapps/contentstore/features/discussion-editor.py
+++ b/cms/djangoapps/contentstore/features/discussion-editor.py
@@ -6,11 +6,10 @@ from lettuce import world, step
 
 @step('I have created a Discussion Tag$')
 def i_created_discussion_tag(step):
+    world.create_course_with_unit()
     world.create_component_instance(
-        step, '.large-discussion-icon',
-        'discussion',
-        '.xmodule_DiscussionModule',
-        has_multiple_templates=False
+        step=step,
+        category='discussion',
     )
 
 
@@ -22,12 +21,3 @@ def i_see_only_the_settings_and_values(step):
             ['Display Name', "Discussion", False],
             ['Subcategory', "Topic-Level Student-Visible Label", False]
         ])
-
-
-@step('creating a discussion takes a single click')
-def discussion_takes_a_single_click(step):
-    component_css = '.xmodule_DiscussionModule'
-    assert world.is_css_not_present(component_css)
-
-    world.css_click("a[data-category='discussion']")
-    assert world.is_css_present(component_css)
diff --git a/cms/djangoapps/contentstore/features/grading.feature b/cms/djangoapps/contentstore/features/grading.feature
index f3ce1823e6..6c357a171e 100644
--- a/cms/djangoapps/contentstore/features/grading.feature
+++ b/cms/djangoapps/contentstore/features/grading.feature
@@ -59,6 +59,17 @@ Feature: CMS.Course Grading
         And I go back to the main course page
         Then I do see the assignment name "New Type"
 
+    # Note that "7" is a special weight because it revealed rounding errors (STUD-826).
+    Scenario: Users can set weight to Assignment types
+        Given I have opened a new course in Studio
+        And I am viewing the grading settings
+        When I add a new assignment type "New Type"
+        And I set the assignment weight to "7"
+        And I press the "Save" notification button
+        Then the assignment weight is displayed as "7"
+        And I reload the page
+        Then the assignment weight is displayed as "7"
+
     Scenario: Settings are only persisted when saved
         Given I have opened a new course in Studio
         And I have populated the course
diff --git a/cms/djangoapps/contentstore/features/grading.py b/cms/djangoapps/contentstore/features/grading.py
index 24beefcd6a..dcc11857d8 100644
--- a/cms/djangoapps/contentstore/features/grading.py
+++ b/cms/djangoapps/contentstore/features/grading.py
@@ -106,6 +106,22 @@ def add_assignment_type(step, new_name):
     new_assignment._element.send_keys(new_name)
 
 
+@step(u'I set the assignment weight to "([^"]*)"$')
+def set_weight(step, weight):
+    weight_id = '#course-grading-assignment-gradeweight'
+    weight_field = world.css_find(weight_id)[-1]
+    old_weight = world.css_value(weight_id, -1)
+    for count in range(len(old_weight)):
+        weight_field._element.send_keys(Keys.END, Keys.BACK_SPACE)
+    weight_field._element.send_keys(weight)
+
+
+@step(u'the assignment weight is displayed as "([^"]*)"$')
+def verify_weight(step, weight):
+    weight_id = '#course-grading-assignment-gradeweight'
+    assert_equal(world.css_value(weight_id, -1), weight)
+
+
 @step(u'I have populated the course')
 def populate_course(step):
     step.given('I have added a new section')
@@ -164,7 +180,7 @@ def cannot_edit_fail(_step):
 def i_change_grace_period(_step, grace_period):
     grace_period_css = '#course-grading-graceperiod'
     ele = world.css_find(grace_period_css).first
-    
+
     # Sometimes it takes a moment for the JavaScript
     # to populate the field.  If we don't wait for
     # this to happen, then we can end up with
diff --git a/cms/djangoapps/contentstore/features/html-editor.py b/cms/djangoapps/contentstore/features/html-editor.py
index d89f052dcc..f00db67c07 100644
--- a/cms/djangoapps/contentstore/features/html-editor.py
+++ b/cms/djangoapps/contentstore/features/html-editor.py
@@ -6,9 +6,11 @@ from lettuce import world, step
 
 @step('I have created a Blank HTML Page$')
 def i_created_blank_html_page(step):
+    world.create_course_with_unit()
     world.create_component_instance(
-        step, '.large-html-icon', 'html',
-        '.xmodule_HtmlModule'
+        step=step,
+        category='html',
+        component_type='Text'
     )
 
 
@@ -18,11 +20,10 @@ def i_see_only_the_html_display_name(step):
 
 
 @step('I have created an E-text Written in LaTeX$')
-def i_created_blank_html_page(step):
+def i_created_etext_in_latex(step):
+    world.create_course_with_unit()
     world.create_component_instance(
-        step,
-        '.large-html-icon',
-        'html',
-        '.xmodule_HtmlModule',
-        'latex_html.yaml'
+        step=step,
+        category='html',
+        component_type='E-text Written in LaTeX'
     )
diff --git a/cms/djangoapps/contentstore/features/problem-editor.feature b/cms/djangoapps/contentstore/features/problem-editor.feature
index e3f659a929..f3b75ebf7e 100644
--- a/cms/djangoapps/contentstore/features/problem-editor.feature
+++ b/cms/djangoapps/contentstore/features/problem-editor.feature
@@ -89,3 +89,13 @@ Feature: CMS.Problem Editor
     When I edit and compile the High Level Source
     Then my change to the High Level Source is persisted
     And when I view the High Level Source I see my changes
+
+  Scenario: Exceptions don't cause problem to be uneditable (bug STUD-786)
+    Given I have an empty course
+    And I go to the import page
+    And I import the file "get_html_exception_test.tar.gz"
+    When I go to the unit "Probability and BMI"
+    And I click on "edit a draft"
+    Then I see a message that says "We're having trouble rendering your component"
+    And I can edit the problem
+
diff --git a/cms/djangoapps/contentstore/features/problem-editor.py b/cms/djangoapps/contentstore/features/problem-editor.py
index fca2249066..ef8a3b5a4a 100644
--- a/cms/djangoapps/contentstore/features/problem-editor.py
+++ b/cms/djangoapps/contentstore/features/problem-editor.py
@@ -1,9 +1,12 @@
 # disable missing docstring
 #pylint: disable=C0111
 
+import json
 from lettuce import world, step
 from nose.tools import assert_equal, assert_true  # pylint: disable=E0611
-from common import type_in_codemirror
+from common import type_in_codemirror, open_new_course
+from course_import import import_file, go_to_import
+
 
 DISPLAY_NAME = "Display Name"
 MAXIMUM_ATTEMPTS = "Maximum Attempts"
@@ -14,17 +17,16 @@ SHOW_ANSWER = "Show Answer"
 
 @step('I have created a Blank Common Problem$')
 def i_created_blank_common_problem(step):
+    world.create_course_with_unit()
     world.create_component_instance(
-        step,
-        '.large-problem-icon',
-        'problem',
-        '.xmodule_CapaModule',
-        'blank_common.yaml'
+        step=step,
+        category='problem',
+        component_type='Blank Common Problem'
     )
 
 
 @step('I edit and select Settings$')
-def i_edit_and_select_settings(step):
+def i_edit_and_select_settings(_step):
     world.edit_component_and_select_settings()
 
 
@@ -41,7 +43,7 @@ def i_see_advanced_settings_with_values(step):
 
 
 @step('I can modify the display name')
-def i_can_modify_the_display_name(step):
+def i_can_modify_the_display_name(_step):
     # Verifying that the display name can be a string containing a floating point value
     # (to confirm that we don't throw an error because it is of the wrong type).
     index = world.get_setting_entry_index(DISPLAY_NAME)
@@ -58,7 +60,7 @@ def my_display_name_change_is_persisted_on_save(step):
 
 
 @step('I can specify special characters in the display name')
-def i_can_modify_the_display_name_with_special_chars(step):
+def i_can_modify_the_display_name_with_special_chars(_step):
     index = world.get_setting_entry_index(DISPLAY_NAME)
     world.css_fill('.wrapper-comp-setting .setting-input', "updated ' \" &", index=index)
     if world.is_firefox():
@@ -73,7 +75,7 @@ def special_chars_persisted_on_save(step):
 
 
 @step('I can revert the display name to unset')
-def can_revert_display_name_to_unset(step):
+def can_revert_display_name_to_unset(_step):
     world.revert_setting_entry(DISPLAY_NAME)
     verify_unset_display_name()
 
@@ -85,7 +87,7 @@ def my_display_name_is_persisted_on_save(step):
 
 
 @step('I can select Per Student for Randomization')
-def i_can_select_per_student_for_randomization(step):
+def i_can_select_per_student_for_randomization(_step):
     world.browser.select(RANDOMIZATION, "Per Student")
     verify_modified_randomization()
 
@@ -104,7 +106,7 @@ def i_can_revert_to_default_for_randomization(step):
 
 
 @step('I can set the weight to "(.*)"?')
-def i_can_set_weight(step, weight):
+def i_can_set_weight(_step, weight):
     set_weight(weight)
     verify_modified_weight()
 
@@ -164,25 +166,24 @@ def cancel_does_not_save_changes(step):
 
 @step('I have created a LaTeX Problem')
 def create_latex_problem(step):
-    world.click_new_component_button(step, '.large-problem-icon')
-
-    def animation_done(_driver):
-        return world.browser.evaluate_script("$('div.new-component').css('display')") == 'none'
-    world.wait_for(animation_done)
-    # Go to advanced tab.
-    world.css_click('#ui-id-2')
-    world.click_component_from_menu("problem", "latex_problem.yaml", '.xmodule_CapaModule')
+    world.create_course_with_unit()
+    world.create_component_instance(
+        step=step,
+        category='problem',
+        component_type='Problem Written in LaTeX',
+        is_advanced=True
+    )
 
 
 @step('I edit and compile the High Level Source')
-def edit_latex_source(step):
+def edit_latex_source(_step):
     open_high_level_source()
     type_in_codemirror(1, "hi")
     world.css_click('.hls-compile')
 
 
 @step('my change to the High Level Source is persisted')
-def high_level_source_persisted(step):
+def high_level_source_persisted(_step):
     def verify_text(driver):
         css_sel = '.problem div>span'
         return world.css_text(css_sel) == 'hi'
@@ -191,11 +192,53 @@ def high_level_source_persisted(step):
 
 
 @step('I view the High Level Source I see my changes')
-def high_level_source_in_editor(step):
+def high_level_source_in_editor(_step):
     open_high_level_source()
     assert_equal('hi', world.css_value('.source-edit-box'))
 
 
+@step(u'I have an empty course')
+def i_have_empty_course(step):
+    open_new_course()
+
+
+@step(u'I go to the import page')
+def i_go_to_import(_step):
+    go_to_import()
+
+
+@step(u'I import the file "([^"]*)"$')
+def i_import_the_file(_step, filename):
+    import_file(filename)
+
+
+@step(u'I click on "edit a draft"$')
+def i_edit_a_draft(_step):
+    world.css_click("a.create-draft")
+
+
+@step(u'I go to the vertical "([^"]*)"$')
+def i_go_to_vertical(_step, vertical):
+    world.css_click("span:contains('{0}')".format(vertical))
+
+
+@step(u'I go to the unit "([^"]*)"$')
+def i_go_to_unit(_step, unit):
+    loc = "window.location = $(\"span:contains('{0}')\").closest('a').attr('href')".format(unit)
+    world.browser.execute_script(loc)
+
+
+@step(u'I see a message that says "([^"]*)"$')
+def i_can_see_message(_step, msg):
+    msg = json.dumps(msg)     # escape quotes
+    world.css_has_text("h2.title", msg)
+
+
+@step(u'I can edit the problem$')
+def i_can_edit_problem(_step):
+    world.edit_component()
+
+
 def verify_high_level_source_links(step, visible):
     if visible:
         assert_true(world.is_css_present('.launch-latex-compiler'),
diff --git a/cms/djangoapps/contentstore/features/section.py b/cms/djangoapps/contentstore/features/section.py
index 3fea8637c6..b6f55969bb 100644
--- a/cms/djangoapps/contentstore/features/section.py
+++ b/cms/djangoapps/contentstore/features/section.py
@@ -5,8 +5,6 @@ from lettuce import world, step
 from common import *
 from nose.tools import assert_equal  # pylint: disable=E0611
 
-############### ACTIONS ####################
-
 
 @step('I click the New Section link$')
 def i_click_new_section_link(_step):
@@ -53,9 +51,6 @@ def i_see_a_mini_notification(_step, _type):
     assert world.is_css_present(saving_css)
 
 
-############ ASSERTIONS ###################
-
-
 @step('I see my section on the Courseware page$')
 def i_see_my_section_on_the_courseware_page(_step):
     see_my_section_on_the_courseware_page('My Section')
@@ -125,8 +120,6 @@ def the_section_release_date_is_updated(_step):
     assert_equal(status_text, 'Will Release: 12/25/2013 at 00:00 UTC')
 
 
-############ HELPER METHODS ###################
-
 def save_section_name(name):
     name_css = '.new-section-name'
     save_css = '.new-section-name-save'
diff --git a/cms/djangoapps/contentstore/features/textbooks.py b/cms/djangoapps/contentstore/features/textbooks.py
index 2cf6683d6d..bac4e6bebc 100644
--- a/cms/djangoapps/contentstore/features/textbooks.py
+++ b/cms/djangoapps/contentstore/features/textbooks.py
@@ -47,7 +47,7 @@ def name_textbook(_step, name):
 @step(u'I name the (first|second|third) chapter "([^"]*)"')
 def name_chapter(_step, ordinal, name):
     index = ["first", "second", "third"].index(ordinal)
-    input_css = ".textbook .chapter{i} input.chapter-name".format(i=index+1)
+    input_css = ".textbook .chapter{i} input.chapter-name".format(i=index + 1)
     world.css_fill(input_css, name)
     if world.is_firefox():
         world.trigger_event(input_css)
@@ -56,7 +56,7 @@ def name_chapter(_step, ordinal, name):
 @step(u'I type in "([^"]*)" for the (first|second|third) chapter asset')
 def asset_chapter(_step, name, ordinal):
     index = ["first", "second", "third"].index(ordinal)
-    input_css = ".textbook .chapter{i} input.chapter-asset-path".format(i=index+1)
+    input_css = ".textbook .chapter{i} input.chapter-asset-path".format(i=index + 1)
     world.css_fill(input_css, name)
     if world.is_firefox():
         world.trigger_event(input_css)
@@ -65,7 +65,7 @@ def asset_chapter(_step, name, ordinal):
 @step(u'I click the Upload Asset link for the (first|second|third) chapter')
 def click_upload_asset(_step, ordinal):
     index = ["first", "second", "third"].index(ordinal)
-    button_css = ".textbook .chapter{i} .action-upload".format(i=index+1)
+    button_css = ".textbook .chapter{i} .action-upload".format(i=index + 1)
     world.css_click(button_css)
 
 
diff --git a/cms/djangoapps/contentstore/features/upload.py b/cms/djangoapps/contentstore/features/upload.py
index cf0d92fc94..22a4425686 100644
--- a/cms/djangoapps/contentstore/features/upload.py
+++ b/cms/djangoapps/contentstore/features/upload.py
@@ -191,7 +191,7 @@ def view_asset(_step, status):
     # Note that world.visit would trigger a 403 error instead of displaying "Unauthorized"
     # Instead, we can drop back into the selenium driver get command.
     world.browser.driver.get(url)
-    assert_equal(world.css_text('body'),expected_text)
+    assert_equal(world.css_text('body'), expected_text)
 
 
 @step('I see a confirmation that the file was deleted$')
diff --git a/cms/djangoapps/contentstore/features/video-editor.feature b/cms/djangoapps/contentstore/features/video-editor.feature
index d5b4a2a03b..c281ca453e 100644
--- a/cms/djangoapps/contentstore/features/video-editor.feature
+++ b/cms/djangoapps/contentstore/features/video-editor.feature
@@ -15,12 +15,17 @@ Feature: CMS.Video Component Editor
     Then I can modify the display name
     And my video display name change is persisted on save
 
+  # Disabling this 10/7/13 due to nondeterministic behavior
+  # in master.  The failure seems to occur when YouTube does
+  # not respond quickly enough, so that the video player
+  # doesn't load.
+  #
   # Sauce Labs cannot delete cookies
-  @skip_sauce
-  Scenario: Captions are hidden when "show captions" is false
-    Given I have created a Video component with subtitles
-    And I have set "show captions" to False
-    Then when I view the video it does not show the captions
+  #  @skip_sauce
+  #Scenario: Captions are hidden when "show captions" is false
+  #  Given I have created a Video component with subtitles
+  #  And I have set "show captions" to False
+  #  Then when I view the video it does not show the captions
 
   # Sauce Labs cannot delete cookies
   @skip_sauce
diff --git a/cms/djangoapps/contentstore/features/video.feature b/cms/djangoapps/contentstore/features/video.feature
index 105a26c868..a47b2313c6 100644
--- a/cms/djangoapps/contentstore/features/video.feature
+++ b/cms/djangoapps/contentstore/features/video.feature
@@ -2,28 +2,33 @@
 Feature: CMS.Video Component
   As a course author, I want to be able to view my created videos in Studio.
 
+  # 1
   # Video Alpha Features will work in Firefox only when Firefox is the active window
   Scenario: Autoplay is disabled in Studio
     Given I have created a Video component
     Then when I view the video it does not have autoplay enabled
 
+  # 2
   Scenario: Creating a video takes a single click
     Given I have clicked the new unit button
     Then creating a video takes a single click
 
+  # 3
   # Sauce Labs cannot delete cookies
-  @skip_sauce
-  Scenario: Captions are hidden correctly
-    Given I have created a Video component with subtitles
-    And I have hidden captions
-    Then when I view the video it does not show the captions
+  #  @skip_sauce
+  #Scenario: Captions are hidden correctly
+  #  Given I have created a Video component with subtitles
+  #  And I have hidden captions
+  #  Then when I view the video it does not show the captions
 
+  # 4
   # Sauce Labs cannot delete cookies
   @skip_sauce
   Scenario: Captions are shown correctly
     Given I have created a Video component with subtitles
     Then when I view the video it does show the captions
 
+  # 5
   # Sauce Labs cannot delete cookies
   @skip_sauce
   Scenario: Captions are toggled correctly
@@ -31,7 +36,36 @@ Feature: CMS.Video Component
     And I have toggled captions
     Then when I view the video it does show the captions
 
+  # 6
   Scenario: Video data is shown correctly
     Given I have created a video with only XML data
     And I reload the page
     Then the correct Youtube video is shown
+
+  # 7
+  #  Scenario: Closed captions become visible when the mouse hovers over CC button
+  #  Given I have created a Video component with subtitles
+  #  And Make sure captions are closed
+  #  Then Captions become "invisible" after 3 seconds
+  #  And I hover over button "CC"
+  #  Then Captions become "visible"
+  #  And I hover over button "volume"
+  #  Then Captions become "invisible" after 3 seconds
+
+  # 8
+  #Scenario: Open captions never become invisible
+  #  Given I have created a Video component with subtitles
+  #  And Make sure captions are open
+  #  Then Captions are "visible"
+  #  And I hover over button "CC"
+  #  Then Captions are "visible"
+  #  And I hover over button "volume"
+  #  Then Captions are "visible"
+
+  # 9
+  #Scenario: Closed captions are invisible when mouse doesn't hover on CC button
+  #  Given I have created a Video component with subtitles
+  #  And Make sure captions are closed
+  #  Then Captions become "invisible" after 3 seconds
+  #  And I hover over button "volume"
+  #  Then Captions are "invisible"
diff --git a/cms/djangoapps/contentstore/features/video.py b/cms/djangoapps/contentstore/features/video.py
index 20db375184..80963ab556 100644
--- a/cms/djangoapps/contentstore/features/video.py
+++ b/cms/djangoapps/contentstore/features/video.py
@@ -4,14 +4,18 @@ from lettuce import world, step
 from xmodule.modulestore import Location
 from contentstore.utils import get_modulestore
 
+BUTTONS = {
+    'CC': '.hide-subtitles',
+    'volume': '.volume',
+}
+
 
 @step('I have created a Video component$')
 def i_created_a_video_component(step):
+    world.create_course_with_unit()
     world.create_component_instance(
-        step, '.large-video-icon',
-        'video',
-        '.xmodule_VideoModule',
-        has_multiple_templates=False
+        step=step,
+        category='video',
     )
 
 
@@ -19,6 +23,7 @@ def i_created_a_video_component(step):
 def i_created_a_video_with_subs(_step):
     _step.given('I have created a Video component with subtitles "OEoXaMPEzfM"')
 
+
 @step('I have created a Video component with subtitles "([^"]*)"$')
 def i_created_a_video_with_subs_with_name(_step, sub_id):
     _step.given('I have created a Video component')
@@ -115,3 +120,37 @@ def the_youtube_video_is_shown(_step):
     world.wait_for_xmodule()
     ele = world.css_find('.video').first
     assert ele['data-streams'].split(':')[1] == world.scenario_dict['YOUTUBE_ID']
+
+
+@step('Make sure captions are (.+)$')
+def set_captions_visibility_state(_step, captions_state):
+    if captions_state == 'closed':
+        if world.css_visible('.subtitles'):
+            world.browser.find_by_css('.hide-subtitles').click()
+    else:
+        if not world.css_visible('.subtitles'):
+            world.browser.find_by_css('.hide-subtitles').click()
+
+
+@step('I hover over button "([^"]*)"$')
+def hover_over_button(_step, button):
+    world.css_find(BUTTONS[button.strip()]).mouse_over()
+
+
+@step('Captions (?:are|become) "([^"]*)"$')
+def are_captions_visibile(_step, visibility_state):
+    _step.given('Captions become "{0}" after 0 seconds'.format(visibility_state))
+
+
+@step('Captions (?:are|become) "([^"]*)" after (.+) seconds$')
+def check_captions_visibility_state(_step, visibility_state, timeout):
+    timeout = int(timeout.strip())
+
+    # Captions become invisible by fading out. We must wait by a specified
+    # time.
+    world.wait(timeout)
+
+    if visibility_state == 'visible':
+        assert world.css_visible('.subtitles')
+    else:
+        assert not world.css_visible('.subtitles')
diff --git a/cms/djangoapps/contentstore/management/commands/dump_course_structure.py b/cms/djangoapps/contentstore/management/commands/dump_course_structure.py
deleted file mode 100644
index 139c603172..0000000000
--- a/cms/djangoapps/contentstore/management/commands/dump_course_structure.py
+++ /dev/null
@@ -1,62 +0,0 @@
-"""
-Script for dumping course dumping the course structure
-"""
-from django.core.management.base import BaseCommand, CommandError
-from xmodule.course_module import CourseDescriptor
-from xmodule.modulestore.django import modulestore
-from json import dumps
-from xmodule.modulestore.inheritance import own_metadata
-from django.conf import settings
-
-filter_list = ['xml_attributes', 'checklists']
-
-
-class Command(BaseCommand):
-    """
-    The Django command for dumping course structure
-    """
-    help = '''Write out to stdout a structural and metadata information about a course in a flat dictionary serialized
-              in a JSON format. This can be used for analytics.'''
-
-    def handle(self, *args, **options):
-        "Execute the command"
-        if len(args) < 2 or len(args) > 3:
-            raise CommandError("dump_course_structure requires two or more arguments: <location> <outfile> |<db>|")
-
-        course_id = args[0]
-        outfile = args[1]
-
-        # use a user-specified database name, if present
-        # this is useful for doing dumps from databases restored from prod backups
-        if len(args) == 3:
-            settings.MODULESTORE['direct']['OPTIONS']['db'] = args[2]
-
-        loc = CourseDescriptor.id_to_location(course_id)
-
-        store = modulestore()
-
-        course = None
-        try:
-            course = store.get_item(loc, depth=4)
-        except:
-            print('Could not find course at {0}'.format(course_id))
-            return
-
-        info = {}
-
-        def dump_into_dict(module, info):
-            filtered_metadata = dict((key, value) for key, value in own_metadata(module).iteritems()
-                                     if key not in filter_list)
-            info[module.location.url()] = {
-                'category': module.location.category,
-                'children': module.children if hasattr(module, 'children') else [],
-                'metadata': filtered_metadata
-            }
-
-            for child in module.get_children():
-                dump_into_dict(child, info)
-
-        dump_into_dict(course, info)
-
-        with open(outfile, 'w') as f:
-            f.write(dumps(info))
diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py
index 288e6443f7..7f09e4dd60 100644
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -792,7 +792,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
             source_location.tag, source_location.org, source_location.course, 'html', 'nonportable'])
         html_module = module_store.get_instance(source_location.course_id, html_module_location)
 
-        self.assertTrue(isinstance(html_module.data, basestring))
+        self.assertIsInstance(html_module.data, basestring)
         new_data = html_module.data.replace('/static/', '/c4x/{0}/{1}/asset/'.format(
             source_location.org, source_location.course))
         module_store.update_item(html_module_location, new_data)
@@ -1273,6 +1273,47 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         # export out to a tempdir
         export_to_xml(module_store, content_store, location, root_dir, 'test_export')
 
+    def test_export_course_without_content_store(self):
+        module_store = modulestore('direct')
+        content_store = contentstore()
+
+        # Create toy course
+
+        import_from_xml(module_store, 'common/test/data/', ['toy'])
+        location = CourseDescriptor.id_to_location('edX/toy/2012_Fall')
+
+        # Add a sequence
+
+        stub_location = Location(['i4x', 'edX', 'toy', 'sequential', 'vertical_sequential'])
+        sequential = module_store.get_item(stub_location)
+        module_store.update_children(sequential.location, sequential.children)
+
+        # Get course and export it without a content_store
+
+        course = module_store.get_item(location)
+        course.save()
+
+        root_dir = path(mkdtemp_clean())
+
+        print 'Exporting to tempdir = {0}'.format(root_dir)
+        export_to_xml(module_store, None, location, root_dir, 'test_export_no_content_store')
+
+        # Delete the course from module store and reimport it
+
+        delete_course(module_store, content_store, location, commit=True)
+
+        import_from_xml(
+            module_store, root_dir, ['test_export_no_content_store'],
+            draft_store=None,
+            static_content_store=None,
+            target_location_namespace=course.location
+        )
+
+        # Verify reimported course
+
+        items = module_store.get_items(stub_location)
+        self.assertEqual(len(items), 1)
+
 
 @override_settings(CONTENTSTORE=TEST_DATA_CONTENTSTORE, MODULESTORE=TEST_MODULESTORE)
 class ContentStoreTest(ModuleStoreTestCase):
@@ -1484,7 +1525,7 @@ class ContentStoreTest(ModuleStoreTestCase):
         resp = self.client.get(reverse('course_index', kwargs=data))
         self.assertContains(
             resp,
-            '<article class="courseware-overview" data-course-id="i4x://MITx/999/course/Robot_Super_Course">',
+            '<article class="courseware-overview" data-id="i4x://MITx/999/course/Robot_Super_Course">',
             status_code=200,
             html=True
         )
@@ -1588,14 +1629,7 @@ class ContentStoreTest(ModuleStoreTestCase):
                                                'name': loc.name}))
         self.assertEqual(resp.status_code, 200)
 
-        # static_pages
-        resp = self.client.get(reverse('static_pages',
-                                       kwargs={'org': loc.org,
-                                               'course': loc.course,
-                                               'coursename': loc.name}))
-        self.assertEqual(resp.status_code, 200)
-
-        # static_pages
+        # asset_index
         resp = self.client.get(reverse('asset_index',
                                        kwargs={'org': loc.org,
                                                'course': loc.course,
diff --git a/cms/djangoapps/contentstore/tests/test_request_event.py b/cms/djangoapps/contentstore/tests/test_request_event.py
index 6a513d689d..0126de66c6 100644
--- a/cms/djangoapps/contentstore/tests/test_request_event.py
+++ b/cms/djangoapps/contentstore/tests/test_request_event.py
@@ -3,7 +3,7 @@ import mock
 
 from django.test import TestCase
 from django.core.urlresolvers import reverse
-from contentstore.views.requests import event as cms_user_track
+from contentstore.views.helpers import event as cms_user_track
 
 
 class CMSLogTest(TestCase):
diff --git a/cms/djangoapps/contentstore/views/__init__.py b/cms/djangoapps/contentstore/views/__init__.py
index 10f6fb79a7..57e04f09d8 100644
--- a/cms/djangoapps/contentstore/views/__init__.py
+++ b/cms/djangoapps/contentstore/views/__init__.py
@@ -9,13 +9,13 @@ from .checklist import *
 from .component import *
 from .course import *
 from .error import *
+from .helpers import *
 from .item import *
 from .import_export import *
 from .preview import *
 from .public import *
 from .user import *
 from .tabs import *
-from .requests import *
 try:
     from .dev import *
 except ImportError:
diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index deef87a403..6fd9d75628 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -26,7 +26,7 @@ from contentstore.utils import (get_modulestore, get_lms_link_for_item,
 
 from models.settings.course_grading import CourseGradingModel
 
-from .requests import _xmodule_recurse
+from .helpers import _xmodule_recurse
 from .access import has_access
 from xmodule.x_module import XModuleDescriptor
 from xblock.plugin import PluginMissingError
diff --git a/cms/djangoapps/contentstore/views/requests.py b/cms/djangoapps/contentstore/views/helpers.py
similarity index 100%
rename from cms/djangoapps/contentstore/views/requests.py
rename to cms/djangoapps/contentstore/views/helpers.py
diff --git a/cms/djangoapps/contentstore/views/import_export.py b/cms/djangoapps/contentstore/views/import_export.py
index 67e64d67d0..6252da0d0e 100644
--- a/cms/djangoapps/contentstore/views/import_export.py
+++ b/cms/djangoapps/contentstore/views/import_export.py
@@ -193,6 +193,7 @@ def import_course(request, org, course, name):
                 if not dirpath:
                     return JsonResponse(
                         {
+
                             'ErrMsg': _('Could not find the course.xml file in the package.'),
                             'Stage': 2
                         },
diff --git a/cms/djangoapps/contentstore/views/item.py b/cms/djangoapps/contentstore/views/item.py
index c9edcd60a0..6313d520b8 100644
--- a/cms/djangoapps/contentstore/views/item.py
+++ b/cms/djangoapps/contentstore/views/item.py
@@ -12,7 +12,7 @@ from xmodule.modulestore.inheritance import own_metadata
 from util.json_request import expect_json, JsonResponse
 from ..utils import get_modulestore
 from .access import has_access
-from .requests import _xmodule_recurse
+from .helpers import _xmodule_recurse
 from xmodule.x_module import XModuleDescriptor
 
 __all__ = ['save_item', 'create_item', 'delete_item']
diff --git a/cms/djangoapps/contentstore/views/preview.py b/cms/djangoapps/contentstore/views/preview.py
index b5cfc74a57..12df3fcf7a 100644
--- a/cms/djangoapps/contentstore/views/preview.py
+++ b/cms/djangoapps/contentstore/views/preview.py
@@ -6,7 +6,7 @@ from django.conf import settings
 from django.http import HttpResponse, Http404, HttpResponseBadRequest, HttpResponseForbidden
 from django.core.urlresolvers import reverse
 from django.contrib.auth.decorators import login_required
-from mitxmako.shortcuts import render_to_response
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 from xmodule_modifiers import replace_static_urls, wrap_xmodule
 from xmodule.error_module import ErrorDescriptor
@@ -22,7 +22,7 @@ from util.sandboxing import can_execute_unsafe_code
 
 import static_replace
 from .session_kv_store import SessionKeyValueStore
-from .requests import render_from_lms
+from .helpers import render_from_lms
 from .access import has_access
 from ..utils import get_course_for_item
 
@@ -79,9 +79,17 @@ def preview_component(request, location):
     # can bind to it correctly
     component.runtime.wrappers.append(partial(wrap_xmodule, 'xmodule_edit.html'))
 
+    try:
+        content = component.render('studio_view').content
+    # catch exceptions indiscriminately, since after this point they escape the
+    # dungeon and surface as uneditable, unsaveable, and undeletable
+    # component-goblins.
+    except Exception as exc:                          # pylint: disable=W0703
+        content = render_to_string('html_error.html', {'message': str(exc)})
+
     return render_to_response('component.html', {
         'preview': get_preview_html(request, component, 0),
-        'editor': component.runtime.render(component, None, 'studio_view').content,
+        'editor': content
     })
 
 
@@ -95,11 +103,6 @@ def preview_module_system(request, preview_id, descriptor):
     descriptor: An XModuleDescriptor
     """
 
-    def preview_field_data(descriptor):
-        "Helper method to create a DbModel from a descriptor"
-        student_data = DbModel(SessionKeyValueStore(request))
-        return lms_field_data(descriptor._field_data, student_data)
-
     course_id = get_course_for_item(descriptor.location).location.course_id
 
     if descriptor.location.category == 'static_tab':
@@ -118,7 +121,6 @@ def preview_module_system(request, preview_id, descriptor):
         debug=True,
         replace_urls=partial(static_replace.replace_static_urls, data_directory=None, course_id=course_id),
         user=request.user,
-        xmodule_field_data=preview_field_data,
         can_execute_unsafe_code=(lambda: can_execute_unsafe_code(course_id)),
         mixins=settings.XBLOCK_MIXINS,
         course_id=course_id,
@@ -136,7 +138,8 @@ def preview_module_system(request, preview_id, descriptor):
                 getattr(descriptor, 'data_dir', descriptor.location.course),
                 course_id=descriptor.location.org + '/' + descriptor.location.course + '/BOGUS_RUN_REPLACE_WHEN_AVAILABLE',
             ),
-        )
+        ),
+        error_descriptor_class=ErrorDescriptor,
     )
 
 
@@ -148,17 +151,12 @@ def load_preview_module(request, preview_id, descriptor):
     preview_id (str): An identifier specifying which preview this module is used for
     descriptor: An XModuleDescriptor
     """
-    system = preview_module_system(request, preview_id, descriptor)
-    try:
-        module = descriptor.xmodule(system)
-    except:
-        log.debug("Unable to load preview module", exc_info=True)
-        module = ErrorDescriptor.from_descriptor(
-            descriptor,
-            error_msg=exc_info_to_str(sys.exc_info())
-        ).xmodule(system)
-
-    return module
+    student_data = DbModel(SessionKeyValueStore(request))
+    descriptor.bind_for_student(
+        preview_module_system(request, preview_id, descriptor),
+        lms_field_data(descriptor._field_data, student_data),  # pylint: disable=protected-access
+    )
+    return descriptor
 
 
 def get_preview_html(request, descriptor, idx):
@@ -167,4 +165,8 @@ def get_preview_html(request, descriptor, idx):
     specified by the descriptor and idx.
     """
     module = load_preview_module(request, str(idx), descriptor)
-    return module.runtime.render(module, None, "student_view").content
+    try:
+        content = module.render("student_view").content
+    except Exception as exc:                          # pylint: disable=W0703
+        content = render_to_string('html_error.html', {'message': str(exc)})
+    return content
diff --git a/cms/djangoapps/contentstore/views/tabs.py b/cms/djangoapps/contentstore/views/tabs.py
index f897fa1378..d19f4ae6a3 100644
--- a/cms/djangoapps/contentstore/views/tabs.py
+++ b/cms/djangoapps/contentstore/views/tabs.py
@@ -14,10 +14,9 @@ from xmodule.modulestore.inheritance import own_metadata
 from xmodule.modulestore.django import modulestore
 
 from ..utils import get_course_for_item, get_modulestore
-from .access import get_location_and_verify_access
 
 
-__all__ = ['edit_tabs', 'reorder_static_tabs', 'static_pages']
+__all__ = ['edit_tabs', 'reorder_static_tabs']
 
 
 def initialize_course_tabs(course):
@@ -126,20 +125,6 @@ def edit_tabs(request, org, course, coursename):
     })
 
 
-@login_required
-@ensure_csrf_cookie
-def static_pages(request, org, course, coursename):
-    "Static pages view"
-
-    location = get_location_and_verify_access(request, org, course, coursename)
-
-    course = modulestore().get_item(location)
-
-    return render_to_response('static-pages.html', {
-        'context_course': course,
-    })
-
-
 # "primitive" tab edit functions driven by the command line.
 # These should be replaced/deleted by a more capable GUI someday.
 # Note that the command line UI identifies the tabs with 1-based
diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index 1ad5374744..9f6d5031ea 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -12,20 +12,24 @@ from .common import *
 from logsettings import get_logger_config
 import os
 
-# specified as an environment variable.  Typically this is set
-# in the service's upstart script and corresponds exactly to the service name.
-# Service variants apply config differences via env and auth JSON files,
-# the names of which correspond to the variant.
+
+# SERVICE_VARIANT specifies name of the variant used, which decides what JSON
+# configuration files are read during startup.
 SERVICE_VARIANT = os.environ.get('SERVICE_VARIANT', None)
 
-# when not variant is specified we attempt to load an unvaried
-# config set.
-CONFIG_PREFIX = ""
+# CONFIG_ROOT specifies the directory where the JSON configuration
+# files are expected to be found. If not specified, use the project
+# directory.
+CONFIG_ROOT = os.environ.get('CONFIG_ROOT', ENV_ROOT)
+
+# CONFIG_PREFIX specifies the prefix of the JSON configuration files,
+# based on the service variant. If no variant is use, don't use a
+# prefix.
+CONFIG_PREFIX = SERVICE_VARIANT + "." if SERVICE_VARIANT else ""
 
-if SERVICE_VARIANT:
-    CONFIG_PREFIX = SERVICE_VARIANT + "."
 
 ############### ALWAYS THE SAME ################################
+
 DEBUG = False
 TEMPLATE_DEBUG = False
 
@@ -77,7 +81,7 @@ CELERY_QUEUES = {
 
 ############# NON-SECURE ENV CONFIG ##############################
 # Things like server locations, ports, etc.
-with open(ENV_ROOT / CONFIG_PREFIX + "env.json") as env_file:
+with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file:
     ENV_TOKENS = json.load(env_file)
 
 EMAIL_BACKEND = ENV_TOKENS.get('EMAIL_BACKEND', EMAIL_BACKEND)
@@ -134,7 +138,7 @@ if "TRACKING_IGNORE_URL_PATTERNS" in ENV_TOKENS:
 
 ################ SECURE AUTH ITEMS ###############################
 # Secret things: passwords, access keys, etc.
-with open(ENV_ROOT / CONFIG_PREFIX + "auth.json") as auth_file:
+with open(CONFIG_ROOT / CONFIG_PREFIX + "auth.json") as auth_file:
     AUTH_TOKENS = json.load(auth_file)
 
 # If Segment.io key specified, load it and turn on Segment.io if the feature flag is set
diff --git a/cms/envs/common.py b/cms/envs/common.py
index dbf3647839..05a1b63f5f 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -218,6 +218,11 @@ STATICFILES_DIRS = [
 TIME_ZONE = 'America/New_York'  # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 LANGUAGE_CODE = 'en'  # http://www.i18nguy.com/unicode/language-identifiers.html
 
+# We want i18n to be turned off in production, at least until we have full localizations.
+# Thus we want the Django translation engine to be disabled. Otherwise even without
+# localization files, if the user's browser is set to a language other than us-en,
+# strings like "login" and "password" will be translated and the rest of the page will be
+# in English, which is confusing.
 USE_I18N = False
 USE_L10N = True
 
diff --git a/cms/envs/dev.py b/cms/envs/dev.py
index 6e4ce460c3..cb51ef37b1 100644
--- a/cms/envs/dev.py
+++ b/cms/envs/dev.py
@@ -9,6 +9,7 @@ from .common import *
 from logsettings import get_logger_config
 
 DEBUG = True
+USE_I18N = True
 TEMPLATE_DEBUG = DEBUG
 LOGGING = get_logger_config(ENV_ROOT / "log",
                             logging_env="dev",
diff --git a/cms/envs/dev_shared_preview.py b/cms/envs/dev_shared_preview.py
new file mode 100644
index 0000000000..119558ba05
--- /dev/null
+++ b/cms/envs/dev_shared_preview.py
@@ -0,0 +1,12 @@
+"""
+This configuration is have localdev use a preview.localhost hostname for the preview LMS so that we can share
+the same process between preview and published
+"""
+
+# We intentionally define lots of variables that aren't used, and
+# want to import all variables from base settings files
+# pylint: disable=W0401, W0614
+
+from .dev import *
+
+MITX_FEATURES['PREVIEW_LMS_BASE'] = "preview.localhost:8000"
diff --git a/cms/static/coffee/spec/main.coffee b/cms/static/coffee/spec/main.coffee
index 39214fd6a7..55381d82f8 100644
--- a/cms/static/coffee/spec/main.coffee
+++ b/cms/static/coffee/spec/main.coffee
@@ -1,5 +1,5 @@
 requirejs.config({
-   paths: {
+    paths: {
         "gettext": "xmodule_js/common_static/js/test/i18n",
         "mustache": "xmodule_js/common_static/js/vendor/mustache",
         "codemirror": "xmodule_js/common_static/js/vendor/CodeMirror/codemirror",
@@ -22,7 +22,7 @@ requirejs.config({
         "underscore.string": "xmodule_js/common_static/js/vendor/underscore.string.min",
         "backbone": "xmodule_js/common_static/js/vendor/backbone-min",
         "backbone.associations": "xmodule_js/common_static/js/vendor/backbone-associations-min",
-        "youtube": "xmodule_js/common_static/js/load_youtube",
+        "youtube": "//www.youtube.com/player_api?noext",
         "tinymce": "xmodule_js/common_static/js/vendor/tiny_mce/tiny_mce",
         "jquery.tinymce": "xmodule_js/common_static/js/vendor/tiny_mce/jquery.tinymce",
         "mathjax": "https://edx-static.s3.amazonaws.com/mathjax-MathJax-727332c/MathJax.js?config=TeX-MML-AM_HTMLorMML-full",
@@ -32,9 +32,11 @@ requirejs.config({
         "squire": "xmodule_js/common_static/js/vendor/Squire",
         "jasmine-stealth": "xmodule_js/common_static/js/vendor/jasmine-stealth",
         "jasmine.async": "xmodule_js/common_static/js/vendor/jasmine.async",
+        "draggabilly": "xmodule_js/common_static/js/vendor/draggabilly.pkgd",
+        "domReady": "xmodule_js/common_static/js/vendor/domReady",
 
         "coffee/src/ajax_prefix": "xmodule_js/common_static/coffee/src/ajax_prefix"
-    },
+    }
     shim: {
         "gettext": {
             exports: "gettext"
@@ -100,6 +102,9 @@ requirejs.config({
             deps: ["backbone"],
             exports: "Backbone.Associations"
         },
+        "youtube": {
+            exports: "YT"
+        },
         "codemirror": {
             exports: "CodeMirror"
         },
@@ -139,12 +144,14 @@ define([
 
     "coffee/spec/models/course_spec", "coffee/spec/models/metadata_spec",
     "coffee/spec/models/module_spec", "coffee/spec/models/section_spec",
+    "coffee/spec/models/settings_course_grader_spec",
     "coffee/spec/models/settings_grading_spec", "coffee/spec/models/textbook_spec",
     "coffee/spec/models/upload_spec",
 
     "coffee/spec/views/section_spec",
     "coffee/spec/views/course_info_spec", "coffee/spec/views/feedback_spec",
     "coffee/spec/views/metadata_edit_spec", "coffee/spec/views/module_edit_spec",
+    "coffee/spec/views/overview_spec",
     "coffee/spec/views/textbook_spec", "coffee/spec/views/upload_spec",
 
     # these tests are run separate in the cms-squire suite, due to process
diff --git a/cms/static/coffee/spec/main_squire.coffee b/cms/static/coffee/spec/main_squire.coffee
index 61e00ab03f..28a3f03ce1 100644
--- a/cms/static/coffee/spec/main_squire.coffee
+++ b/cms/static/coffee/spec/main_squire.coffee
@@ -22,7 +22,7 @@ requirejs.config({
         "underscore.string": "xmodule_js/common_static/js/vendor/underscore.string.min",
         "backbone": "xmodule_js/common_static/js/vendor/backbone-min",
         "backbone.associations": "xmodule_js/common_static/js/vendor/backbone-associations-min",
-        "youtube": "xmodule_js/common_static/js/load_youtube",
+        "youtube": "//www.youtube.com/player_api?noext",
         "tinymce": "xmodule_js/common_static/js/vendor/tiny_mce/tiny_mce",
         "jquery.tinymce": "xmodule_js/common_static/js/vendor/tiny_mce/jquery.tinymce",
         "mathjax": "https://edx-static.s3.amazonaws.com/mathjax-MathJax-727332c/MathJax.js?config=TeX-MML-AM_HTMLorMML-full",
@@ -100,6 +100,9 @@ requirejs.config({
             deps: ["backbone"],
             exports: "Backbone.Associations"
         },
+        "youtube": {
+            exports: "YT"
+        },
         "codemirror": {
             exports: "CodeMirror"
         },
diff --git a/cms/static/coffee/spec/models/settings_course_grader_spec.coffee b/cms/static/coffee/spec/models/settings_course_grader_spec.coffee
new file mode 100644
index 0000000000..f6252a3590
--- /dev/null
+++ b/cms/static/coffee/spec/models/settings_course_grader_spec.coffee
@@ -0,0 +1,20 @@
+define ["js/models/settings/course_grader"], (CourseGrader) ->
+    describe "CourseGraderModel", ->
+        describe "parseWeight", ->
+            it "converts a float to an integer", ->
+                model = new CourseGrader({weight: 7.0001, min_count: 3.67, drop_count: 1.88}, {parse:true})
+                expect(model.get('weight')).toBe(7)
+                expect(model.get('min_count')).toBe(3)
+                expect(model.get('drop_count')).toBe(1)
+
+            it "converts a string to an integer", ->
+                model = new CourseGrader({weight: '7.0001', min_count: '3.67', drop_count: '1.88'}, {parse:true})
+                expect(model.get('weight')).toBe(7)
+                expect(model.get('min_count')).toBe(3)
+                expect(model.get('drop_count')).toBe(1)
+
+            it "does a no-op for integers", ->
+                model = new CourseGrader({weight: 7, min_count: 3, drop_count: 1}, {parse:true})
+                expect(model.get('weight')).toBe(7)
+                expect(model.get('min_count')).toBe(3)
+                expect(model.get('drop_count')).toBe(1)
diff --git a/cms/static/coffee/spec/setup_require.coffee b/cms/static/coffee/spec/setup_require.coffee
deleted file mode 100644
index 0a66f9741f..0000000000
--- a/cms/static/coffee/spec/setup_require.coffee
+++ /dev/null
@@ -1,61 +0,0 @@
-require =
-    baseUrl: "/suite/cms/include"
-    paths:
-        "jquery": "xmodule_js/common_static/js/vendor/jquery.min",
-        "jquery.ui" : "xmodule_js/common_static/js/vendor/jquery-ui.min",
-        "jquery.cookie": "xmodule_js/common_static/js/vendor/jquery.cookie",
-        "underscore": "xmodule_js/common_static/js/vendor/underscore-min",
-        "underscore.string": "xmodule_js/common_static/js/vendor/underscore.string.min",
-        "backbone": "xmodule_js/common_static/js/vendor/backbone-min",
-        "backbone.associations": "xmodule_js/common_static/js/vendor/backbone-associations-min",
-        "jquery.timepicker": "xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker",
-        "jquery.leanModal": "xmodule_js/common_static/js/vendor/jquery.leanModal.min",
-        "jquery.scrollTo": "xmodule_js/common_static/js/vendor/jquery.scrollTo-1.4.2-min",
-        "jquery.flot": "xmodule_js/common_static/js/vendor/flot/jquery.flot.min",
-        "jquery.form": "xmodule_js/common_static/js/vendor/jquery.form",
-        "jquery.inputnumber": "xmodule_js/common_static/js/vendor/html5-input-polyfills/number-polyfill",
-        "sinon": "xmodule_js/common_static/js/vendor/sinon-1.7.1",
-        "xmodule": "xmodule_js/src/xmodule",
-        "gettext": "xmodule_js/common_static/js/test/i18n",
-        "utility": "xmodule_js/common_static/js/src/utility",
-        "codemirror": "xmodule_js/common_static/js/vendor/CodeMirror/codemirror"
-    shim:
-        "gettext":
-            exports: "gettext"
-        "jquery.ui":
-            deps: ["jquery"]
-            exports: "jQuery.ui"
-        "jquery.form":
-            deps: ["jquery"]
-            exports: "jQuery.fn.ajaxForm"
-        "jquery.inputnumber":
-            deps: ["jquery"]
-            exports: "jQuery.fn.inputNumber"
-        "jquery.leanModal":
-            deps: ["jquery"],
-            exports: "jQuery.fn.leanModal"
-        "jquery.cookie":
-            deps: ["jquery"],
-            exports: "jQuery.fn.cookie"
-        "jquery.scrollTo":
-            deps: ["jquery"],
-            exports: "jQuery.fn.scrollTo"
-        "jquery.flot":
-            deps: ["jquery"],
-            exports: "jQuery.fn.plot"
-        "underscore":
-            exports: "_"
-        "backbone":
-            deps: ["underscore", "jquery"],
-            exports: "Backbone"
-        "backbone.associations":
-            deps: ["backbone"],
-            exports: "Backbone.Associations"
-        "xmodule":
-            exports: "XModule"
-        "sinon":
-            exports: "sinon"
-        "codemirror":
-            exports: "CodeMirror"
-    # load these automatically
-    deps: ["js/base", "coffee/src/main"]
diff --git a/cms/static/coffee/spec/views/course_info_spec.coffee b/cms/static/coffee/spec/views/course_info_spec.coffee
index b06868faa3..de33b85083 100644
--- a/cms/static/coffee/spec/views/course_info_spec.coffee
+++ b/cms/static/coffee/spec/views/course_info_spec.coffee
@@ -10,6 +10,7 @@ define ["js/views/course_info_handout", "js/views/course_info_update", "js/model
                      </div>
                      <div class="sidebar window course-handouts" id="course-handouts-view"></div>
                      </div>
+                     <div class="modal-cover"></div>
                      """
 
     beforeEach ->
@@ -45,13 +46,56 @@ define ["js/views/course_info_handout", "js/views/course_info_update", "js/model
                 preventDefault : () -> 'no op'
             }
 
-            @createNewUpdate = () ->
+            @createNewUpdate = (text) ->
                 # Edit button is not in the template under test (it is in parent HTML).
                 # Therefore call onNew directly.
                 @courseInfoEdit.onNew(@event)
-                spyOn(@courseInfoEdit.$codeMirror, 'getValue').andReturn('/static/image.jpg')
+                spyOn(@courseInfoEdit.$codeMirror, 'getValue').andReturn(text)
                 @courseInfoEdit.$el.find('.save-button').click()
 
+            @cancelNewCourseInfo = (useCancelButton) ->
+                spyOn(@courseInfoEdit.$modalCover, 'show').andCallThrough()
+                spyOn(@courseInfoEdit.$modalCover, 'hide').andCallThrough()
+
+                @courseInfoEdit.onNew(@event)
+                expect(@courseInfoEdit.$modalCover.show).toHaveBeenCalled()
+
+                spyOn(@courseInfoEdit.$codeMirror, 'getValue').andReturn('unsaved changes')
+                model = @collection.at(0)
+                spyOn(model, "save").andCallThrough()
+
+                cancelEditingUpdate(useCancelButton)
+
+                expect(@courseInfoEdit.$modalCover.hide).toHaveBeenCalled()
+                expect(model.save).not.toHaveBeenCalled()
+                previewContents = @courseInfoEdit.$el.find('.update-contents').html()
+                expect(previewContents).not.toEqual('unsaved changes')
+
+            @cancelExistingCourseInfo = (useCancelButton) ->
+                @createNewUpdate('existing update')
+
+                spyOn(@courseInfoEdit.$modalCover, 'show').andCallThrough()
+                spyOn(@courseInfoEdit.$modalCover, 'hide').andCallThrough()
+                @courseInfoEdit.$el.find('.edit-button').click()
+                expect(@courseInfoEdit.$modalCover.show).toHaveBeenCalled()
+
+                spyOn(@courseInfoEdit.$codeMirror, 'getValue').andReturn('modification')
+                model = @collection.at(0)
+                spyOn(model, "save").andCallThrough()
+
+                cancelEditingUpdate(useCancelButton)
+
+                expect(@courseInfoEdit.$modalCover.hide).toHaveBeenCalled()
+                expect(model.save).not.toHaveBeenCalled()
+                previewContents = @courseInfoEdit.$el.find('.update-contents').html()
+                expect(previewContents).toEqual('existing update')
+
+            cancelEditingUpdate = (update, useCancelButton) ->
+                if useCancelButton
+                    update.$el.find('.cancel-button').click()
+                else
+                    $('.modal-cover').click()
+
         afterEach ->
             @xhrRestore()
 
@@ -75,19 +119,30 @@ define ["js/views/course_info_handout", "js/views/course_info_update", "js/model
 
         it "does rewrite links for preview", ->
             # Create a new update.
-            @createNewUpdate()
+            @createNewUpdate('/static/image.jpg')
 
             # Verify the link is rewritten for preview purposes.
             previewContents = @courseInfoEdit.$el.find('.update-contents').html()
             expect(previewContents).toEqual('base-asset-url/image.jpg')
 
         it "shows static links in edit mode", ->
-            @createNewUpdate()
+            @createNewUpdate('/static/image.jpg')
 
             # Click edit and verify CodeMirror contents.
             @courseInfoEdit.$el.find('.edit-button').click()
             expect(@courseInfoEdit.$codeMirror.getValue()).toEqual('/static/image.jpg')
 
+        it "removes newly created course info on cancel", ->
+            @cancelNewCourseInfo(true)
+
+        it "removes newly created course info on click outside modal", ->
+            @cancelNewCourseInfo(false)
+
+        it "does not remove existing course info on cancel", ->
+            @cancelExistingCourseInfo(true)
+
+        it "does not remove existing course info on click outside modal", ->
+            @cancelExistingCourseInfo(false)
 
     describe "Course Handouts", ->
         handoutsTemplate = readFixtures('course_info_handouts.underscore')
diff --git a/cms/static/coffee/spec/views/module_edit_spec.coffee b/cms/static/coffee/spec/views/module_edit_spec.coffee
index 99b4dd65d2..157fb18e6a 100644
--- a/cms/static/coffee/spec/views/module_edit_spec.coffee
+++ b/cms/static/coffee/spec/views/module_edit_spec.coffee
@@ -5,7 +5,6 @@ define ["coffee/src/views/module_edit", "xmodule"], (ModuleEdit) ->
         @stubModule = jasmine.createSpy("Module")
         @stubModule.id = 'stub-id'
 
-
         setFixtures """
         <li class="component" id="stub-id">
           <div class="component-editor">
@@ -19,7 +18,7 @@ define ["coffee/src/views/module_edit", "xmodule"], (ModuleEdit) ->
             <a href="#" class="edit-button"><span class="edit-icon white"></span>Edit</a>
             <a href="#" class="delete-button"><span class="delete-icon white"></span>Delete</a>
           </div>
-          <a href="#" class="drag-handle"></a>
+          <span class="drag-handle"></span>
           <section class="xmodule_display xmodule_stub" data-type="StubModule">
             <div id="stub-module-content"/>
           </section>
diff --git a/cms/static/coffee/spec/views/overview_spec.coffee b/cms/static/coffee/spec/views/overview_spec.coffee
new file mode 100644
index 0000000000..c5cee89866
--- /dev/null
+++ b/cms/static/coffee/spec/views/overview_spec.coffee
@@ -0,0 +1,377 @@
+define ["js/views/overview", "js/views/feedback_notification", "sinon", "js/base", "date", "jquery.timepicker"],
+(OverviewDragger, Notification, sinon) ->
+
+    describe "Course Overview", ->
+        beforeEach ->
+            appendSetFixtures """
+                              <div class="section-published-date">
+                                  <span class="published-status">
+                                      <strong>Will Release:</strong> 06/12/2013 at 04:00 UTC
+                                  </span>
+                                  <a href="#" class="edit-button" data-date="06/12/2013" data-time="04:00" data-id="i4x://pfogg/42/chapter/d6b47f7b084f49debcaf67fe5436c8e2">Edit</a>
+                              </div>
+                              """
+    
+            appendSetFixtures """
+                              <div class="edit-subsection-publish-settings">
+                                  <div class="settings">
+                                      <h3>Section Release Date</h3>
+                                      <div class="picker datepair">
+                                          <div class="field field-start-date">
+                                              <label for="">Release Day</label>
+                                              <input class="start-date date" type="text" name="start_date" value="04/08/1990" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
+                                          </div>
+                                          <div class="field field-start-time">
+                                              <label for="">Release Time (<abbr title="Coordinated Universal Time">UTC</abbr>)</label>
+                                              <input class="start-time time" type="text" name="start_time" value="12:00" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
+                                          </div>
+                                          <div class="description">
+                                              <p>On the date set above, this section – <strong class="section-name"></strong> – will be released to students. Any units marked private will only be visible to admins.</p>
+                                          </div>
+                                      </div>
+                                      <a href="#" class="save-button">Save</a><a href="#" class="cancel-button">Cancel</a>
+                                  </div>
+                              </div>
+                              """
+    
+            appendSetFixtures """
+                              <section class="courseware-section branch" data-id="a-location-goes-here">
+                                  <li class="branch collapsed id-holder" data-id="an-id-goes-here">
+                                    <a href="#" class="delete-section-button"></a>
+                                  </li>
+                              </section>
+                              """
+    
+            appendSetFixtures """
+                              <ol>
+                                  <li class="subsection-list branch" data-id="subsection-1-id" id="subsection-1">
+                                      <ol class="sortable-unit-list" id="subsection-list-1">
+                                          <li class="unit" id="unit-1" data-id="first-unit-id" data-parent-id="subsection-1-id"></li>
+                                          <li class="unit" id="unit-2" data-id="second-unit-id" data-parent-id="subsection-1-id"></li>
+                                          <li class="unit" id="unit-3" data-id="third-unit-id" data-parent-id="subsection-1-id"></li>
+                                      </ol>
+                                  </li>
+                                  <li class="subsection-list branch" data-id="subsection-2-id" id="subsection-2">
+                                      <ol class="sortable-unit-list" id="subsection-list-2">
+                                        <li class="unit" id="unit-4" data-id="fourth-unit-id" data-parent-id="subsection-2"></li>
+                                      </ol>
+                                  </li>
+                                  <li class="subsection-list branch" data-id="subsection-3-id" id="subsection-3">
+                                      <ol class="sortable-unit-list" id="subsection-list-3">
+                                  </li>
+                              </ol>
+                              """
+    
+            spyOn(window, 'saveSetSectionScheduleDate').andCallThrough()
+            # Have to do this here, as it normally gets bound in document.ready()
+            $('a.save-button').click(saveSetSectionScheduleDate)
+            $('a.delete-section-button').click(deleteSection)
+            $(".edit-subsection-publish-settings .start-date").datepicker()
+
+            @notificationSpy = spyOn(Notification.Mini.prototype, 'show').andCallThrough()
+            window.analytics = jasmine.createSpyObj('analytics', ['track'])
+            window.course_location_analytics = jasmine.createSpy()
+            @xhr = sinon.useFakeXMLHttpRequest()
+            requests = @requests = []
+            @xhr.onCreate = (req) -> requests.push(req)
+
+            OverviewDragger.makeDraggable(
+                '.unit',
+                '.unit-drag-handle',
+                'ol.sortable-unit-list',
+                'li.branch, article.subsection-body'
+            )
+    
+        afterEach ->
+            delete window.analytics
+            delete window.course_location_analytics
+            @notificationSpy.reset()
+    
+        it "should save model when save is clicked", ->
+            $('a.edit-button').click()
+            $('a.save-button').click()
+            expect(saveSetSectionScheduleDate).toHaveBeenCalled()
+
+        it "should show a confirmation on save", ->
+            $('a.edit-button').click()
+            $('a.save-button').click()
+            expect(@notificationSpy).toHaveBeenCalled()
+
+        # Fails sporadically in Jenkins.
+#        it "should delete model when delete is clicked", ->
+#            $('a.delete-section-button').click()
+#            $('a.action-primary').click()
+#            expect(@requests[0].url).toEqual('/delete_item')
+
+        it "should not delete model when cancel is clicked", ->
+            $('a.delete-section-button').click()
+            $('a.action-secondary').click()
+            expect(@requests.length).toEqual(0)
+
+        # Fails sporadically in Jenkins.
+#        it "should show a confirmation on delete", ->
+#            $('a.delete-section-button').click()
+#            $('a.action-primary').click()
+#            expect(@notificationSpy).toHaveBeenCalled()
+    
+        describe "findDestination", ->
+            it "correctly finds the drop target of a drag", ->
+                $ele = $('#unit-1')
+                $ele.offset(
+                    top: $ele.offset().top + 10, left: $ele.offset().left
+                )
+                destination = OverviewDragger.findDestination($ele, 1)
+                expect(destination.ele).toBe($('#unit-2'))
+                expect(destination.attachMethod).toBe('before')
+    
+            it "can drag and drop across section boundaries, with special handling for first element", ->
+                $ele = $('#unit-1')
+                $ele.offset(
+                    top: $('#unit-4').offset().top + 8
+                    left: $ele.offset().left
+                )
+                destination = OverviewDragger.findDestination($ele, 1)
+                expect(destination.ele).toBe($('#unit-4'))
+                # Dragging down into first element, we have a fudge factor makes it easier to drag at beginning.
+                expect(destination.attachMethod).toBe('before')
+                # Now past the "fudge factor".
+                $ele.offset(
+                    top: $('#unit-4').offset().top + 12
+                    left: $ele.offset().left
+                )
+                destination = OverviewDragger.findDestination($ele, 1)
+                expect(destination.ele).toBe($('#unit-4'))
+                expect(destination.attachMethod).toBe('after')
+    
+            it "can drag and drop across section boundaries, with special handling for last element", ->
+                $ele = $('#unit-4')
+                $ele.offset(
+                    top: $('#unit-3').offset().bottom + 4
+                    left: $ele.offset().left
+                )
+                destination = OverviewDragger.findDestination($ele, -1)
+                expect(destination.ele).toBe($('#unit-3'))
+                # Dragging down up into last element, we have a fudge factor makes it easier to drag at beginning.
+                expect(destination.attachMethod).toBe('after')
+                # Now past the "fudge factor".
+                $ele.offset(
+                    top: $('#unit-3').offset().top + 4
+                    left: $ele.offset().left
+                )
+                destination = OverviewDragger.findDestination($ele, -1)
+                expect(destination.ele).toBe($('#unit-3'))
+                expect(destination.attachMethod).toBe('before')
+    
+            it "can drag into an empty list", ->
+                $ele = $('#unit-1')
+                $ele.offset(
+                    top: $('#subsection-3').offset().top + 10
+                    left: $ele.offset().left
+                )
+                destination = OverviewDragger.findDestination($ele, 1)
+                expect(destination.ele).toBe($('#subsection-list-3'))
+                expect(destination.attachMethod).toBe('prepend')
+    
+            it "reports a null destination on a failed drag", ->
+                $ele = $('#unit-1')
+                $ele.offset(
+                    top: $ele.offset().top + 200, left: $ele.offset().left
+                )
+                destination = OverviewDragger.findDestination($ele, 1)
+                expect(destination).toEqual(
+                    ele: null
+                    attachMethod: ""
+                )
+    
+            it "can drag into a collapsed list", ->
+                $('#subsection-2').addClass('collapsed')
+                $ele = $('#unit-2')
+                $ele.offset(
+                    top: $('#subsection-2').offset().top + 3
+                    left: $ele.offset().left
+                )
+                destination = OverviewDragger.findDestination($ele, 1)
+                expect(destination.ele).toBe($('#subsection-list-2'))
+                expect(destination.parentList).toBe($('#subsection-2'))
+                expect(destination.attachMethod).toBe('prepend')
+    
+        describe "onDragStart", ->
+            it "sets the dragState to its default values", ->
+                expect(OverviewDragger.dragState).toEqual({})
+                # Call with some dummy data
+                OverviewDragger.onDragStart(
+                    {element: $('#unit-1')},
+                    null,
+                    null
+                )
+                expect(OverviewDragger.dragState).toEqual(
+                    dropDestination: null,
+                    attachMethod: '',
+                    parentList: null,
+                    lastY: 0,
+                    dragDirection: 0
+                )
+    
+            it "collapses expanded elements", ->
+                expect($('#subsection-1')).not.toHaveClass('collapsed')
+                OverviewDragger.onDragStart(
+                    {element: $('#subsection-1')},
+                    null,
+                    null
+                )
+                expect($('#subsection-1')).toHaveClass('collapsed')
+                expect($('#subsection-1')).toHaveClass('expand-on-drop')
+    
+        describe "onDragMove", ->
+            beforeEach ->
+                @scrollSpy = spyOn(window, 'scrollBy').andCallThrough()
+
+            it "adds the correct CSS class to the drop destination", ->
+                $ele = $('#unit-1')
+                dragY = $ele.offset().top + 10
+                dragX = $ele.offset().left
+                $ele.offset(
+                    top: dragY, left: dragX
+                )
+                OverviewDragger.onDragMove(
+                    {element: $ele, dragPoint:
+                        {y: dragY}}, '', {clientX: dragX}
+                )
+                expect($('#unit-2')).toHaveClass('drop-target drop-target-before')
+                expect($ele).toHaveClass('valid-drop')
+    
+            it "does not add CSS class to the drop destination if out of bounds", ->
+                $ele = $('#unit-1')
+                dragY = $ele.offset().top + 10
+                $ele.offset(
+                    top: dragY, left: $ele.offset().left
+                )
+                OverviewDragger.onDragMove(
+                    {element: $ele, dragPoint:
+                        {y: dragY}}, '', {clientX: $ele.offset().left - 3}
+                )
+                expect($('#unit-2')).not.toHaveClass('drop-target drop-target-before')
+                expect($ele).not.toHaveClass('valid-drop')
+    
+            it "scrolls up if necessary", ->
+                OverviewDragger.onDragMove(
+                    {element: $('#unit-1')}, '', {clientY: 2}
+                )
+                expect(@scrollSpy).toHaveBeenCalledWith(0, -10)
+    
+            it "scrolls down if necessary", ->
+                OverviewDragger.onDragMove(
+                    {element: $('#unit-1')}, '', {clientY: (window.innerHeight - 5)}
+                )
+                expect(@scrollSpy).toHaveBeenCalledWith(0, 10)
+    
+        describe "onDragEnd", ->
+            beforeEach ->
+                @reorderSpy = spyOn(OverviewDragger, 'handleReorder')
+
+            afterEach ->
+                @reorderSpy.reset()
+
+            it "calls handleReorder on a successful drag", ->
+                OverviewDragger.dragState.dropDestination = $('#unit-2')
+                OverviewDragger.dragState.attachMethod = "before"
+                OverviewDragger.dragState.parentList = $('#subsection-1')
+                $('#unit-1').offset(
+                    top: $('#unit-1').offset().top + 10
+                    left: $('#unit-1').offset().left
+                )
+                OverviewDragger.onDragEnd(
+                    {element: $('#unit-1')},
+                null,
+                    {clientX: $('#unit-1').offset().left}
+                )
+                expect(@reorderSpy).toHaveBeenCalled()
+
+            it "clears out the drag state", ->
+                OverviewDragger.onDragEnd(
+                    {element: $('#unit-1')},
+                null,
+                null
+                )
+                expect(OverviewDragger.dragState).toEqual({})
+
+            it "sets the element to the correct position", ->
+                OverviewDragger.onDragEnd(
+                    {element: $('#unit-1')},
+                null,
+                null
+                )
+                # Chrome sets the CSS to 'auto', but Firefox uses '0px'.
+                expect(['0px', 'auto']).toContain($('#unit-1').css('top'))
+                expect(['0px', 'auto']).toContain($('#unit-1').css('left'))
+
+            it "expands an element if it was collapsed on drag start", ->
+                $('#subsection-1').addClass('collapsed')
+                $('#subsection-1').addClass('expand-on-drop')
+                OverviewDragger.onDragEnd(
+                    {element: $('#subsection-1')},
+                null,
+                null
+                )
+                expect($('#subsection-1')).not.toHaveClass('collapsed')
+                expect($('#subsection-1')).not.toHaveClass('expand-on-drop')
+
+            it "expands a collapsed element when something is dropped in it", ->
+                $('#subsection-2').addClass('collapsed')
+                OverviewDragger.dragState.dropDestination = $('#list-2')
+                OverviewDragger.dragState.attachMethod = "prepend"
+                OverviewDragger.dragState.parentList = $('#subsection-2')
+                OverviewDragger.onDragEnd(
+                    {element: $('#unit-1')},
+                null,
+                    {clientX: $('#unit-1').offset().left}
+                )
+                expect($('#subsection-2')).not.toHaveClass('collapsed')
+
+        describe "AJAX", ->
+            beforeEach ->
+                @requests = requests = []
+                @xhr = sinon.useFakeXMLHttpRequest()
+                @xhr.onCreate = (xhr) -> requests.push(xhr)
+
+                @savingSpies = spyOnConstructor(Notification, "Mini",
+                    ["show", "hide"])
+                @savingSpies.show.andReturn(@savingSpies)
+                @clock = sinon.useFakeTimers()
+
+            afterEach ->
+                @xhr.restore()
+                @clock.restore()
+
+            it "should send an update on reorder", ->
+                OverviewDragger.dragState.dropDestination = $('#unit-4')
+                OverviewDragger.dragState.attachMethod = "after"
+                OverviewDragger.dragState.parentList = $('#subsection-2')
+                # Drag Unit 1 from Subsection 1 to the end of Subsection 2.
+                $('#unit-1').offset(
+                    top: $('#unit-4').offset().top + 10
+                    left: $('#unit-4').offset().left
+                )
+                OverviewDragger.onDragEnd(
+                    {element: $('#unit-1')},
+                    null,
+                    {clientX: $('#unit-1').offset().left}
+                )
+                expect(@requests.length).toEqual(2)
+                expect(@savingSpies.constructor).toHaveBeenCalled()
+                expect(@savingSpies.show).toHaveBeenCalled()
+                expect(@savingSpies.hide).not.toHaveBeenCalled()
+                savingOptions = @savingSpies.constructor.mostRecentCall.args[0]
+                expect(savingOptions.title).toMatch(/Saving/)
+                expect($('#unit-1')).toHaveClass('was-dropped')
+                # We expect 2 requests to be sent-- the first for removing Unit 1 from Subsection 1,
+                # and the second for adding Unit 1 to the end of Subsection 2.
+                expect(@requests[0].requestBody).toEqual('{"id":"subsection-1-id","children":["second-unit-id","third-unit-id"]}')
+                @requests[0].respond(200)
+                expect(@savingSpies.hide).not.toHaveBeenCalled()
+                expect(@requests[1].requestBody).toEqual('{"id":"subsection-2-id","children":["fourth-unit-id","first-unit-id"]}')
+                @requests[1].respond(200)
+                expect(@savingSpies.hide).toHaveBeenCalled()
+                # Class is removed in a timeout.
+                @clock.tick(1001)
+                expect($('#unit-1')).not.toHaveClass('was-dropped')
diff --git a/cms/static/coffee/src/main.coffee b/cms/static/coffee/src/main.coffee
index 09253cbf40..c88b14fee4 100644
--- a/cms/static/coffee/src/main.coffee
+++ b/cms/static/coffee/src/main.coffee
@@ -1,5 +1,6 @@
-define ["jquery", "underscore.string", "backbone", "js/views/feedback_notification", "jquery.cookie"],
-($, str, Backbone, NotificationView) ->
+define ["domReady", "jquery", "underscore.string", "backbone", "gettext",
+        "js/views/feedback_notification", "jquery.cookie"],
+(domReady, $, str, Backbone, gettext, NotificationView) ->
   AjaxPrefix.addAjaxPrefix jQuery, ->
     $("meta[name='path_prefix']").attr('content')
 
@@ -36,5 +37,5 @@ define ["jquery", "underscore.string", "backbone", "js/views/feedback_notificati
     if onTouchBasedDevice()
       $('body').addClass 'touch-based-device'
 
-  $(main)
+  domReady(main)
   return main
diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee
index 2faccdab26..041fc97c47 100644
--- a/cms/static/coffee/src/views/module_edit.coffee
+++ b/cms/static/coffee/src/views/module_edit.coffee
@@ -92,7 +92,6 @@ define ["backbone", "jquery", "underscore", "gettext", "xmodule",
         title: gettext('Saving&hellip;')
       saving.show()
       @model.save(data).done( =>
-      #   # showToastMessage("Your changes have been saved.", null, 3)
         @module = null
         @render()
         @$el.removeClass('editing')
diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index 1f188026cb..4fd340ad7b 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -1,6 +1,6 @@
-require(["jquery", "underscore", "gettext", "js/views/feedback_notification", "js/views/feedback_prompt",
-         "jquery.ui", "jquery.timepicker", "jquery.leanModal", "jquery.form", "jquery.smoothScroll"],
-    function($, _, gettext, NotificationView, PromptView) {
+require(["domReady", "jquery", "underscore", "gettext", "js/views/feedback_notification", "js/views/feedback_prompt",
+         "js/utils/cancel_on_escape", "jquery.ui", "jquery.timepicker", "jquery.leanModal", "jquery.form", "jquery.smoothScroll"],
+    function(domReady, $, _, gettext, NotificationView, PromptView, CancelOnEscape) {
 
 var $body;
 var $modal;
@@ -12,7 +12,7 @@ var $newComponentTypePicker;
 var $newComponentTemplatePickers;
 var $newComponentButton;
 
-$(document).ready(function() {
+domReady(function() {
     $body = $('body');
     $modal = $('.history-modal');
     $modalCover = $('.modal-cover');
@@ -94,9 +94,6 @@ $(document).ready(function() {
     // tender feedback window scrolling
     $('a.show-tender').bind('click', smoothScrollTop);
 
-    // toggling footer additional support
-    $('.cta-show-sock').bind('click', toggleSock);
-
     // toggling overview section details
     $(function() {
         if ($('.courseware-section').length > 0) {
@@ -126,15 +123,6 @@ $(document).ready(function() {
 
     $('.sync-date').bind('click', syncReleaseDate);
 
-    // import form setup
-    $('.view-import .file-input').bind('change', showImportSubmit);
-    $('.view-import .choose-file-button, .view-import .choose-file-button-inline').bind('click', function(e) {
-        e.preventDefault();
-        $('.view-import .file-input').click();
-    });
-
-    $('.new-course-button').bind('click', addNewCourse);
-
     // section date setting
     $('.set-publish-date').bind('click', setSectionScheduleDate);
     $('.edit-section-start-cancel').bind('click', cancelSetSectionScheduleDate);
@@ -221,20 +209,6 @@ function editSectionPublishDate(e) {
     $modalCover.show();
 }
 
-function showImportSubmit(e) {
-    var filepath = $(this).val();
-    if (filepath.substr(filepath.length - 6, 6) == 'tar.gz') {
-        $('.error-block').hide();
-        $('.file-name').html($(this).val().replace('C:\\fakepath\\', ''));
-        $('.file-name-block').show();
-        $('.view-import .choose-file-button').hide();
-        $('.submit-button').show();
-        $('.progress').show();
-    } else {
-        $('.error-block').html(gettext('File format not supported. Please upload a file with a <code>tar.gz</code> extension.')).show();
-    }
-}
-
 function syncReleaseDate(e) {
     e.preventDefault();
     $(this).closest('.notice').hide();
@@ -319,9 +293,6 @@ function saveSubsection() {
         success: function() {
             $spinner.delay(500).fadeOut(150);
             $changedInput = null;
-        },
-        error: function() {
-            showToastMessage(gettext('There has been an error while saving your changes.'));
         }
     });
 }
@@ -423,31 +394,6 @@ function hideModal(e) {
     }
 }
 
-function toggleSock(e) {
-    e.preventDefault();
-
-    var $btnLabel = $(this).find('.copy');
-    var $sock = $('.wrapper-sock');
-    var $sockContent = $sock.find('.wrapper-inner');
-
-    $sock.toggleClass('is-shown');
-    $sockContent.toggle('fast');
-
-    $.smoothScroll({
-        offset: -200,
-        easing: 'swing',
-        speed: 1000,
-        scrollElement: null,
-        scrollTarget: $sock
-    });
-
-    if ($sock.hasClass('is-shown')) {
-        $btnLabel.text(gettext('Hide Studio Help'));
-    } else {
-        $btnLabel.text(gettext('Looking for Help with Studio?'));
-    }
-}
-
 function toggleSubmodules(e) {
     e.preventDefault();
     $(this).toggleClass('expand').toggleClass('collapse');
@@ -459,16 +405,6 @@ function setVisibility(e) {
     $(e.target).closest('.option').addClass('checked');
 }
 
-function editComponent(e) {
-    e.preventDefault();
-    $(this).closest('.xmodule_edit').addClass('editing').find('.component-editor').slideDown(150);
-}
-
-function closeComponentEditor(e) {
-    e.preventDefault();
-    $(this).closest('.xmodule_edit').removeClass('editing').find('.component-editor').slideUp(150);
-}
-
 function showDateSetter(e) {
     e.preventDefault();
     var $block = $(this).closest('.due-date-input');
@@ -497,41 +433,7 @@ function hideAlert(e) {
     $(this).closest('.wrapper-alert').removeClass('is-shown');
 }
 
-function showToastMessage(message, $button, lifespan) {
-    var $toast = $('<div class="toast-notification"></div>');
-    var $closeBtn = $('<a href="#" class="close-button">×</a>');
-    $toast.append($closeBtn);
-    var $content = $('<div class="notification-content"></div>');
-    $content.html(message);
-    $toast.append($content);
-    if ($button) {
-        $button.addClass('action-button');
-        $button.bind('click', hideToastMessage);
-        $content.append($button);
-    }
-    $closeBtn.bind('click', hideToastMessage);
-
-    if ($('.toast-notification')[0]) {
-        var targetY = $('.toast-notification').offset().top + $('.toast-notification').outerHeight();
-        $toast.css('top', (targetY + 10) + 'px');
-    }
-
-    $body.prepend($toast);
-    $toast.fadeIn(200);
-
-    if (lifespan) {
-        $toast.timer = setTimeout(function() {
-            $toast.fadeOut(300);
-        }, lifespan * 1000);
-    }
-}
-
-function hideToastMessage(e) {
-    e.preventDefault();
-    $(this).closest('.toast-notification').remove();
-}
-
-function addNewSection(e, isTemplate) {
+function addNewSection(e) {
     e.preventDefault();
 
     $(e.target).addClass('disabled');
@@ -542,19 +444,9 @@ function addNewSection(e, isTemplate) {
     $newSection.find('.new-section-name').focus().select();
     $newSection.find('.section-name-form').bind('submit', saveNewSection);
     $cancelButton.bind('click', cancelNewSection);
-    $body.bind('keyup', {
-        $cancelButton: $cancelButton
-    }, checkForCancel);
+    CancelOnEscape($cancelButton);
 }
 
-function checkForCancel(e) {
-    if (e.which == 27) {
-        $body.unbind('keyup', checkForCancel);
-        e.data.$cancelButton.click();
-    }
-}
-
-
 function saveNewSection(e) {
     e.preventDefault();
 
@@ -571,7 +463,7 @@ function saveNewSection(e) {
     $.post('/create_item', {
         'parent_location': parent,
         'category': category,
-        'display_name': display_name,
+        'display_name': display_name
     },
 
     function(data) {
@@ -585,162 +477,6 @@ function cancelNewSection(e) {
     $(this).parents('section.new-section').remove();
 }
 
-function addNewCourse(e) {
-    e.preventDefault();
-    $('.new-course-button').addClass('is-disabled');
-    $('.new-course-save').addClass('is-disabled');
-    var $newCourse = $('.wrapper-create-course').addClass('is-shown');
-    var $cancelButton = $newCourse.find('.new-course-cancel');
-    var $courseName = $('.new-course-name');
-    $courseName.focus().select();
-    $('.new-course-save').on('click', saveNewCourse);
-    $cancelButton.bind('click', cancelNewCourse);
-    $body.bind('keyup', {
-        $cancelButton: $cancelButton
-    }, checkForCancel);
-
-    // Check that a course (org, number, run) doesn't use any special characters
-    var validateCourseItemEncoding = function(item) {
-        var required = validateRequiredField(item);
-        if(required) {
-            return required;
-        }
-        if(item !== encodeURIComponent(item)) {
-            return gettext('Please do not use any spaces or special characters in this field.');
-        }
-        return '';
-    };
-
-    // Ensure that org/course_num/run < 65 chars.
-    var validateTotalCourseItemsLength = function() {
-        var totalLength = _.reduce(
-            ['.new-course-org', '.new-course-number', '.new-course-run'],
-            function(sum, ele) {
-                return sum + $(ele).val().length;
-        }, 0
-        );
-        if(totalLength > 65) {
-            $('.wrap-error').addClass('is-shown');
-            $('#course_creation_error').html('<p>' + gettext('The combined length of the organization, course number, and course run fields cannot be more than 65 characters.') + '</p>');
-            $('.new-course-save').addClass('is-disabled');
-        }
-        else {
-            $('.wrap-error').removeClass('is-shown');
-        }
-    };
-
-    // Handle validation asynchronously
-    _.each(
-        ['.new-course-org', '.new-course-number', '.new-course-run'],
-        function(ele) {
-            var $ele = $(ele);
-            $ele.on('keyup', function(event) {
-                // Don't bother showing "required field" error when
-                // the user tabs into a new field; this is distracting
-                // and unnecessary
-                if(event.keyCode === 9) {
-                    return;
-                }
-                var error = validateCourseItemEncoding($ele.val());
-                setNewCourseFieldInErr($ele.parent('li'), error);
-                validateTotalCourseItemsLength();
-            });
-        }
-    );
-    var $name = $('.new-course-name');
-    $name.on('keyup', function() {
-        var error = validateRequiredField($name.val());
-        setNewCourseFieldInErr($name.parent('li'), error);
-        validateTotalCourseItemsLength();
-    });
-}
-
-function validateRequiredField(msg) {
-    return msg.length === 0 ? gettext('Required field.') : '';
-}
-
-function setNewCourseFieldInErr(el, msg) {
-    if(msg) {
-        el.addClass('error');
-        el.children('span.tip-error').addClass('is-showing').removeClass('is-hiding').text(msg);
-        $('.new-course-save').addClass('is-disabled');
-    }
-    else {
-        el.removeClass('error');
-        el.children('span.tip-error').addClass('is-hiding').removeClass('is-showing');
-        // One "error" div is always present, but hidden or shown
-        if($('.error').length === 1) {
-            $('.new-course-save').removeClass('is-disabled');
-        }
-    }
-};
-
-function saveNewCourse(e) {
-    e.preventDefault();
-
-    // One final check for empty values
-    var errors = _.reduce(
-        ['.new-course-name', '.new-course-org', '.new-course-number', '.new-course-run'],
-        function(acc, ele) {
-            var $ele = $(ele);
-            var error = validateRequiredField($ele.val());
-            setNewCourseFieldInErr($ele.parent('li'), error);
-            return error ? true : acc;
-        },
-        false
-    );
-
-    if(errors) {
-        return;
-    }
-
-    var $newCourseForm = $(this).closest('#create-course-form');
-    var display_name = $newCourseForm.find('.new-course-name').val();
-    var org = $newCourseForm.find('.new-course-org').val();
-    var number = $newCourseForm.find('.new-course-number').val();
-    var run = $newCourseForm.find('.new-course-run').val();
-
-    analytics.track('Created a Course', {
-        'org': org,
-        'number': number,
-        'display_name': display_name,
-        'run': run
-    });
-
-    $.post('/create_new_course', {
-            'org': org,
-            'number': number,
-            'display_name': display_name,
-            'run': run
-        },
-        function(data) {
-            if (data.id !== undefined) {
-                window.location = '/' + data.id.replace(/.*:\/\//, '');
-            } else if (data.ErrMsg !== undefined) {
-                $('.wrap-error').addClass('is-shown');
-                $('#course_creation_error').html('<p>' + data.ErrMsg + '</p>');
-                $('.new-course-save').addClass('is-disabled');
-            }
-        }
-    );
-}
-
-function cancelNewCourse(e) {
-    e.preventDefault();
-    $('.new-course-button').removeClass('is-disabled');
-    $('.wrapper-create-course').removeClass('is-shown');
-    // Clear out existing fields and errors
-    _.each(
-        ['.new-course-name', '.new-course-org', '.new-course-number', '.new-course-run'],
-        function(field) {
-            $(field).val('');
-        }
-    );
-    $('#course_creation_error').html('');
-    $('.wrap-error').removeClass('is-shown');
-    $('.new-course-save').off('click');
-}
-
 function addNewSubsection(e) {
     e.preventDefault();
     var $section = $(this).closest('.courseware-section');
@@ -758,9 +494,7 @@ function addNewSubsection(e) {
 
     $newSubsection.find('.new-subsection-form').bind('submit', saveNewSubsection);
     $cancelButton.bind('click', cancelNewSubsection);
-    $body.bind('keyup', {
-        $cancelButton: $cancelButton
-    }, checkForCancel);
+    CancelOnEscape($cancelButton);
 }
 
 function saveNewSubsection(e) {
@@ -863,5 +597,8 @@ function saveSetSectionScheduleDate(e) {
         saving.hide();
     });
 }
+    // Add to window object for unit test (overview_spec).
+    window.saveSetSectionScheduleDate = saveSetSectionScheduleDate;
+    window.deleteSection = deleteSection;
 
 }); // end require()
diff --git a/cms/static/js/hesitate.js b/cms/static/js/hesitate.js
deleted file mode 100644
index a9c4be093b..0000000000
--- a/cms/static/js/hesitate.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Create a HesitateEvent and assign it as the event to execute:
- *   $(el).on('mouseEnter', CMS.HesitateEvent( expand, 'mouseLeave').trigger);
- *   It calls the executeOnTimeOut function with the event.currentTarget after the configurable timeout IFF the cancelSelector event
- *   did not occur on the event.currentTarget.
- *
- *   More specifically, when trigger is called (triggered by the event you bound it to), it starts a timer
- *   which the cancelSelector event will cancel or if the timer finished, it executes the executeOnTimeOut function
- *   passing it the original event (whose currentTarget s/b the specific ele). It never accumulates events; however, it doesn't hurt for your
- *   code to minimize invocations of trigger by binding to mouseEnter v mouseOver and such.
- *
- *   NOTE: if something outside of this wants to cancel the event, invoke cachedhesitation.untrigger(null | anything);
- */
-
-define(["jquery"], function($) {
-    var HesitateEvent = function(executeOnTimeOut, cancelSelector, onlyOnce) {
-        this.executeOnTimeOut = executeOnTimeOut;
-        this.cancelSelector = cancelSelector;
-        this.timeoutEventId = null;
-        this.originalEvent = null;
-        this.onlyOnce = (onlyOnce === true);
-    };
-
-    HesitateEvent.DURATION = 800;
-
-    HesitateEvent.prototype.trigger = function(event) {
-        if (event.data.timeoutEventId == null) {
-            event.data.timeoutEventId = window.setTimeout(
-                    function() { event.data.fireEvent(event); },
-                    HesitateEvent.DURATION);
-            event.data.originalEvent = event;
-            $(event.data.originalEvent.delegateTarget).on(event.data.cancelSelector, event.data, event.data.untrigger);
-        }
-    };
-
-    HesitateEvent.prototype.fireEvent = function(event) {
-        event.data.timeoutEventId = null;
-        $(event.data.originalEvent.delegateTarget).off(event.data.cancelSelector, event.data.untrigger);
-        if (event.data.onlyOnce) $(event.data.originalEvent.delegateTarget).off(event.data.originalEvent.type, event.data.trigger);
-        event.data.executeOnTimeOut(event.data.originalEvent);
-    };
-
-    HesitateEvent.prototype.untrigger = function(event) {
-        if (event.data.timeoutEventId) {
-            window.clearTimeout(event.data.timeoutEventId);
-            $(event.data.originalEvent.delegateTarget).off(event.data.cancelSelector, event.data.untrigger);
-        }
-        event.data.timeoutEventId = null;
-    };
-
-    return HesitateEvent;
-});
diff --git a/cms/static/js/index.js b/cms/static/js/index.js
new file mode 100644
index 0000000000..f2688f3dc0
--- /dev/null
+++ b/cms/static/js/index.js
@@ -0,0 +1,161 @@
+require(["domReady", "jquery", "underscore", "js/utils/cancel_on_escape"],
+    function (domReady, $, _, CancelOnEscape) {
+        var saveNewCourse = function (e) {
+            e.preventDefault();
+
+            // One final check for empty values
+            var errors = _.reduce(
+                ['.new-course-name', '.new-course-org', '.new-course-number', '.new-course-run'],
+                function (acc, ele) {
+                    var $ele = $(ele);
+                    var error = validateRequiredField($ele.val());
+                    setNewCourseFieldInErr($ele.parent('li'), error);
+                    return error ? true : acc;
+                },
+                false
+            );
+
+            if (errors) {
+                return;
+            }
+
+            var $newCourseForm = $(this).closest('#create-course-form');
+            var display_name = $newCourseForm.find('.new-course-name').val();
+            var org = $newCourseForm.find('.new-course-org').val();
+            var number = $newCourseForm.find('.new-course-number').val();
+            var run = $newCourseForm.find('.new-course-run').val();
+
+            analytics.track('Created a Course', {
+                'org': org,
+                'number': number,
+                'display_name': display_name,
+                'run': run
+            });
+
+            $.post('/create_new_course', {
+                    'org': org,
+                    'number': number,
+                    'display_name': display_name,
+                    'run': run
+                },
+                function (data) {
+                    if (data.id !== undefined) {
+                        window.location = '/' + data.id.replace(/.*:\/\//, '');
+                    } else if (data.ErrMsg !== undefined) {
+                        $('.wrap-error').addClass('is-shown');
+                        $('#course_creation_error').html('<p>' + data.ErrMsg + '</p>');
+                        $('.new-course-save').addClass('is-disabled');
+                    }
+                }
+            );
+        };
+
+        var cancelNewCourse = function (e) {
+            e.preventDefault();
+            $('.new-course-button').removeClass('is-disabled');
+            $('.wrapper-create-course').removeClass('is-shown');
+            // Clear out existing fields and errors
+            _.each(
+                ['.new-course-name', '.new-course-org', '.new-course-number', '.new-course-run'],
+                function (field) {
+                    $(field).val('');
+                }
+            );
+            $('#course_creation_error').html('');
+            $('.wrap-error').removeClass('is-shown');
+            $('.new-course-save').off('click');
+        };
+
+        var addNewCourse = function (e) {
+            e.preventDefault();
+            $('.new-course-button').addClass('is-disabled');
+            $('.new-course-save').addClass('is-disabled');
+            var $newCourse = $('.wrapper-create-course').addClass('is-shown');
+            var $cancelButton = $newCourse.find('.new-course-cancel');
+            var $courseName = $('.new-course-name');
+            $courseName.focus().select();
+            $('.new-course-save').on('click', saveNewCourse);
+            $cancelButton.bind('click', cancelNewCourse);
+            CancelOnEscape($cancelButton);
+
+            // Check that a course (org, number, run) doesn't use any special characters
+            var validateCourseItemEncoding = function (item) {
+                var required = validateRequiredField(item);
+                if (required) {
+                    return required;
+                }
+                if (item !== encodeURIComponent(item)) {
+                    return gettext('Please do not use any spaces or special characters in this field.');
+                }
+                return '';
+            };
+
+            // Ensure that org/course_num/run < 65 chars.
+            var validateTotalCourseItemsLength = function () {
+                var totalLength = _.reduce(
+                    ['.new-course-org', '.new-course-number', '.new-course-run'],
+                    function (sum, ele) {
+                        return sum + $(ele).val().length;
+                    }, 0
+                );
+                if (totalLength > 65) {
+                    $('.wrap-error').addClass('is-shown');
+                    $('#course_creation_error').html('<p>' + gettext('The combined length of the organization, course number, and course run fields cannot be more than 65 characters.') + '</p>');
+                    $('.new-course-save').addClass('is-disabled');
+                }
+                else {
+                    $('.wrap-error').removeClass('is-shown');
+                }
+            };
+
+            // Handle validation asynchronously
+            _.each(
+                ['.new-course-org', '.new-course-number', '.new-course-run'],
+                function (ele) {
+                    var $ele = $(ele);
+                    $ele.on('keyup', function (event) {
+                        // Don't bother showing "required field" error when
+                        // the user tabs into a new field; this is distracting
+                        // and unnecessary
+                        if (event.keyCode === 9) {
+                            return;
+                        }
+                        var error = validateCourseItemEncoding($ele.val());
+                        setNewCourseFieldInErr($ele.parent('li'), error);
+                        validateTotalCourseItemsLength();
+                    });
+                }
+            );
+            var $name = $('.new-course-name');
+            $name.on('keyup', function () {
+                var error = validateRequiredField($name.val());
+                setNewCourseFieldInErr($name.parent('li'), error);
+                validateTotalCourseItemsLength();
+            });
+        };
+
+        var validateRequiredField = function (msg) {
+            return msg.length === 0 ? gettext('Required field.') : '';
+        };
+
+        var setNewCourseFieldInErr = function (el, msg) {
+            if(msg) {
+                el.addClass('error');
+                el.children('span.tip-error').addClass('is-showing').removeClass('is-hiding').text(msg);
+                $('.new-course-save').addClass('is-disabled');
+            }
+            else {
+                el.removeClass('error');
+                el.children('span.tip-error').addClass('is-hiding').removeClass('is-showing');
+                // One "error" div is always present, but hidden or shown
+                if($('.error').length === 1) {
+                    $('.new-course-save').removeClass('is-disabled');
+                }
+            }
+        };
+
+
+        domReady(function () {
+            $('.new-course-button').bind('click', addNewCourse);
+        });
+    });
diff --git a/cms/static/js/models/settings/course_grader.js b/cms/static/js/models/settings/course_grader.js
index d04438bdff..a915c5f0ec 100644
--- a/cms/static/js/models/settings/course_grader.js
+++ b/cms/static/js/models/settings/course_grader.js
@@ -10,13 +10,13 @@ var CourseGrader = Backbone.Model.extend({
     },
     parse : function(attrs) {
         if (attrs['weight']) {
-            if (!_.isNumber(attrs.weight)) attrs.weight = parseInt(attrs.weight, 10);
+            attrs.weight = parseInt(attrs.weight, 10);
         }
         if (attrs['min_count']) {
-            if (!_.isNumber(attrs.min_count)) attrs.min_count = parseInt(attrs.min_count, 10);
+            attrs.min_count = parseInt(attrs.min_count, 10);
         }
         if (attrs['drop_count']) {
-            if (!_.isNumber(attrs.drop_count)) attrs.drop_count = parseInt(attrs.drop_count, 10);
+            attrs.drop_count = parseInt(attrs.drop_count, 10);
         }
         return attrs;
     },
diff --git a/cms/static/js/models/settings/course_grading_policy.js b/cms/static/js/models/settings/course_grading_policy.js
index 7d16b61426..1e23a4ecf4 100644
--- a/cms/static/js/models/settings/course_grading_policy.js
+++ b/cms/static/js/models/settings/course_grading_policy.js
@@ -17,10 +17,10 @@ var CourseGradingPolicy = Backbone.Model.extend({
             // interesting race condition: if {parse:true} when newing, then parse called before .attributes created
             if (this.attributes && this.has('graders')) {
                 graderCollection = this.get('graders');
-                graderCollection.reset(attributes.graders);
+                graderCollection.reset(attributes.graders, {parse:true});
             }
             else {
-                graderCollection = new CourseGraderCollection(attributes.graders);
+                graderCollection = new CourseGraderCollection(attributes.graders, {parse:true});
                 graderCollection.course_location = attributes['course_location'] || this.get('course_location');
             }
             attributes.graders = graderCollection;
diff --git a/cms/static/js/sock.js b/cms/static/js/sock.js
new file mode 100644
index 0000000000..0d8af7c0d0
--- /dev/null
+++ b/cms/static/js/sock.js
@@ -0,0 +1,32 @@
+require(["domReady", "jquery", "jquery.smoothScroll"],
+    function (domReady, $) {
+        var toggleSock = function (e) {
+            e.preventDefault();
+
+            var $btnLabel = $(this).find('.copy');
+            var $sock = $('.wrapper-sock');
+            var $sockContent = $sock.find('.wrapper-inner');
+
+            $sock.toggleClass('is-shown');
+            $sockContent.toggle('fast');
+
+            $.smoothScroll({
+                offset: -200,
+                easing: 'swing',
+                speed: 1000,
+                scrollElement: null,
+                scrollTarget: $sock
+            });
+
+            if ($sock.hasClass('is-shown')) {
+                $btnLabel.text(gettext('Hide Studio Help'));
+            } else {
+                $btnLabel.text(gettext('Looking for Help with Studio?'));
+            }
+        };
+
+        domReady(function () {
+            // toggling footer additional support
+            $('.cta-show-sock').bind('click', toggleSock);
+        });
+    });
diff --git a/cms/static/js/utils/cancel_on_escape.js b/cms/static/js/utils/cancel_on_escape.js
new file mode 100644
index 0000000000..febfc42bb4
--- /dev/null
+++ b/cms/static/js/utils/cancel_on_escape.js
@@ -0,0 +1,17 @@
+define(["jquery"], function($) {
+    var $body = $('body');
+    var checkForCancel = function (e) {
+        if (e.which == 27) {
+            $body.unbind('keyup', checkForCancel);
+            e.data.$cancelButton.click();
+        }
+    };
+
+    var cancelOnEscape = function (cancelButton) {
+        $body.bind('keyup', {
+            $cancelButton: cancelButton
+        }, checkForCancel);
+    };
+
+    return cancelOnEscape;
+});
diff --git a/cms/static/js/views/course_info_update.js b/cms/static/js/views/course_info_update.js
index 4fd6d9d5c4..256f63624a 100644
--- a/cms/static/js/views/course_info_update.js
+++ b/cms/static/js/views/course_info_update.js
@@ -2,7 +2,6 @@ define(["backbone", "underscore", "codemirror", "js/models/course_update",
     "js/views/feedback_prompt", "js/views/feedback_notification", "js/views/course_info_helper"],
     function(Backbone, _, CodeMirror, CourseUpdateModel, PromptView, NotificationView, CourseInfoHelper) {
 
-    var $modalCover = $(".modal-cover");
     var CourseInfoUpdateView = Backbone.View.extend({
         // collection is CourseUpdateCollection
         events: {
@@ -18,6 +17,8 @@ define(["backbone", "underscore", "codemirror", "js/models/course_update",
             this.render();
             // when the client refetches the updates as a whole, re-render them
             this.listenTo(this.collection, 'reset', this.render);
+
+            this.$modalCover = $(".modal-cover");
         },
 
         render: function () {
@@ -63,8 +64,8 @@ define(["backbone", "underscore", "codemirror", "js/models/course_update",
             $newForm.addClass('editing');
             this.$currentPost = $newForm.closest('li');
 
-            $modalCover.show();
-            $modalCover.bind('click', function() {
+            this.$modalCover.show();
+            this.$modalCover.bind('click', function() {
                 self.closeEditor(true);
             });
 
@@ -120,9 +121,9 @@ define(["backbone", "underscore", "codemirror", "js/models/course_update",
             this.$codeMirror = CourseInfoHelper.editWithCodeMirror(
                 targetModel, 'content', self.options['base_asset_url'], $textArea.get(0));
 
-            $modalCover.show();
-            $modalCover.bind('click', function() {
-                self.closeEditor(self);
+            this.$modalCover.show();
+            this.$modalCover.bind('click', function() {
+                self.closeEditor(false);
             });
         },
 
@@ -197,8 +198,8 @@ define(["backbone", "underscore", "codemirror", "js/models/course_update",
                 this.$currentPost.find('.CodeMirror').remove();
             }
 
-            $modalCover.unbind('click');
-            $modalCover.hide();
+            this.$modalCover.unbind('click');
+            this.$modalCover.hide();
             this.$codeMirror = null;
         },
 
diff --git a/cms/static/js/views/import.js b/cms/static/js/views/import.js
index 14d2c6a22e..ca9d9bbe05 100644
--- a/cms/static/js/views/import.js
+++ b/cms/static/js/views/import.js
@@ -2,149 +2,172 @@
  * Course import-related js.
  */
 define(
-        ["jquery", "underscore", "gettext"],
-        function($, _, gettext) {
+    ["domReady", "jquery", "underscore", "gettext"],
+    function(domReady, $, _, gettext) {
 
-"use strict";
+        "use strict";
 
-/********** Private functions ************************************************/
+        /********** Private functions ************************************************/
 
-/**
- * Toggle the spin on the progress cog.
- * @param {boolean} isSpinning Turns cog spin on if true, off otherwise.
- */
-var updateCog = function (elem, isSpinning) {
-    var cogI = elem.find('i.icon-cog');
-    if (isSpinning) { cogI.addClass("icon-spin");}
-    else { cogI.removeClass("icon-spin");}
-};
+        /**
+         * Toggle the spin on the progress cog.
+         * @param {boolean} isSpinning Turns cog spin on if true, off otherwise.
+         */
+        var updateCog = function (elem, isSpinning) {
+            var cogI = elem.find('i.icon-cog');
+            if (isSpinning) { cogI.addClass("icon-spin");}
+            else { cogI.removeClass("icon-spin");}
+        };
 
 
-/**
- * Manipulate the DOM to reflect current status of upload.
- * @param {int} stageNo Current stage.
- */
-var updateStage = function (stageNo){
-    var all = $('ol.status-progress').children();
-    var prevList = all.slice(0, stageNo);
-    _.map(prevList, function (elem){
-        $(elem).
-            removeClass("is-not-started").
-            removeClass("is-started").
-            addClass("is-complete");
-        updateCog($(elem), false);
+        /**
+         * Manipulate the DOM to reflect current status of upload.
+         * @param {int} stageNo Current stage.
+         */
+        var updateStage = function (stageNo){
+            var all = $('ol.status-progress').children();
+            var prevList = all.slice(0, stageNo);
+            _.map(prevList, function (elem){
+                $(elem).
+                    removeClass("is-not-started").
+                    removeClass("is-started").
+                    addClass("is-complete");
+                updateCog($(elem), false);
+            });
+            var curList = all.eq(stageNo);
+            curList.removeClass("is-not-started").addClass("is-started");
+            updateCog(curList, true);
+        };
+
+        /**
+         * Check for import status updates every `timeout` milliseconds, and update
+         * the page accordingly.
+         * @param {string} url Url to call for status updates.
+         * @param {int} timeout Number of milliseconds to wait in between ajax calls
+         *     for new updates.
+         * @param {int} stage Starting stage.
+         */
+        var getStatus = function (url, timeout, stage) {
+            var currentStage = stage || 0;
+            if (CourseImport.stopGetStatus) { return ;}
+            updateStage(currentStage);
+            if (currentStage == 3 ) { return ;}
+            var time = timeout || 1000;
+            $.getJSON(url,
+                function (data) {
+                    setTimeout(function () {
+                        getStatus(url, time, data.ImportStatus);
+                    }, time);
+                }
+            );
+        };
+
+
+
+        /********** Public functions *************************************************/
+
+        var CourseImport = {
+
+            /**
+             * Whether to stop sending AJAX requests for updates on the import
+             * progress.
+             */
+            stopGetStatus: false,
+
+            /**
+             * Update DOM to set all stages as not-started (for retrying an upload that
+             * failed).
+             */
+            clearImportDisplay: function () {
+                var all = $('ol.status-progress').children();
+                _.map(all, function (elem){
+                    $(elem).removeClass("is-complete").
+                        removeClass("is-started").
+                        removeClass("has-error").
+                        addClass("is-not-started");
+                    $(elem).find('p.error').remove(); // remove error messages
+                    $(elem).find('p.copy').show();
+                    updateCog($(elem), false);
+                });
+                this.stopGetStatus = false;
+            },
+
+            /**
+             * Update DOM to set all stages as complete, and stop asking for status
+             * updates.
+             */
+            displayFinishedImport: function () {
+                this.stopGetStatus = true;
+                var all = $('ol.status-progress').children();
+                _.map(all, function (elem){
+                    $(elem).
+                        removeClass("is-not-started").
+                        removeClass("is-started").
+                        addClass("is-complete");
+                    updateCog($(elem), false);
+                });
+            },
+
+            /**
+             * Entry point for server feedback. Makes status list visible and starts
+             * sending requests to the server for status updates.
+             * @param {string} url The url to send Ajax GET requests for updates.
+             */
+            startServerFeedback: function (url){
+                this.stopGetStatus = false;
+                $('div.wrapper-status').removeClass('is-hidden');
+                $('.status-info').show();
+                getStatus(url, 500, 0);
+            },
+
+
+            /**
+             * Give error message at the list element that corresponds to the stage
+             * where the error occurred.
+             * @param {int} stageNo Stage of import process at which error occured.
+             * @param {string} msg Error message to display.
+             */
+            stageError: function (stageNo, msg) {
+                var all = $('ol.status-progress').children();
+                // Make all stages up to, and including, the error stage 'complete'.
+                var prevList = all.slice(0, stageNo + 1);
+                _.map(prevList, function (elem){
+                    $(elem).
+                        removeClass("is-not-started").
+                        removeClass("is-started").
+                        addClass("is-complete");
+                    updateCog($(elem), false);
+                });
+                var message = msg || gettext("There was an error with the upload");
+                var elem = $('ol.status-progress').children().eq(stageNo);
+                elem.removeClass('is-started').addClass('has-error');
+                elem.find('p.copy').hide().after("<p class='copy error'>" + message + "</p>");
+            }
+
+        };
+
+        var showImportSubmit = function (e) {
+            var filepath = $(this).val();
+            if (filepath.substr(filepath.length - 6, 6) == 'tar.gz') {
+                $('.error-block').hide();
+                $('.file-name').html($(this).val().replace('C:\\fakepath\\', ''));
+                $('.file-name-block').show();
+                $('.view-import .choose-file-button').hide();
+                $('.submit-button').show();
+                $('.progress').show();
+            } else {
+                $('.error-block').html(gettext('File format not supported. Please upload a file with a <code>tar.gz</code> extension.')).show();
+            }
+        };
+
+        domReady(function () {
+            // import form setup
+            $('.view-import .file-input').bind('change', showImportSubmit);
+            $('.view-import .choose-file-button, .view-import .choose-file-button-inline').bind('click', function (e) {
+                e.preventDefault();
+                $('.view-import .file-input').click();
+            });
+        });
+
+        return CourseImport;
     });
-    var curList = all.eq(stageNo);
-    curList.removeClass("is-not-started").addClass("is-started");
-    updateCog(curList, true);
-};
-
-/**
- * Check for import status updates every `timemout` milliseconds, and update
- * the page accordingly.
- * @param {string} url Url to call for status updates.
- * @param {int} timeout Number of milliseconds to wait in between ajax calls
- *     for new updates.
- * @param {int} stage Starting stage.
- */
-var getStatus = function (url, timeout, stage) {
-    var currentStage = stage || 0;
-    if (CourseImport.stopGetStatus) { return ;}
-    updateStage(currentStage);
-    if (currentStage == 3 ) { return ;}
-    var time = timeout || 1000;
-    $.getJSON(url,
-        function (data) {
-            setTimeout(function () {
-                getStatus(url, time, data.ImportStatus);
-            }, time);
-        }
-    );
-};
-
-
-
-/********** Public functions *************************************************/
-
-var CourseImport = {
-
-    /**
-     * Whether to stop sending AJAX requests for updates on the import
-     * progress.
-     */
-    stopGetStatus: false,
-
-    /**
-     * Update DOM to set all stages as not-started (for retrying an upload that
-     * failed).
-     */
-    clearImportDisplay: function () {
-        var all = $('ol.status-progress').children();
-        _.map(all, function (elem){
-            $(elem).removeClass("is-complete").
-                removeClass("is-started").
-                removeClass("has-error").
-                addClass("is-not-started");
-            $(elem).find('p.error').remove(); // remove error messages
-            $(elem).find('p.copy').show();
-            updateCog($(elem), false);
-        });
-        this.stopGetStatus = false;
-    },
-
-    /**
-     * Update DOM to set all stages as complete, and stop asking for status
-     * updates.
-     */
-    displayFinishedImport: function () {
-        this.stopGetStatus = true;
-        var all = $('ol.status-progress').children();
-        _.map(all, function (elem){
-            $(elem).
-                removeClass("is-not-started").
-                removeClass("is-started").
-                addClass("is-complete");
-            updateCog($(elem), false);
-        });
-    },
-
-    /**
-     * Entry point for server feedback. Makes status list visible and starts
-     * sending requests to the server for status updates.
-     * @param {string} url The url to send Ajax GET requests for updates.
-     */
-    startServerFeedback: function (url){
-        this.stopGetStatus = false;
-        $('div.wrapper-status').removeClass('is-hidden');
-        $('.status-info').show();
-        getStatus(url, 500, 0);
-    },
-
-
-    /**
-     * Give error message at the list element that corresponds to the stage
-     * where the error occurred.
-     * @param {int} stageNo Stage of import process at which error occured.
-     * @param {string} msg Error message to display.
-     */
-    stageError: function (stageNo, msg) {
-        var all = $('ol.status-progress').children();
-        // Make all stages up to, and including, the error stage 'complete'.
-        var prevList = all.slice(0, stageNo + 1);
-        _.map(prevList, function (elem){
-            $(elem).
-                removeClass("is-not-started").
-                removeClass("is-started").
-                addClass("is-complete");
-            updateCog($(elem), false);
-        });
-        var message = msg || gettext("There was an error with the upload");
-        var elem = $('ol.status-progress').children().eq(stageNo);
-        elem.removeClass('is-started').addClass('has-error');
-        elem.find('p.copy').hide().after("<p class='copy error'>" + message + "</p>");
-    }
-
-};
-
-return CourseImport;
-});
diff --git a/cms/static/js/views/overview.js b/cms/static/js/views/overview.js
index 7dc2e48586..6e18dfdee2 100644
--- a/cms/static/js/views/overview.js
+++ b/cms/static/js/views/overview.js
@@ -1,248 +1,322 @@
-require(["jquery", "jquery.ui", "gettext", "js/hesitate", "js/views/feedback_notification"],
-         function($, ui, gettext, HesitateEvent, NotificationView) {
+define(["domReady", "jquery", "jquery.ui", "gettext", "js/views/feedback_notification", "draggabilly"],
+    function (domReady, $, ui, gettext, NotificationView, Draggabilly) {
 
-$(document).ready(function() {
-    // making the unit list draggable. Note: sortable didn't work b/c it considered
-    // drop points which the user hovered over as destinations and proactively changed
-    // the dom; so, if the user subsequently dropped at an illegal spot, the reversion
-    // point was the last dom change.
-    $('.unit').draggable({
-        axis: 'y',
-        handle: '.drag-handle',
-        zIndex: 999,
-        start: initiateHesitate,
-        // left 2nd arg in as inert selector b/c i was uncertain whether we'd try to get the shove up/down
-        // to work in the future
-        drag: generateCheckHoverState('.collapsed', ''),
-        stop: removeHesitate,
-        revert: "invalid"
-    });
+        var overviewDragger = {
+            droppableClasses: 'drop-target drop-target-prepend drop-target-before drop-target-after',
+            validDropClass: "valid-drop",
+            expandOnDropClass: "expand-on-drop",
 
-    // Subsection reordering
-    $('.id-holder').draggable({
-        axis: 'y',
-        handle: '.section-item .drag-handle',
-        zIndex: 999,
-        start: initiateHesitate,
-        drag: generateCheckHoverState('.courseware-section.collapsed', ''),
-        stop: removeHesitate,
-        revert: "invalid"
-    });
+            /*
+             * Determine information about where to drop the currently dragged
+             * element. Returns the element to attach to and the method of
+             * attachment ('before', 'after', or 'prepend').
+             */
+            findDestination: function (ele, yChange) {
+                var eleY = ele.offset().top;
+                var containers = $(ele.data('droppable-class'));
 
-    // Section reordering
-    $('.courseware-section').draggable({
-        axis: 'y',
-        handle: 'header .drag-handle',
-        stack: '.courseware-section',
-        revert: "invalid"
-    });
+                for (var i = 0; i < containers.length; i++) {
+                    var container = $(containers[i]);
+                    // Exclude the 'new unit' buttons, and make sure we don't
+                    // prepend an element to itself
+                    var siblings = container.children().filter(function () {
+                        return $(this).data('id') !== undefined && !$(this).is(ele);
+                    });
+                    // If the container is collapsed, check to see if the
+                    // element is on top of its parent list -- don't check the
+                    // position of the container
+                    var parentList = container.parents(ele.data('parent-location-selector')).first();
+                    if (parentList.hasClass('collapsed')) {
+                        if (Math.abs(eleY - parentList.offset().top) < 10) {
+                            return {
+                                ele: container,
+                                attachMethod: 'prepend',
+                                parentList: parentList
+                            };
+                        }
+                    }
+                    // Otherwise, do check the container
+                    else {
+                        // If the list is empty, we should prepend to it,
+                        // unless both elements are at the same location --
+                        // this prevents the user from being unable to expand
+                        // a section
+                        var containerY = container.offset().top;
+                        if (siblings.length == 0 &&
+                            containerY != eleY &&
+                            Math.abs(eleY - containerY) < 50) {
+                            return {
+                                ele: container,
+                                attachMethod: 'prepend'
+                            };
+                        }
+                        // Otherwise the list is populated, and we should attach before/after a sibling
+                        else {
+                            for (var j = 0; j < siblings.length; j++) {
+                                var $sibling = $(siblings[j]);
+                                var siblingY = $sibling.offset().top;
+                                var siblingHeight = $sibling.height();
+                                var siblingYEnd = siblingY + siblingHeight;
 
-
-    $('.sortable-unit-list').droppable({
-        accept : '.unit',
-        greedy: true,
-        tolerance: "pointer",
-        hoverClass: "dropover",
-        drop: onUnitReordered
-    });
-    $('.subsection-list > ol').droppable({
-        // why don't we have a more useful class for subsections than id-holder?
-        accept : '.id-holder', // '.unit, .id-holder',
-        tolerance: "pointer",
-        hoverClass: "dropover",
-        drop: onSubsectionReordered,
-        greedy: true
-    });
-
-    // Section reordering
-    $('.courseware-overview').droppable({
-        accept : '.courseware-section',
-        tolerance: "pointer",
-        drop: onSectionReordered,
-        greedy: true
-    });
-
-    // stop clicks on drag bars from doing their thing w/o stopping drag
-    $('.drag-handle').click(function(e) {e.preventDefault(); });
-
-});
-
-HesitateEvent.toggleXpandHesitation = null;
-function initiateHesitate(event, ui) {
-        HesitateEvent.toggleXpandHesitation = new HesitateEvent(expandSection, 'dragLeave', true);
-        $('.collapsed').on('dragEnter', HesitateEvent.toggleXpandHesitation, HesitateEvent.toggleXpandHesitation.trigger);
-        $('.collapsed, .unit, .id-holder').each(function() {
-                this.proportions = {width : this.offsetWidth, height : this.offsetHeight };
-                // reset b/c these were holding values from aborts
-                this.isover = false;
-        });
-}
-
-function computeIntersection(droppable, uiHelper, y) {
-    /*
-     * Test whether y falls within the bounds of the droppable on the Y axis
-     */
-    // NOTE: this only judges y axis intersection b/c that's all we're doing right now
-    //  don't expand the thing being carried
-    if (uiHelper.is(droppable)) {
-        return null;
-    }
-
-    $.extend(droppable, {offset : $(droppable).offset()});
-
-    var t = droppable.offset.top,
-        b = t + droppable.proportions.height;
-
-    if (t === b) {
-        // probably wrong values b/c invisible at the time of caching
-        droppable.proportions = { width : droppable.offsetWidth, height : droppable.offsetHeight };
-        b = t + droppable.proportions.height;
-    }
-    //  equivalent to the intersects test
-    return (t < y && // Bottom Half
-                y  < b ); // Top Half
-}
-
-// NOTE: selectorsToShove is not currently being used but I left this code as it did work but not well
-function generateCheckHoverState(selectorsToOpen, selectorsToShove) {
-    return function(event, ui) {
-        // copied from jquery.ui.droppable.js $.ui.ddmanager.drag & other ui.intersect
-        var draggable = $(this).data("ui-draggable"),
-            centerY = (draggable.positionAbs || draggable.position.absolute).top + (draggable.helperProportions.height / 2);
-        $(selectorsToOpen).each(function() {
-            var intersects = computeIntersection(this, ui.helper, centerY),
-                c = !intersects && this.isover ? "isout" : (intersects && !this.isover ? "isover" : null);
-
-            if(!c) {
-                return;
-            }
-
-            this[c] = true;
-            this[c === "isout" ? "isover" : "isout"] = false;
-            $(this).trigger(c === "isover" ? "dragEnter" : "dragLeave");
-        });
-
-        $(selectorsToShove).each(function() {
-            var intersectsBottom = computeIntersection(this, ui.helper, (draggable.positionAbs || draggable.position.absolute).top);
-
-            if ($(this).hasClass('ui-dragging-pushup')) {
-                if (!intersectsBottom) {
-                     console.log('not up', $(this).data('id'));
-                     $(this).removeClass('ui-dragging-pushup');
-                 }
-            }
-            else if (intersectsBottom) {
-                console.log('up', $(this).data('id'));
-                $(this).addClass('ui-dragging-pushup');
-            }
-
-            var intersectsTop = computeIntersection(this, ui.helper,
-                    (draggable.positionAbs || draggable.position.absolute).top + draggable.helperProportions.height);
-
-            if ($(this).hasClass('ui-dragging-pushdown')) {
-                if (!intersectsTop) {
-                    console.log('not down', $(this).data('id'));
-                    $(this).removeClass('ui-dragging-pushdown');
+                                // Facilitate dropping into the beginning or end of a list
+                                // (coming from opposite direction) via a "fudge factor". Math.min is for Jasmine test.
+                                var fudge = Math.min(Math.ceil(siblingHeight / 2), 20);
+                                // Dragging up into end of list.
+                                if (j == siblings.length - 1 && yChange < 0 && Math.abs(eleY - siblingYEnd) <= fudge) {
+                                    return {
+                                        ele: $sibling,
+                                        attachMethod: 'after'
+                                    };
+                                }
+                                // Dragging down into beginning of list.
+                                else if (j == 0 && yChange > 0 && Math.abs(eleY - siblingY) <= fudge) {
+                                    return {
+                                        ele: $sibling,
+                                        attachMethod: 'before'
+                                    };
+                                }
+                                else if (eleY >= siblingY && eleY <= siblingYEnd) {
+                                    return {
+                                        ele: $sibling,
+                                        attachMethod: eleY - siblingY <= siblingHeight / 2 ? 'before' : 'after'
+                                    };
+                                }
+                            }
+                        }
+                    }
                 }
-            }
-            else if (intersectsTop) {
-                console.log('down', $(this).data('id'));
-                $(this).addClass('ui-dragging-pushdown');
-            }
+                // Failed drag
+                return {
+                    ele: null,
+                    attachMethod: ''
+                }
+            },
 
-        });
-    };
-}
+            // Information about the current drag.
+            dragState: {},
 
-function removeHesitate(event, ui) {
-        $('.collapsed').off('dragEnter', HesitateEvent.toggleXpandHesitation.trigger);
-        $('.ui-dragging-pushdown').removeClass('ui-dragging-pushdown');
-        $('.ui-dragging-pushup').removeClass('ui-dragging-pushup');
-        HesitateEvent.toggleXpandHesitation = null;
-}
+            onDragStart: function (draggie, event, pointer) {
+                var ele = $(draggie.element);
+                this.dragState = {
+                    // Which element will be dropped into/onto on success
+                    dropDestination: null,
+                    // How we attach to the destination: 'before', 'after', 'prepend'
+                    attachMethod: '',
+                    // If dragging to an empty section, the parent section
+                    parentList: null,
+                    // The y location of the last dragMove event (to determine direction).
+                    lastY: 0,
+                    // The direction the drag is moving in (negative means up, positive down).
+                    dragDirection: 0
+                };
+                if (!ele.hasClass('collapsed')) {
+                    ele.addClass('collapsed');
+                    ele.find('.expand-collapse-icon').first().addClass('expand').removeClass('collapse');
+                    // onDragStart gets called again after the collapse, so we can't just store a variable in the dragState.
+                    ele.addClass(this.expandOnDropClass);
+                }
+            },
 
-function expandSection(event) {
-        $(event.delegateTarget).removeClass('collapsed', 400);
-        // don't descend to icon's on children (which aren't under first child) only to this element's icon
-        $(event.delegateTarget).children().first().find('.expand-collapse-icon').removeClass('expand', 400).addClass('collapse');
-}
+            onDragMove: function (draggie, event, pointer) {
+                // Handle scrolling of the browser.
+                var scrollAmount = 0;
+                var dragBuffer = 10;
+                if (window.innerHeight - dragBuffer < pointer.clientY) {
+                    scrollAmount = dragBuffer;
+                }
+                else if (dragBuffer > pointer.clientY) {
+                    scrollAmount = -(dragBuffer);
+                }
+                if (scrollAmount !== 0) {
+                    window.scrollBy(0, scrollAmount);
+                    return;
+                }
 
-function onUnitReordered(event, ui) {
-        // a unit's been dropped on this subsection,
-        //       figure out where it came from and where it slots in.
-        _handleReorder(event, ui, 'subsection-id', 'li:.leaf');
-}
+                var yChange = draggie.dragPoint.y - this.dragState.lastY;
+                if (yChange !== 0) {
+                    this.dragState.direction = yChange;
+                }
+                this.dragState.lastY = draggie.dragPoint.y;
 
-function onSubsectionReordered(event, ui) {
-        // a subsection has been dropped on this section,
-        //       figure out where it came from and where it slots in.
-        _handleReorder(event, ui, 'section-id', 'li:.branch');
-}
+                var ele = $(draggie.element);
+                var destinationInfo = this.findDestination(ele, this.dragState.direction);
+                var destinationEle = destinationInfo.ele;
+                this.dragState.parentList = destinationInfo.parentList;
 
-function onSectionReordered(event, ui) {
-        // a section moved w/in the overall (cannot change course via this, so no parentage change possible, just order)
-        _handleReorder(event, ui, 'course-id', '.courseware-section');
-}
+                // Clear out the old destination
+                if (this.dragState.dropDestination) {
+                    this.dragState.dropDestination.removeClass(this.droppableClasses);
+                }
+                // Mark the new destination
+                if (destinationEle && this.pointerInBounds(pointer, ele)) {
+                    ele.addClass(this.validDropClass);
+                    destinationEle.addClass('drop-target drop-target-' + destinationInfo.attachMethod);
+                    this.dragState.attachMethod = destinationInfo.attachMethod;
+                    this.dragState.dropDestination = destinationEle;
+                }
+                else {
+                    ele.removeClass(this.validDropClass);
+                    this.dragState.attachMethod = '';
+                    this.dragState.dropDestination = null;
+                }
+            },
 
-function _handleReorder(event, ui, parentIdField, childrenSelector) {
-        // figure out where it came from and where it slots in.
-        var subsection_id = $(event.target).data(parentIdField);
-        var _els = $(event.target).children(childrenSelector);
-        var children = _els.map(function(idx, el) { return $(el).data('id'); }).get();
-        // if new to this parent, figure out which parent to remove it from and do so
-        if (!_.contains(children, ui.draggable.data('id'))) {
-                var old_parent = ui.draggable.parent();
-                var old_children = old_parent.children(childrenSelector).map(function(idx, el) { return $(el).data('id'); }).get();
-                old_children = _.without(old_children, ui.draggable.data('id'));
-                $.ajax({
-                        url: "/save_item",
-                        type: "POST",
-                        dataType: "json",
-                        contentType: "application/json",
-                        data:JSON.stringify({ 'id' : old_parent.data(parentIdField), 'children' : old_children})
+            onDragEnd: function (draggie, event, pointer) {
+                var ele = $(draggie.element);
+                var destination = this.dragState.dropDestination;
+
+                // Clear dragging state in preparation for the next event.
+                if (destination) {
+                    destination.removeClass(this.droppableClasses);
+                }
+                ele.removeClass(this.validDropClass);
+
+                // If the drag succeeded, rearrange the DOM and send the result.
+                if (destination && this.pointerInBounds(pointer, ele)) {
+                    // Make sure we don't drop into a collapsed element
+                    if (this.dragState.parentList) {
+                        this.expandElement(this.dragState.parentList);
+                    }
+                    var method = this.dragState.attachMethod;
+                    destination[method](ele);
+                    this.handleReorder(ele);
+                }
+                // If the drag failed, send it back
+                else {
+                    $('.was-dragging').removeClass('was-dragging');
+                    ele.addClass('was-dragging');
+                }
+
+                if (ele.hasClass(this.expandOnDropClass)) {
+                    this.expandElement(ele);
+                    ele.removeClass(this.expandOnDropClass);
+                }
+
+                // Everything in its right place
+                ele.css({
+                    top: 'auto',
+                    left: 'auto'
                 });
-        }
-        else {
-                // staying in same parent
-                // remove so that the replacement in the right place doesn't double it
-                children = _.without(children, ui.draggable.data('id'));
-        }
-        // add to this parent (figure out where)
-        for (var i = 0, bump = 0; i < _els.length; i++) {
-            if (ui.draggable.is(_els[i])) {
-                bump = -1; // bump indicates that the draggable was passed in the dom but not children's list b/c
-                // it's not in that list
-            }
-            else if (ui.offset.top < $(_els[i]).offset().top) {
-                        // insert at i in children and _els
-                        ui.draggable.insertBefore($(_els[i]));
-                        // TODO figure out correct way to have it remove the style: top:n; setting (and similar line below)
-                        ui.draggable.attr("style", "position:relative;");
-                        children.splice(i + bump, 0, ui.draggable.data('id'));
-                        break;
+
+                this.dragState = {};
+            },
+
+            pointerInBounds: function (pointer, ele) {
+                return pointer.clientX >= ele.offset().left && pointer.clientX < ele.offset().left + ele.width();
+            },
+
+            expandElement: function (ele) {
+                ele.removeClass('collapsed');
+                ele.find('.expand-collapse-icon').first().removeClass('expand').addClass('collapse');
+            },
+
+            /*
+             * Find all parent-child changes and save them.
+             */
+            handleReorder: function (ele) {
+                var parentSelector = ele.data('parent-location-selector');
+                var childrenSelector = ele.data('child-selector');
+                var newParentEle = ele.parents(parentSelector).first();
+                var newParentID = newParentEle.data('id');
+                var oldParentID = ele.data('parent-id');
+                // If the parent has changed, update the children of the old parent.
+                if (oldParentID !== newParentID) {
+                    // Find the old parent element.
+                    var oldParentEle = $(parentSelector).filter(function () {
+                        return $(this).data('id') === oldParentID;
+                    });
+                    this.saveItem(oldParentEle, childrenSelector, function () {
+                        ele.data('parent-id', newParentID);
+                    });
                 }
-        }
-        // see if it goes at end (the above loop didn't insert it)
-        if (!_.contains(children, ui.draggable.data('id'))) {
-                $(event.target).append(ui.draggable);
-                ui.draggable.attr("style", "position:relative;"); // STYLE hack too
-                children.push(ui.draggable.data('id'));
-        }
-        var saving = new NotificationView.Mini({
-            title: gettext('Saving&hellip;')
-        });
-        saving.show();
-        $.ajax({
-                url: "/save_item",
-                type: "POST",
-                dataType: "json",
-                contentType: "application/json",
-                data:JSON.stringify({ 'id' : subsection_id, 'children' : children}),
-                success: function() {
+                var saving = new NotificationView.Mini({
+                    title: gettext('Saving&hellip;')
+                });
+                saving.show();
+                ele.addClass('was-dropped');
+                // Timeout interval has to match what is in the CSS.
+                setTimeout(function () {
+                    ele.removeClass('was-dropped');
+                }, 1000);
+                this.saveItem(newParentEle, childrenSelector, function () {
                     saving.hide();
-                }
+                });
+            },
+
+            /*
+             * Actually save the update to the server. Takes the element
+             * representing the parent item to save, a CSS selector to find
+             * its children, and a success callback.
+             */
+            saveItem: function (ele, childrenSelector, success) {
+                // Find all current child IDs.
+                var children = _.map(
+                    ele.find(childrenSelector),
+                    function (child) {
+                        return $(child).data('id');
+                    }
+                );
+                $.ajax({
+                    url: '/save_item',
+                    type: 'POST',
+                    dataType: 'json',
+                    contentType: 'application/json',
+                    data: JSON.stringify({
+                        id: ele.data('id'),
+                        children: children
+                    }),
+                    success: success
+                });
+            },
+
+            /*
+             * Make `type` draggable using `handleClass`, able to be dropped
+             * into `droppableClass`, and with parent type
+             * `parentLocationSelector`.
+             */
+            makeDraggable: function (type, handleClass, droppableClass, parentLocationSelector) {
+                _.each(
+                    $(type),
+                    function (ele) {
+                        // Remember data necessary to reconstruct the parent-child relationships
+                        $(ele).data('droppable-class', droppableClass);
+                        $(ele).data('parent-location-selector', parentLocationSelector);
+                        $(ele).data('child-selector', type);
+                        var draggable = new Draggabilly(ele, {
+                            handle: handleClass,
+                            containment: '.wrapper-dnd'
+                        });
+                        draggable.on('dragStart', _.bind(overviewDragger.onDragStart, overviewDragger));
+                        draggable.on('dragMove', _.bind(overviewDragger.onDragMove, overviewDragger));
+                        draggable.on('dragEnd', _.bind(overviewDragger.onDragEnd, overviewDragger));
+                    }
+                );
+            }
+        };
+
+        domReady(function() {
+            // Section
+            overviewDragger.makeDraggable(
+                '.courseware-section',
+                '.section-drag-handle',
+                '.courseware-overview',
+                'article.courseware-overview'
+            );
+            // Subsection
+            overviewDragger.makeDraggable(
+                '.id-holder',
+                '.subsection-drag-handle',
+                '.subsection-list > ol',
+                '.courseware-section'
+            );
+            // Unit
+            overviewDragger.makeDraggable(
+                '.unit',
+                '.unit-drag-handle',
+                'ol.sortable-unit-list',
+                'li.branch, article.subsection-body'
+            );
         });
 
-}
-
-}); // end define()
+        return overviewDragger;
+    });
diff --git a/cms/static/js/views/settings/grading.js b/cms/static/js/views/settings/grading.js
index 23393816cf..9b74be92a2 100644
--- a/cms/static/js/views/settings/grading.js
+++ b/cms/static/js/views/settings/grading.js
@@ -1,5 +1,5 @@
-define(["js/views/validation", "underscore", "jquery", "js/views/settings/grader"],
-    function(ValidatingView, _, $, GraderView) {
+define(["js/views/validation", "underscore", "jquery", "jquery.ui", "js/views/settings/grader"],
+    function(ValidatingView, _, $, ui, GraderView) {
 
 var GradingView = ValidatingView.extend({
     // Model class is CMS.Models.Settings.CourseGradingPolicy
diff --git a/cms/static/js_test.yml b/cms/static/js_test.yml
index f44d9dbbda..0e163b61d1 100644
--- a/cms/static/js_test.yml
+++ b/cms/static/js_test.yml
@@ -28,7 +28,6 @@ prepend_path: cms/static
 
 # Paths to library JavaScript files (optional)
 lib_paths:
-    - coffee/spec/setup_require.js
     - xmodule_js/common_static/js/vendor/require.js
     - xmodule_js/common_static/coffee/src/ajax_prefix.js
     - xmodule_js/common_static/js/src/utility.js
@@ -51,6 +50,10 @@ lib_paths:
     - xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js
     - xmodule_js/src/xmodule.js
     - xmodule_js/common_static/js/test/i18n.js
+    - xmodule_js/common_static/js/vendor/draggabilly.pkgd.js
+    - xmodule_js/common_static/js/vendor/date.js
+    - xmodule_js/common_static/js/vendor/domReady.js
+    - xmodule_js/common_static/js/vendor/jquery.smooth-scroll.min.js
 
 # Paths to source JavaScript files
 src_paths:
diff --git a/cms/static/js_test_squire.yml b/cms/static/js_test_squire.yml
index ca63d5d41a..2284319997 100644
--- a/cms/static/js_test_squire.yml
+++ b/cms/static/js_test_squire.yml
@@ -28,7 +28,6 @@ prepend_path: cms/static
 
 # Paths to library JavaScript files (optional)
 lib_paths:
-    - coffee/spec/setup_require.js
     - xmodule_js/common_static/js/vendor/require.js
     - xmodule_js/common_static/coffee/src/ajax_prefix.js
     - xmodule_js/common_static/js/src/utility.js
diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 93c2c0fa6f..7735a83297 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -528,9 +528,9 @@ p, ul, ol, dl {
 .new-subsection-item,
 .new-policy-item {
   @include grey-button;
-  margin: 5px 8px;
-  padding: 3px 10px 4px 10px;
-  font-size: 10px;
+  @include font-size(10);
+  margin: ($baseline/2);
+  padding: 3px ($baseline/2) 4px ($baseline/2);
 
   .new-folder-icon,
   .new-policy-icon,
diff --git a/cms/static/sass/_mixins-inherited.scss b/cms/static/sass/_mixins-inherited.scss
new file mode 120000
index 0000000000..f64a720561
--- /dev/null
+++ b/cms/static/sass/_mixins-inherited.scss
@@ -0,0 +1 @@
+../../../common/static/sass/_mixins-inherited.scss
\ No newline at end of file
diff --git a/cms/static/sass/_shame.scss b/cms/static/sass/_shame.scss
index 85d133af1f..3c765bea93 100644
--- a/cms/static/sass/_shame.scss
+++ b/cms/static/sass/_shame.scss
@@ -3,7 +3,7 @@
 // ====================
 
 // view - dashboard
-body.dashboard {
+.view-dashboard {
 
   // elements - authorship controls
   .wrapper-authorshiprights {
@@ -22,6 +22,35 @@ body.dashboard {
   }
 }
 
+// ====================
+
+.view-unit {
+
+  .unit-location .draggable-drop-indicator {
+    display: none; //needed to not show DnD UI (UI is shared across both views)
+  }
+}
+
+// ====================
+
+// needed to override ui-window styling for dragging state (outline selectors get too specific)
+.courseware-section.is-dragging {
+    box-shadow: 0 1px 2px 0 $shadow-d1 !important;
+    border: 1px solid $gray-d3 !important;
+}
+
+.courseware-section.is-dragging.valid-drop {
+  border-color: $blue-s1 !important;
+  box-shadow: 0 1px 2px 0 $blue-t2 !important;
+}
+
+// ====================
+
+// needed for poorly scoped margin rules on all content elements
+.branch .sortable-unit-list {
+  margin-bottom: 0;
+}
+
 
 // yes we have no boldness today - need to fix the resets
 body strong,
@@ -29,12 +58,13 @@ body b {
   font-weight: 700;
 }
 
-// known things to do (paint the fence, sand the floor, wax on/off)
 // ====================
 
 
-// known things to do (paint the fence, sand the floor, wax on/off):
+/* known things to do (paint the fence, sand the floor, wax on/off):
 
-// * centralize and move form styling into forms.scss - cms/static/sass/views/_textbooks.scss and cms/static/sass/views/_settings.scss
-// * move dialogue styles into cms/static/sass/elements/_modal.scss
-// * use the @include placeholder Bourbon mixin (http://bourbon.io/docs/#placeholder) for any placeholder styling
+* centralize and move form styling into forms.scss - cms/static/sass/views/_textbooks.scss and cms/static/sass/views/_settings.scss
+* move dialogue styles into cms/static/sass/elements/_modal.scss
+* use the @include placeholder Bourbon mixin (http://bourbon.io/docs/#placeholder) for any placeholder styling
+
+*/
diff --git a/cms/static/sass/_variables.scss b/cms/static/sass/_variables.scss
index 18ecdf7fef..093d3a957a 100644
--- a/cms/static/sass/_variables.scss
+++ b/cms/static/sass/_variables.scss
@@ -173,12 +173,14 @@ $tmg-f3: 0.125s;
 // ====================
 
 // specific UI
-$notification-height: ($baseline*10);
+$ui-notification-height: ($baseline*10);
+$ui-update-color: $blue-l4;
 
 // ====================
 
 // inherited
 $baseFontColor: $gray-d2;
+$lighter-base-font-color: rgb(100,100,100);
 $offBlack: #3c3c3c;
 $green: #108614;
 $lightGrey: #edf1f5;
@@ -195,6 +197,17 @@ $lightBluishGrey: rgb(197, 207, 223);
 $lightBluishGrey2: rgb(213, 220, 228);
 $error-red: rgb(253, 87, 87);
 
+
+//carryover from LMS for xmodules
+$sidebar-color: rgb(246, 246, 246);
+
 // type
 $sans-serif: $f-sans-serif;
 $body-line-height: golden-ratio(.875em, 1);
+
+// carried over from LMS for xmodules
+$action-primary-active-bg: #1AA1DE; // $m-blue
+$very-light-text: #fff;
+
+
+
diff --git a/cms/static/sass/assets/_anims.scss b/cms/static/sass/assets/_anims.scss
index 6e69f6c3df..8b66032e68 100644
--- a/cms/static/sass/assets/_anims.scss
+++ b/cms/static/sass/assets/_anims.scss
@@ -140,22 +140,22 @@
   }
 
   90% {
-    @include transform(translateY(-($notification-height)));
+    @include transform(translateY(-($ui-notification-height)));
   }
 
   100% {
-    @include transform(translateY(-($notification-height*0.99)));
+    @include transform(translateY(-($ui-notification-height*0.99)));
   }
 }
 
 // notifications slide down
 @include keyframes(notificationSlideDown) {
   0% {
-    @include transform(translateY(-($notification-height*0.99)));
+    @include transform(translateY(-($ui-notification-height*0.99)));
   }
 
   10% {
-    @include transform(translateY(-($notification-height)));
+    @include transform(translateY(-($ui-notification-height)));
   }
 
   100% {
@@ -211,3 +211,39 @@
 %anim-bounceOut {
   @include animation(bounceOut $tmg-f1 ease-in-out 1);
 }
+
+
+// ====================
+
+
+// flash
+@include keyframes(flash) {
+  0%, 100% {
+    opacity: 1.0;
+  }
+
+  50% {
+    opacity: 0.0;
+  }
+}
+
+// canned animation - use if you want out of the box/non-customized anim
+%anim-flash {
+  @include animation(flash $tmg-f1 ease-in-out 1);
+}
+
+// flash - double
+@include keyframes(flashDouble) {
+0%, 50%, 100% {
+  opacity: 1.0;
+}
+
+25%, 75% {
+    opacity: 0.0;
+  }
+  }
+
+// canned animation - use if you want out of the box/non-customized anim
+%anim-flashDouble {
+  @include animation(flashDouble $tmg-f1 ease-in-out 1);
+}
\ No newline at end of file
diff --git a/cms/static/sass/elements/_controls.scss b/cms/static/sass/elements/_controls.scss
index 3aa1d0ff8b..30a3a8561b 100644
--- a/cms/static/sass/elements/_controls.scss
+++ b/cms/static/sass/elements/_controls.scss
@@ -200,3 +200,83 @@
 %view-live-button {
   @extend %t-action4;
 }
+
+// ====================
+
+// UI: drag handles
+.drag-handle {
+
+  &:hover, &:focus {
+    cursor: move;
+  }
+}
+
+// UI: elem is draggable
+.is-draggable {
+  @include transition(border-color $tmg-f2 ease-in-out 0, box-shadow $tmg-f2 ease-in-out 0);
+  position: relative;
+
+  .draggable-drop-indicator {
+    @extend %ui-depth3;
+    @include transition(opacity $tmg-f2 linear 0s);
+    @include size(100%, auto);
+    position: absolute;
+    border-top: 1px solid $blue-l1;
+    opacity: 0.0;
+
+    *[class^="icon-caret"] {
+      @extend %t-icon5;
+      position: absolute;
+      top: -12px;
+      left: -($baseline/4);
+      color: $blue-s1;
+    }
+  }
+
+  .draggable-drop-indicator-before {
+    top: -($baseline/2);
+  }
+
+  .draggable-drop-indicator-after {
+    bottom: -($baseline/2);
+  }
+}
+
+// UI: drag state - is dragging
+.is-dragging {
+  @extend %ui-depth4;
+  left: -($baseline/4);
+  box-shadow: 0 1px 2px 0 $shadow-d1;
+  cursor: move;
+  opacity: 0.65;
+  border: 1px solid $gray-d3;
+
+  // UI: condition - valid drop
+  &.valid-drop {
+    border-color: $blue-s1;
+    box-shadow: 0 1px 2px 0 $blue-t2;
+  }
+}
+
+// UI: drag state - was dragging
+.was-dragging {
+  @include transition(transform $tmg-f2 ease-in-out 0);
+}
+
+// UI: drag target
+.drop-target {
+
+  &.drop-target-before {
+
+    > .draggable-drop-indicator-before {
+      opacity: 1.0;
+    }
+  }
+
+  &.drop-target-after {
+
+    > .draggable-drop-indicator-after {
+      opacity: 1.0;
+    }
+  }
+}
diff --git a/cms/static/sass/elements/_system-feedback.scss b/cms/static/sass/elements/_system-feedback.scss
index 188fd28251..6864d9ced4 100644
--- a/cms/static/sass/elements/_system-feedback.scss
+++ b/cms/static/sass/elements/_system-feedback.scss
@@ -712,7 +712,7 @@
 
   // notification showing/hiding
   .wrapper-notification {
-    bottom: -($notification-height);
+    bottom: -($ui-notification-height);
 
     // varying animations
     &.is-shown {
diff --git a/cms/static/sass/elements/_tender-widget.scss b/cms/static/sass/elements/_tender-widget.scss
index 6b81044232..1b04cb19fd 100644
--- a/cms/static/sass/elements/_tender-widget.scss
+++ b/cms/static/sass/elements/_tender-widget.scss
@@ -1,6 +1,11 @@
 // tender help/support widget
 // ====================
 
+// UI: hiding the default tender help "tag" element
+#tender_toggler {
+  display: none;
+}
+
 #tender_frame, #tender_window {
   background-image: none !important;
   background: none;
diff --git a/cms/static/sass/views/_account.scss b/cms/static/sass/views/_account.scss
index 14fe0b8b05..ecf301ad6a 100644
--- a/cms/static/sass/views/_account.scss
+++ b/cms/static/sass/views/_account.scss
@@ -233,13 +233,6 @@
 
     }
   }
-}
-
-.signup {
-
-}
-
-.signin {
 
   #field-password {
     position: relative;
diff --git a/cms/static/sass/views/_import.scss b/cms/static/sass/views/_import.scss
index 680626279e..b77987263b 100644
--- a/cms/static/sass/views/_import.scss
+++ b/cms/static/sass/views/_import.scss
@@ -157,16 +157,8 @@
         // CASE: has actions
         &.has-actions {
 
-          .status-detail {
-            width: flex-grid(5,9);
-          }
-
           .list-actions {
             display: none;
-            width: flex-grid(3,9);
-            float: right;
-            margin-left: flex-gutter();
-            text-align: right;
 
             .action-primary {
               @extend %btn-primary-blue;
diff --git a/cms/static/sass/views/_outline.scss b/cms/static/sass/views/_outline.scss
index 5ee9c5ab16..7a787bb5f0 100644
--- a/cms/static/sass/views/_outline.scss
+++ b/cms/static/sass/views/_outline.scss
@@ -137,394 +137,388 @@
 
 
   .courseware-section {
-      position: relative;
-      background: #fff;
-      border-radius: 3px;
-      border: 1px solid $mediumGrey;
-      margin-top: 15px;
-      padding-bottom: 12px;
-      box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+    @extend %ui-window;
+    @include transition(background $tmg-avg ease-in-out 0);
+    position: relative;
+    margin-top: ($baseline);
+    padding-bottom: ($baseline/2);
 
-      &:first-child {
-          margin-top: 0;
-      }
+    &.collapsed {
+        padding-bottom: 0;
+    }
 
-      &.collapsed {
-          padding-bottom: 0;
-      }
+    label {
+        float: left;
+        line-height: 29px;
+    }
 
-      label {
-          float: left;
-          line-height: 29px;
-      }
+    .datepair {
+        float: left;
+        margin-left: 10px;
+    }
 
-      .datepair {
-          float: left;
-          margin-left: 10px;
-      }
+    .section-published-date {
+        position: absolute;
+        top: 19px;
+        right: 80px;
+        padding: 4px 10px;
+        border-radius: 3px;
+        background: $lightGrey;
+        text-align: right;
 
-      .section-published-date {
-          position: absolute;
-          top: 19px;
-          right: 80px;
-          padding: 4px 10px;
+        .published-status {
+            @include font-size(12);
+            margin-right: 15px;
+
+            strong {
+                font-weight: bold;
+            }
+        }
+
+        .schedule-button {
+            @include blue-button;
+        }
+
+        .edit-button {
+            @include blue-button;
+        }
+
+        .schedule-button,
+        .edit-button {
+            @include font-size(11);
+            padding: 3px 15px 5px;
+        }
+    }
+
+    .datepair .date,
+    .datepair .time {
+        @include font-size(13);
+        box-shadow: none;
+        padding-left: 0;
+        padding-right: 0;
+        border: none;
+        background: none;
+        font-weight: bold;
+        color: $blue;
+        cursor: pointer;
+    }
+
+    .datepair .date {
+        width: 80px;
+    }
+
+    .datepair .time {
+        width: 65px;
+    }
+
+    &.collapsed .subsection-list,
+    .collapsed .subsection-list,
+    .collapsed > ol {
+        display: none !important;
+    }
+
+    header {
+        min-height: 75px;
+        @include clearfix();
+
+        .item-details, .section-published-date {
+
+        }
+
+        .item-details {
+            display: inline-block;
+            padding: 20px 0 10px 0;
+            @include clearfix();
+
+            .section-name {
+              @include font-size(19);
+              float: left;
+              margin-right: 10px;
+              width: 350px;
+              font-weight: bold;
+              color: $blue;
+            }
+
+            .section-name-span {
+              @include transition(color $tmg-f2 linear 0s);
+              cursor: pointer;
+
+              &:hover {
+                color: $orange;
+              }
+            }
+
+            .section-name-edit {
+              position: relative;
+              width: 400px;
+              background: $white;
+
+              input {
+              @include font-size(16);
+          }
+
+          .save-button {
+            @include blue-button;
+            padding: 7px 20px 7px;
+            margin-right: 5px;
+          }
+
+          .cancel-button {
+            @include white-button;
+            padding: 7px 20px 7px;
+          }
+        }
+
+        .section-published-date {
+          float: right;
           border-radius: 3px;
           background: $lightGrey;
-          text-align: right;
 
           .published-status {
-              @include font-size(12);
-              margin-right: 15px;
+            @include font-size(12);
+            margin-right: 15px;
 
-              strong {
-                  font-weight: bold;
-              }
+            strong {
+              font-weight: bold;
+            }
           }
 
           .schedule-button {
-              @include blue-button;
+            @include blue-button;
           }
 
           .edit-button {
-              @include blue-button;
+            @include blue-button;
           }
 
           .schedule-button,
           .edit-button {
-              @include font-size(11);
-              padding: 3px 15px 5px;
-          }
-      }
-
-      .datepair .date,
-      .datepair .time {
-          @include font-size(13);
-          box-shadow: none;
-          padding-left: 0;
-          padding-right: 0;
-          border: none;
-          background: none;
-          font-weight: bold;
-          color: $blue;
-          cursor: pointer;
-      }
-
-      .datepair .date {
-          width: 80px;
-      }
-
-      .datepair .time {
-          width: 65px;
-      }
-
-      &.collapsed .subsection-list,
-      .collapsed .subsection-list,
-      .collapsed > ol {
-          display: none !important;
-      }
-
-      header {
-          min-height: 75px;
-          @include clearfix();
-
-          .item-details, .section-published-date {
-
+            @include font-size(11);
+            padding: 0 15px 2px 15px;
+            }
           }
 
-          .item-details {
-              display: inline-block;
-              padding: 20px 0 10px 0;
-              @include clearfix();
+          .gradable-status {
+            position: absolute;
+            top: 20px;
+            right: 70px;
+            width: 145px;
 
-              .section-name {
-                @include font-size(19);
-                float: left;
-                margin-right: 10px;
-                width: 350px;
-                font-weight: bold;
+            .status-label {
+              @include font-size(12);
+              border-radius: 3px;
+              position: absolute;
+              top: 0;
+              right: 2px;
+              display: none;
+              width: 100px;
+              padding: 10px 35px 10px 10px;
+              background: $lightGrey;
+              color: $lightGrey;
+              text-align: right;
+              font-weight: bold;
+              line-height: 16px;
+            }
+
+            .menu-toggle {
+              z-index: 10;
+              position: absolute;
+              top: 2px;
+              right: 5px;
+              padding: 5px;
+              color: $lightGrey;
+
+              &:hover, &.is-active {
                 color: $blue;
               }
 
-              .section-name-span {
-                @include transition(color $tmg-f2 linear 0s);
-                cursor: pointer;
-
-                &:hover {
-                  color: $orange;
-                }
-              }
-
-              .section-name-edit {
-                position: relative;
-                width: 400px;
-                background: $white;
-
-                input {
-                @include font-size(16);
             }
 
-            .save-button {
-              @include blue-button;
-              padding: 7px 20px 7px;
-              margin-right: 5px;
-            }
-
-            .cancel-button {
-              @include white-button;
-              padding: 7px 20px 7px;
-            }
-          }
-
-          .section-published-date {
-            float: right;
-            border-radius: 3px;
-            background: $lightGrey;
-
-            .published-status {
+            .menu {
               @include font-size(12);
-              margin-right: 15px;
-
-              strong {
-                font-weight: bold;
-              }
-            }
-
-            .schedule-button {
-              @include blue-button;
-            }
-
-            .edit-button {
-              @include blue-button;
-            }
-
-            .schedule-button,
-            .edit-button {
-              @include font-size(11);
-              padding: 0 15px 2px 15px;
-              }
-            }
-
-            .gradable-status {
+              @include transition(opacity $tmg-f2 linear 0s, display $tmg-f2 linear 0s);
+              border-radius: 4px;
+              box-shadow: 0 1px 2px rgba(0, 0, 0, .2);
+              z-index: 1;
+              display: none;
+              opacity: 0.0;
               position: absolute;
-              top: 20px;
-              right: 70px;
-              width: 145px;
-
-              .status-label {
-                @include font-size(12);
-                border-radius: 3px;
-                position: absolute;
-                top: 0;
-                right: 2px;
-                display: none;
-                width: 100px;
-                padding: 10px 35px 10px 10px;
-                background: $lightGrey;
-                color: $lightGrey;
-                text-align: right;
-                font-weight: bold;
-                line-height: 16px;
-              }
-
-              .menu-toggle {
-                z-index: 10;
-                position: absolute;
-                top: 2px;
-                right: 5px;
-                padding: 5px;
-                color: $lightGrey;
-
-                &:hover, &.is-active {
-                  color: $blue;
-                }
-
-              }
-
-              .menu {
-                @include font-size(12);
-                @include transition(opacity $tmg-f2 linear 0s, display $tmg-f2 linear 0s);
-                border-radius: 4px;
-                box-shadow: 0 1px 2px rgba(0, 0, 0, .2);
-                z-index: 1;
-                display: none;
-                opacity: 0.0;
-                position: absolute;
-                top: -1px;
-                left: 2px;
-                margin: 0;
-                padding: 8px 12px;
-                background: $white;
-                border: 1px solid $mediumGrey;
+              top: -1px;
+              left: 2px;
+              margin: 0;
+              padding: 8px 12px;
+              background: $white;
+              border: 1px solid $mediumGrey;
 
 
 
-                li {
-                  width: 115px;
-                  margin-bottom: 3px;
-                  padding-bottom: 3px;
-                  border-bottom: 1px solid $lightGrey;
+              li {
+                width: 115px;
+                margin-bottom: 3px;
+                padding-bottom: 3px;
+                border-bottom: 1px solid $lightGrey;
 
-                  &:last-child {
-                    margin-bottom: 0;
-                    padding-bottom: 0;
-                    border: none;
+                &:last-child {
+                  margin-bottom: 0;
+                  padding-bottom: 0;
+                  border: none;
 
-                    a {
-                      color: $darkGrey;
-                    }
+                  a {
+                    color: $darkGrey;
                   }
                 }
-
-                a {
-
-                  &.is-selected {
-                    font-weight: bold;
-                  }
-                }
-            }
-
-            // dropdown state
-            &.is-active {
-
-              .menu {
-                z-index: 1000;
-                display: block;
-                opacity: 1.0;
               }
 
+              a {
 
-            .menu-toggle {
-              z-index: 10000;
-            }
+                &.is-selected {
+                  font-weight: bold;
+                }
+              }
           }
 
-          // set state
-          &.is-set {
+          // dropdown state
+          &.is-active {
 
-            .menu-toggle {
-              color: $blue;
-            }
-
-            .status-label {
+            .menu {
+              z-index: 1000;
               display: block;
-              color: $blue;
+              opacity: 1.0;
             }
-          }
 
-          float: left;
-          padding: 21px 0 0;
+
+          .menu-toggle {
+            z-index: 10000;
+          }
         }
+
+        // set state
+        &.is-set {
+
+          .menu-toggle {
+            color: $blue;
+          }
+
+          .status-label {
+            display: block;
+            color: $blue;
+          }
+        }
+
+        float: left;
+        padding: 21px 0 0;
       }
+    }
 
-          .item-actions {
-              margin-top: 21px;
-              margin-right: 12px;
+        .item-actions {
+            margin-top: 21px;
+            margin-right: 12px;
 
-              .edit-button,
-              .delete-button {
-                  margin-top: -3px;
-              }
-          }
-
-          .expand-collapse-icon {
-              @include transition(none);
-              float: left;
-              margin: 25px 6px 16px 16px;
-
-              &.expand {
-                  background-position: 0 0;
-              }
-
-              &.collapsed {
-
-              }
-          }
-
-          .drag-handle {
-              margin-left: 11px;
-          }
-      }
-
-      h3 {
-          @include font-size(19);
-          font-weight: 700;
-          color: $blue;
-      }
-
-      .section-name-span {
-          @include transition(color $tmg-f2 linear 0s);
-          cursor: pointer;
-
-          &:hover {
-              color: $orange;
-          }
-      }
-
-      .section-name-form {
-          margin-bottom: 15px;
-      }
-
-      .section-name-edit {
-          input {
-            @include font-size(16);
-          }
-
-          .save-button {
-              @include blue-button;
-              padding: 7px 20px 7px;
-              margin-right: 5px;
-          }
-
-          .cancel-button {
-              @include white-button;
-              padding: 7px 20px 7px;
-          }
-      }
-
-      h4 {
-          @include font-size(12);
-          color: #878e9d;
-
-          strong {
-              font-weight: bold;
-          }
-      }
-
-      .list-header {
-          @include linear-gradient(top, transparent, rgba(0, 0, 0, .1));
-          background-color: #ced2db;
-          border-radius: 3px 3px 0 0;
-      }
-
-      .subsection-list {
-          margin: 0 12px;
-
-          > ol {
-              @include tree-view;
-              border-top-width: 0;
-          }
-      }
-
-      &.new-section {
-
-          header {
-              @include clearfix();
-              height: auto;
-          }
-
-          .expand-collapse-icon {
-              visibility: hidden;
-          }
-
-          .item-details {
-            padding: 25px 0 0 0;
-
-            .section-name {
-              float: none;
-              width: 100%;
+            .edit-button,
+            .delete-button {
+                margin-top: -3px;
             }
+        }
+
+        .expand-collapse-icon {
+            @include transition(none);
+            float: left;
+            margin: 25px 6px 16px 16px;
+
+            &.expand {
+                background-position: 0 0;
+            }
+
+            &.collapsed {
+
+            }
+        }
+
+        .drag-handle {
+            margin-left: 11px;
+        }
+    }
+
+    h3 {
+        @include font-size(19);
+        font-weight: 700;
+        color: $blue;
+    }
+
+    .section-name-span {
+        @include transition(color $tmg-f2 linear 0s);
+        cursor: pointer;
+
+        &:hover {
+            color: $orange;
+        }
+    }
+
+    .section-name-form {
+        margin-bottom: 15px;
+    }
+
+    .section-name-edit {
+        input {
+          @include font-size(16);
+        }
+
+        .save-button {
+            @include blue-button;
+            padding: 7px 20px 7px;
+            margin-right: 5px;
+        }
+
+        .cancel-button {
+            @include white-button;
+            padding: 7px 20px 7px;
+        }
+    }
+
+    h4 {
+        @include font-size(12);
+        color: #878e9d;
+
+        strong {
+            font-weight: bold;
+        }
+    }
+
+    .list-header {
+        @include linear-gradient(top, transparent, rgba(0, 0, 0, .1));
+        background-color: #ced2db;
+        border-radius: 3px 3px 0 0;
+    }
+
+    .subsection-list {
+        margin: 0 12px;
+
+        > ol {
+            @include tree-view;
+            border-top-width: 0;
+        }
+    }
+
+    &.new-section {
+
+        header {
+            @include clearfix();
+            height: auto;
+        }
+
+        .expand-collapse-icon {
+            visibility: hidden;
+        }
+
+        .item-details {
+          padding: 25px 0 0 0;
+
+          .section-name {
+            float: none;
+            width: 100%;
           }
-      }
+        }
+    }
   }
 
   .toggle-button-sections {
@@ -675,35 +669,75 @@
       color: $darkGrey;
   }
 
-  // sort/drag and drop
-  .ui-droppable {
-      @include transition (padding 0.5s ease-in-out 0s);
-      min-height: 20px;
-      padding: 0;
+  // UI: DnD - specific elems/cases - section
+  .courseware-section {
 
-      &.dropover {
-          padding: 15px 0;
-      }
+    .draggable-drop-indicator-before {
+      top: -($baseline/2);
+    }
+
+    .draggable-drop-indicator-after {
+      bottom: -13px;
+    }
+
+    // CASE: DnD - empty subsection with unit dropping
+    .drop-target-prepend .draggable-drop-indicator-initial {
+      opacity: 1.0;
+    }
+
+    // STATE: was dropped
+    &.was-dropped {
+      background-color: $ui-update-color;
+    }
   }
 
-  .ui-draggable-dragging {
-      box-shadow: 0 1px 2px rgba(0, 0, 0, .3);
-      border: 1px solid $darkGrey;
-      opacity : 0.2;
-      &:hover {
-          opacity : 1.0;
-          .section-item {
-              background: $yellow !important;
-          }
-      }
+  // UI: DnD - specific elems/cases - subsection
+  .courseware-subsection {
 
-      // hiding unit button - temporary fix until this semantically corrected
-      .new-unit-item {
-        display: none;
+    .draggable-drop-indicator-before {
+      top: 0;
+    }
+
+    .draggable-drop-indicator-after {
+      bottom: 0;
+    }
+
+    // CASE: DnD - empty subsection with unit dropping
+    .drop-target-prepend .draggable-drop-indicator-initial {
+      opacity: 1.0;
+    }
+
+    // STATE: was dropped
+    &.was-dropped {
+
+      > .section-item {
+        background-color: $ui-update-color !important; // nasty, but needed for specificity
       }
+    }
   }
 
-  ol.ui-droppable .branch:first-child .section-item {
-      border-top: none;
+  // UI: DnD - specific elems/cases - unit
+  .courseware-unit {
+
+    .draggable-drop-indicator-before {
+      top: 0;
+    }
+
+    .draggable-drop-indicator-after {
+      bottom: 0;
+    }
+
+    // STATE: was dropped
+    &.was-dropped {
+
+      > .section-item {
+        background-color: $ui-update-color !important; // nasty, but needed for specificity
+      }
+    }
+  }
+
+  // UI: DnD - specific elems/cases - empty parents splint
+  .ui-splint-indicator {
+    position: relative;
   }
 }
diff --git a/cms/static/sass/views/_subsection.scss b/cms/static/sass/views/_subsection.scss
index 97353d919b..d6da939115 100644
--- a/cms/static/sass/views/_subsection.scss
+++ b/cms/static/sass/views/_subsection.scss
@@ -400,4 +400,21 @@
       }
     }
   }
+
+  // UI: DnD - specific elems/cases - units
+  .courseware-unit {
+
+    .draggable-drop-indicator-before {
+      top: 0;
+    }
+
+    .draggable-drop-indicator-after {
+      bottom: 0;
+    }
+  }
+
+  // UI: DnD - specific elems/cases - empty parents initial drop indicator
+  .draggable-drop-indicator-initial {
+    display: none;
+  }
 }
diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss
index 9a4eb16e52..50685123a2 100644
--- a/cms/static/sass/views/_unit.scss
+++ b/cms/static/sass/views/_unit.scss
@@ -355,6 +355,20 @@ body.course.unit,.view-unit {
 
           }
         }
+
+      .wrapper-alert-error {
+          margin-top: ($baseline*1.25);
+          box-shadow: none;
+          border-top: 5px solid $red-l1;
+
+          .copy,
+          .title {
+            color: $white;
+          }
+
+      }
+
+
       }
     }
 
@@ -415,6 +429,19 @@ body.course.unit,.view-unit {
         margin-left: 0;
       }
     }
+
+    // UI: DnD - specific elems/cases - unit
+    .courseware-unit {
+
+      // STATE: was dropped
+      &.was-dropped {
+
+        > .section-item {
+          background-color: $ui-update-color !important; // nasty, but needed for specificity
+        }
+      }
+    }
+
     // ====================
 
     // Component Editing
diff --git a/cms/templates/base.html b/cms/templates/base.html
index a27cac7760..152bb40918 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -33,6 +33,7 @@
 window.baseUrl = "${settings.STATIC_URL}";
 var require = {
     baseUrl: baseUrl,
+    waitSeconds: 60,
     paths: {
         "domReady": "js/vendor/domReady",
         "gettext": "/i18n",
@@ -60,12 +61,18 @@ var require = {
         "underscore.string": "js/vendor/underscore.string.min",
         "backbone": "js/vendor/backbone-min",
         "backbone.associations": "js/vendor/backbone-associations-min",
-        "youtube": "js/load_youtube",
         "tinymce": "js/vendor/tiny_mce/tiny_mce",
         "jquery.tinymce": "js/vendor/tiny_mce/jquery.tinymce",
-        "mathjax": "https://edx-static.s3.amazonaws.com/mathjax-MathJax-727332c/MathJax.js?config=TeX-MML-AM_HTMLorMML-full",
         "xmodule": "/xmodule/xmodule",
-        "utility": "js/src/utility"
+        "utility": "js/src/utility",
+        "draggabilly": "js/vendor/draggabilly.pkgd",
+
+        // externally hosted files
+        "mathjax": "//edx-static.s3.amazonaws.com/mathjax-MathJax-727332c/MathJax.js?config=TeX-MML-AM_HTMLorMML-full",
+        // youtube URL does not end in ".js". We add "?noext" to the path so
+        // that require.js adds the ".js" to the query component of the URL,
+        // and leaves the path component intact.
+        "youtube": "//www.youtube.com/player_api?noext"
     },
     shim: {
         "gettext": {
@@ -136,6 +143,9 @@ var require = {
             deps: ["backbone"],
             exports: "Backbone.Associations"
         },
+        "youtube": {
+            exports: "YT"
+        },
         "codemirror": {
             exports: "CodeMirror"
         },
@@ -147,16 +157,27 @@ var require = {
         },
         "mathjax": {
             exports: "MathJax"
+        },
+
+        "coffee/src/main": {
+            deps: ["coffee/src/ajax_prefix"]
+        },
+        "coffee/src/logger": {
+            exports: "Logger",
+            deps: ["coffee/src/ajax_prefix"]
         }
     },
-    // load these automatically
-    deps: ["js/base", "coffee/src/main", "datepair"]
-    // we need "datepair" because it dynamically modifies the page when it is loaded -- yuck!
+    // load jquery and gettext automatically
+    deps: ["jquery", "gettext"],
+    callback: function() {
+        // load other scripts on every page, after jquery loads
+        require(["js/base", "coffee/src/main", "coffee/src/logger", "datepair"]);
+        // we need "datepair" because it dynamically modifies the page
+        // when it is loaded -- yuck!
+    }
 };
 </script>
 <script type="text/javascript" src="${static.url("js/vendor/require.js")}"></script>
-<script type="text/javascript" src="${static.url("coffee/src/logger.js")}"></script>
-<script type="text/javascript" src="${static.url("coffee/src/ajax_prefix.js")}"></script>
 
 ## js templates
 <script id="system-feedback-tpl" type="text/template">
@@ -187,6 +208,9 @@ require(['js/models/course'], function(Course) {
       <%block name="content"></%block>
 
       % if user.is_authenticated():
+      <script type="text/javascript">
+        require(['js/sock']);
+      </script>
       <%include file="widgets/sock.html" />
       % endif
 
diff --git a/cms/templates/component.html b/cms/templates/component.html
index 7496e85b18..07ab92c592 100644
--- a/cms/templates/component.html
+++ b/cms/templates/component.html
@@ -31,6 +31,6 @@
   <a href="#" class="edit-button standard"><span class="edit-icon"></span>${_("Edit")}</a>
   <a href="#" class="delete-button standard"><span class="delete-icon"></span>${_("Delete")}</a>
 </div>
-<a data-tooltip='${_("Drag to reorder")}' href="#" class="drag-handle"></a>
+<span data-tooltip='${_("Drag to reorder")}' class="drag-handle"></span>
 ${preview}
 
diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html
index 364411b01c..8a4d61806c 100644
--- a/cms/templates/edit_subsection.html
+++ b/cms/templates/edit_subsection.html
@@ -21,9 +21,11 @@
         <label>${_("Display Name:")}</label>
           <input type="text" value="${subsection.display_name_with_default | h}" class="subsection-display-name-input" data-metadata-name="display_name"/>
         </div>
-        <div class="sortable-unit-list">
-        <label>${_("Units:")}</label>
-          ${units.enum_units(subsection, subsection_units=subsection_units)}
+        <div class="wrapper-dnd">
+          <div class="sortable-unit-list">
+            <label>${_("Units:")}</label>
+              ${units.enum_units(subsection, subsection_units=subsection_units)}
+          </div>
         </div>
       </article>
     </div>
@@ -112,9 +114,8 @@ require(["domReady!", "jquery", "js/models/location", "js/views/overview_assignm
     // I believe that current (New Section/New Subsection) cause full page reloads which means these aren't needed globally
     // but we really should change that behavior.
     if (!window.graderTypes) {
-        window.graderTypes = new CourseGraderCollection();
+        window.graderTypes = new CourseGraderCollection(${course_graders|n}, {parse:true});
         window.graderTypes.course_location = new Location('${parent_location}');
-        window.graderTypes.reset(${course_graders|n});
     }
 
     $(".gradable-status").each(function(index, ele) {
diff --git a/cms/templates/html_error.html b/cms/templates/html_error.html
new file mode 100644
index 0000000000..65bf870029
--- /dev/null
+++ b/cms/templates/html_error.html
@@ -0,0 +1,26 @@
+<%! from django.utils.translation import ugettext as _ %>
+<%! from django.core.urlresolvers import reverse %>
+
+<%block name="content">
+  <div class="wrapper wrapper-alert wrapper-alert-error is-shown">
+    <div class="error">
+
+      <div class="copy">
+        <h2 class="title">
+          <i class="icon-warning-sign"></i>
+          ${_("We're having trouble rendering your component")}
+        </h2>
+
+        <p>${_("Students will not be able to access this component. Re-edit your component to fix the error.")}</p>
+
+        % if message:
+        <p class="description">
+            ${_("Error:")}
+            ${message | h}
+        </p>
+        % endif
+
+
+    </div>
+  </div>
+</%block>
diff --git a/cms/templates/import.html b/cms/templates/import.html
index 7daf4f78d4..82876148e8 100644
--- a/cms/templates/import.html
+++ b/cms/templates/import.html
@@ -111,13 +111,13 @@
               <div class="status-detail">
                 <h3 class="title">${_("Success")}</h3>
                 <p class="copy">${_("Your imported content has now been integrated into this course")}</p>
-              </div>
 
-              <ul class="list-actions">
-                <li class="item-action">
-                  <a href="${successful_import_redirect_url}" class="action action-primary">${_("View Updated Outline")}</a>
-                </li>
-              </ul>
+                <ul class="list-actions">
+                  <li class="item-action">
+                    <a href="${successful_import_redirect_url}" class="action action-primary">${_("View Updated Outline")}</a>
+                  </li>
+                </ul>
+              </div>
             </li>
           </ol>
         </div>
diff --git a/cms/templates/index.html b/cms/templates/index.html
index df8459e448..82183c10b7 100644
--- a/cms/templates/index.html
+++ b/cms/templates/index.html
@@ -7,29 +7,26 @@
 
 <%block name="jsextra">
 <script type="text/javascript">
-require(['jquery', 'jquery.form'], function($) {
-    $(document).ready(function () {
+require(["domReady!", "jquery", "jquery.form", "js/index"], function(doc, $) {
+    // showing/hiding creation rights UI
+    $('.show-creationrights').click(function(e){
+        (e).preventDefault();
+        $(this).closest('.wrapper-creationrights').toggleClass('is-shown').find('.ui-toggle-control').toggleClass('current');
+    });
 
-        // showing/hiding creation rights UI
-        $('.show-creationrights').click(function(e){
-            (e).preventDefault();
-            $(this).closest('.wrapper-creationrights').toggleClass('is-shown').find('.ui-toggle-control').toggleClass('current');
-        });
+    var reloadPage = function () {
+        location.reload();
+    };
 
-        var reloadPage = function () {
-            location.reload();
-        };
+    var showError = function ()  {
+        $('#request-coursecreator-submit').toggleClass('has-error').find('.label').text('Sorry, there was error with your request');
+        $('#request-coursecreator-submit').find('.icon-cog').toggleClass('icon-spin');
+    };
 
-        var showError = function ()  {
-            $('#request-coursecreator-submit').toggleClass('has-error').find('.label').text('Sorry, there was error with your request');
-            $('#request-coursecreator-submit').find('.icon-cog').toggleClass('icon-spin');
-        };
+    $('#request-coursecreator').ajaxForm({error: showError, success: reloadPage});
 
-        $('#request-coursecreator').ajaxForm({error: showError, success: reloadPage});
-
-        $('#request-coursecreator-submit').click(function(e){
-          $(this).toggleClass('is-disabled is-submitting').find('.label').text('Submitting Your Request');
-        });
+    $('#request-coursecreator-submit').click(function(e){
+      $(this).toggleClass('is-disabled is-submitting').find('.label').text('Submitting Your Request');
     });
 });
 </script>
diff --git a/cms/templates/overview.html b/cms/templates/overview.html
index b3888d8706..5d75e3922a 100644
--- a/cms/templates/overview.html
+++ b/cms/templates/overview.html
@@ -25,9 +25,8 @@ require(["domReady!", "jquery", "js/models/location", "js/models/section", "js/v
   // I believe that current (New Section/New Subsection) cause full page reloads which means these aren't needed globally
   // but we really should change that behavior.
   if (!window.graderTypes) {
-    window.graderTypes = new CourseGraderCollection();
+    window.graderTypes = new CourseGraderCollection(${course_graders|n}, {parse:true});
     window.graderTypes.course_location = new Location('${parent_location}');
-    window.graderTypes.reset(${course_graders|n});
   }
 
   $(".gradable-status").each(function(index, ele) {
@@ -82,7 +81,7 @@ require(["domReady!", "jquery", "js/models/location", "js/models/section", "js/v
         </div>
         <div class="item-actions">
           <a href="#" data-tooltip="${_('Delete this section')}" class="delete-button delete-section-button"><span class="delete-icon"></span></a>
-          <a href="#" data-tooltip="${_('Drag to re-order')}" class="drag-handle"></a>
+          <span data-tooltip="${_('Drag to re-order')}" class="drag-handle"></span>
         </div>
       </header>
     </section>
@@ -138,74 +137,90 @@ require(["domReady!", "jquery", "js/models/location", "js/models/section", "js/v
 
   <div class="main-wrapper">
     <div class="inner-wrapper">
-      <article class="courseware-overview" data-course-id="${context_course.location.url()}">
-        % for section in sections:
-        <section class="courseware-section branch" data-id="${section.location}">
-          <header>
-          <a href="#" data-tooltip="${_('Expand/collapse this section')}" class="expand-collapse-icon collapse"></a>
 
-            <div class="item-details" data-id="${section.location}">
-              <h3 class="section-name" data-name="${section.display_name_with_default | h}"></h3>
-              <div class="section-published-date">
-                <%
-                  if section.start is not None:
-                      start_date_str = section.start.strftime('%m/%d/%Y')
-                      start_time_str = section.start.strftime('%H:%M')
-                  else:
-                      start_date_str = ''
-                      start_time_str = ''
-                %>
-                %if section.start is None:
-                  <span class="published-status">${_("This section has not been released.")}</span>
-                  <a href="#" class="schedule-button" data-date="" data-time="" data-id="${section.location}">${_("Schedule")}</a>
-                %else:
-                  <span class="published-status"><strong>${_("Will Release:")}</strong>
-                  ${date_utils.get_default_time_display(section.start)}</span>
-                  <a href="#" class="edit-button" data-date="${start_date_str}"
-                    data-time="${start_time_str}" data-id="${section.location}">${_("Edit")}</a>
-                %endif
-              </div>
-            </div>
+      <div class="wrapper-dnd">
+        <article class="courseware-overview" data-id="${context_course.location.url()}">
+          % for section in sections:
+          <section class="courseware-section branch is-draggable" data-id="${section.location}" data-parent-id="${context_course.location.url()}">
 
-            <div class="item-actions">
-              <a href="#" data-tooltip="${_('Delete this section')}" class="delete-button delete-section-button"><span class="delete-icon"></span></a>
-              <a href="#" data-tooltip="${_('Drag to reorder')}" class="drag-handle"></a>
-            </div>
-          </header>
-          <div class="subsection-list">
-            <div class="list-header">
-              <a href="#" class="new-subsection-item" data-category="${new_subsection_category}">
-                <span class="new-folder-icon"></span>${_("New Subsection")}
-              </a>
-            </div>
-            <ol data-section-id="${section.location.url()}">
-              % for subsection in section.get_children():
-              <li class="branch collapsed id-holder" data-id="${subsection.location}">
-                <div class="section-item">
-                  <div class="details">
-                    <a href="#" data-tooltip="${_('Expand/collapse this subsection')}" class="expand-collapse-icon expand"></a>
-                    <a href="${reverse('edit_subsection', args=[subsection.location])}">
-                      <span class="folder-icon"></span>
-                      <span class="subsection-name"><span class="subsection-name-value">${subsection.display_name_with_default}</span></span>
-                    </a>
-                  </div>
+            <%include file="widgets/_ui-dnd-indicator-before.html" />
 
-                  <div class="gradable-status" data-initial-status="${subsection.format if subsection.format is not None else _('Not Graded')}">
-                  </div>
+            <header>
+            <a href="#" data-tooltip="${_('Expand/collapse this section')}" class="expand-collapse-icon collapse"></a>
 
-                  <div class="item-actions">
-                    <a href="#" data-tooltip="${_('Delete this subsection')}" class="delete-button delete-subsection-button"><span class="delete-icon"></span></a>
-                    <a href="#" data-tooltip="${_('Drag to reorder')}" class="drag-handle"></a>
-                  </div>
+              <div class="item-details" data-id="${section.location}">
+                <h3 class="section-name" data-name="${section.display_name_with_default | h}"></h3>
+                <div class="section-published-date">
+                  <%
+                    if section.start is not None:
+                        start_date_str = section.start.strftime('%m/%d/%Y')
+                        start_time_str = section.start.strftime('%H:%M')
+                    else:
+                        start_date_str = ''
+                        start_time_str = ''
+                  %>
+                  %if section.start is None:
+                    <span class="published-status">${_("This section has not been released.")}</span>
+                    <a href="#" class="schedule-button" data-date="" data-time="" data-id="${section.location}">${_("Schedule")}</a>
+                  %else:
+                    <span class="published-status"><strong>${_("Will Release:")}</strong>
+                    ${date_utils.get_default_time_display(section.start)}</span>
+                    <a href="#" class="edit-button" data-date="${start_date_str}"
+                      data-time="${start_time_str}" data-id="${section.location}">${_("Edit")}</a>
+                  %endif
                 </div>
-                ${units.enum_units(subsection)}
-              </li>
-              % endfor
-            </ol>
-          </div>
-        </section>
-        % endfor
-      </article>
+              </div>
+
+              <div class="item-actions">
+                <a href="#" data-tooltip="${_('Delete this section')}" class="delete-button delete-section-button"><span class="delete-icon"></span></a>
+                <span data-tooltip="${_('Drag to reorder')}" class="drag-handle section-drag-handle"></span>
+              </div>
+            </header>
+            <div class="subsection-list">
+              <div class="list-header">
+                <a href="#" class="new-subsection-item" data-category="${new_subsection_category}">
+                  <span class="new-folder-icon"></span>${_("New Subsection")}
+                </a>
+              </div>
+              <ol class="sortable-subsection-list" data-id="${section.location.url()}">
+                % for subsection in section.get_children():
+                <li class="courseware-subsection branch collapsed id-holder is-draggable" data-id="${subsection.location}" data-parent-id="${section.location.url()}">
+
+                  <%include file="widgets/_ui-dnd-indicator-before.html" />
+
+                  <div class="section-item">
+                    <div class="details">
+                      <a href="#" data-tooltip="${_('Expand/collapse this subsection')}" class="expand-collapse-icon expand"></a>
+                      <a href="${reverse('edit_subsection', args=[subsection.location])}">
+                        <span class="folder-icon"></span>
+                        <span class="subsection-name"><span class="subsection-name-value">${subsection.display_name_with_default}</span></span>
+                      </a>
+                    </div>
+
+                    <div class="gradable-status" data-initial-status="${subsection.format if subsection.format is not None else _('Not Graded')}">
+                    </div>
+
+                    <div class="item-actions">
+                      <a href="#" data-tooltip="${_('Delete this subsection')}" class="delete-button delete-subsection-button"><span class="delete-icon"></span></a>
+                      <span data-tooltip="${_('Drag to reorder')}" class="drag-handle subsection-drag-handle"></span>
+                    </div>
+                  </div>
+                  ${units.enum_units(subsection)}
+
+                  <%include file="widgets/_ui-dnd-indicator-after.html" />
+                </li>
+                % endfor
+                <li class="ui-splint ui-splint-indicator">
+                  <%include file="widgets/_ui-dnd-indicator-initial.html" />
+                </li>
+              </ol>
+            </div>
+
+            <%include file="widgets/_ui-dnd-indicator-after.html" />
+          </section>
+          % endfor
+        </article>
+      </div>
     </div>
   </div>
   <footer></footer>
diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index 961b7d3d92..f3eec1e195 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -17,6 +17,10 @@
   </script>
 
   <script type="text/javascript">
+window.CMS = window.CMS || {};
+CMS.URL = CMS.URL || {};
+CMS.URL.UPLOAD_ASSET = '${upload_asset_url}';
+
 require(["domReady!", "jquery", "js/models/settings/course_details", "js/views/settings/main"],
   function(doc, $, CourseDetailsModel, MainView) {
     // hilighting labels when fields are focused in
@@ -37,8 +41,6 @@ require(["domReady!", "jquery", "js/models/settings/course_details", "js/views/s
       },
       reset: true
     });
-
-    CMS.URL.UPLOAD_ASSET = '${upload_asset_url}';
 });
   </script>
 </%block>
diff --git a/cms/templates/settings_discussions_faculty.html b/cms/templates/settings_discussions_faculty.html
deleted file mode 100644
index a3c57860b8..0000000000
--- a/cms/templates/settings_discussions_faculty.html
+++ /dev/null
@@ -1,429 +0,0 @@
-<%! from django.utils.translation import ugettext as _ %>
-<!-- NOTE not used currently but retained b/c it's yet-to-be-wired functionality -->
-<%inherit file="base.html" />
-<%block name="title">${_("Schedule and details")}</%block>
-<%block name="bodyclass">is-signedin course view-settings</%block>
-
-
-<%namespace name='static' file='static_content.html'/>
-<%!
-from contentstore import utils
-%>
-
-
-<%block name="jsextra">
-  <script type="text/javascript" src="${static.url('js/models/course_relative.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/views/validating_view.js')}"></script>
-
-  <script type="text/javascript">
-    $(document).ready(function(){
-    });
-
-  </script>
-</%block>
-
-<%block name="content">
-  <!-- -->
-  <div class="main-wrapper">
-    <div class="inner-wrapper">
-      <h1>${_("Settings")}</h1>
-      <article class="settings-overview">
-        <div class="settings-page-section main-column">
-
-          <section class="settings-faculty">
-            <h2 class="title">${_("Faculty")}</h2>
-
-            <section class="settings-faculty-members">
-              <header>
-                <h3>${_("Faculty Members")}</h3>
-                <span class="detail">${_("Individuals instructing and helping with this course")}</span>
-              </header>
-
-              <div class="row">
-                <div class="field enum">
-                  <ul class="input-list course-faculty-list">
-                    <li class="input input-existing multi course-faculty-list-item">
-                      <div class="row row-col2">
-                        <label for="course-faculty-1-firstname">${_("Faculty First Name:")}</label>
-                        <div class="field">
-                          <input type="text" class="long" id="course-faculty-1-firstname">
-                        </div>
-                      </div>
-
-                      <div class="row row-col2">
-                        <label for="course-faculty-1-lastname">${_("Faculty Last Name:")}</label>
-                        <div class="field">
-                          <input type="text" class="long" id="course-faculty-1-lastname">
-                        </div>
-                      </div>
-
-                      <div class="row row-col2">
-                        <label for="course-faculty-1-photo">${_("Faculty Photo")}</label>
-                        <div class="field">
-                          <div class="input input-existing">
-                            <div class="current current-faculty-1-photo">
-                              <a href="#" class="remove-item remove-faculty-photo remove-video-data"><span class="delete-icon"></span> ${_("Delete Faculty Photo")}</a>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-
-                      <div class="row">
-                        <label for="course-faculty-1-bio">${_("Faculty Bio:")}</label>
-                        <div class="field">
-                          <textarea class="long tall edit-box tinymce" id="course-faculty-1-bio"></textarea>
-                          <span class="tip tip-stacked">${_("A brief description of your education, experience, and expertise")}</span>
-                        </div>
-                      </div>
-
-                      <a href="#" class="remove-item remove-faculty-data"><span class="delete-icon"></span> ${_("Delete Faculty Member")}</a>
-                    </li>
-
-                    <li class="input multi course-faculty-list-item">
-                      <div class="row row-col2">
-                        <label for="course-faculty-2-firstname">${_("Faculty First Name:")}</label>
-                        <div class="field">
-                          <input type="text" class="long" id="course-faculty-2-firstname">
-                        </div>
-                      </div>
-
-                      <div class="row row-col2">
-                        <label for="course-faculty-2-lastname">${_("Faculty Last Name:")}</label>
-                        <div class="field">
-                          <input type="text" class="long" id="course-faculty-2-lastname">
-                        </div>
-                      </div>
-
-                      <div class="row row-col2">
-                        <label for="course-faculty-2-photo">${_("Faculty Photo")}</label>
-                        <div class="field">
-                          <div class="input">
-                            <a href="#" class="new-item new-faculty-photo add-faculty-photo-data" id="course-faculty-2-photo">
-                              <span class="upload-icon"></span>${_("Upload Faculty Photo")}
-                            </a>
-                            <span class="tip tip-inline">${_("Max size: 30KB")}</span>
-                          </div>
-                        </div>
-                      </div>
-
-                      <div class="row">
-                        <label for="course-faculty-2-bio">${_("Faculty Bio:")}</label>
-                        <div class="field">
-                          <div clas="input">
-                            <textarea class="long tall edit-box tinymce" id="course-faculty-2-bio"></textarea>
-                            <span class="tip tip-stacked">${_("A brief description of your education, experience, and expertise")}</span>
-                          </div>
-                        </div>
-                      </div>
-                    </li>
-                  </ul>
-
-                  <a href="#" class="new-item new-course-faculty-item add-faculty-data">
-                    <span class="plus-icon"></span>${_("New Faculty Member")}
-                  </a>
-                </div>
-              </div>
-            </section>
-
-          </section><!-- .settings-staff -->
-
-          <section class="settings-problems">
-            <h2 class="title">${_("Problems")}</h2>
-
-            <section class="settings-problems-general">
-              <header>
-                <h3>${_("General Settings")}</h3>
-                <span class="detail">${_("Course-wide settings for all problems")}</span>
-              </header>
-
-              <div class="row row-col2">
-                <h4 class="label">${_("Problem Randomization:")}</h4>
-
-                <div class="field">
-                  <div class="input input-radio">
-                    <input checked="checked" type="radio" name="course-problems-general-randomization" id="course-problems-general-randomization-always" value="${_('Always')}">
-
-                    <div class="copy">
-                      <label for="course-problems-general-randomization-always">${_("Always")}</label>
-                      <span class="tip tip-stacked">${_("<strong>randomize all</strong> problems")}</span>
-                  </div>
-                  </div>
-
-                  <div class="input input-radio">
-                    <input type="radio" name="course-problems-general-randomization" id="course-problems-general-randomization-never" value="${_('Never')}">
-
-                    <div class="copy">
-                      <label for="course-problems-general-randomization-never">${_("Never")}</label>
-                      <span class="tip tip-stacked">${_("<strong>do not randomize</strong> problems")}</span>
-                  </div>
-                  </div>
-
-                  <div class="input input-radio">
-                    <input type="radio" name="course-problems-general-randomization" id="course-problems-general-randomization-perstudent" value="${_('Per Student')}">
-
-                    <div class="copy">
-                      <label for="course-problems-general-randomization-perstudent">${_("Per Student")}</label>
-                      <span class="tip tip-stacked">${_("randomize problems <strong>per student</strong>")}</span>
-                  </div>
-                  </div>
-                </div>
-              </div>
-
-              <div class="row row-col2">
-                <h4 class="label">${_("Show Answers:")}</h4>
-
-                <div class="field">
-                  <div class="input input-radio">
-                    <input checked="checked" type="radio" name="course-problems-general-showanswer" id="course-problems-general-showanswer-always" value="${_('Always')}">
-
-                    <div class="copy">
-                      <label for="course-problems-general-showanswer-always">${_("Always")}</label>
-                      <span class="tip tip-stacked">${_("Answers will be shown after the number of attempts has been met")}</span>
-                  </div>
-                  </div>
-
-                  <div class="input input-radio">
-                    <input type="radio" name="course-problems-general-showanswer" id="course-problems-general-showanswer-never" value="${_('Never')}">
-
-                    <div class="copy">
-                      <label for="course-problems-general-showanswer-never">${_("Never")}</label>
-                      <span class="tip tip-stacked">${_("Answers will never be shown, regardless of attempts")}</span>
-                  </div>
-                  </div>
-                </div>
-              </div>
-
-              <div class="row row-col2">
-                <label for="pcourse-roblems-general-attempts">${_("Number of Attempts  <br /> Allowed on Problems:")} </label>
-
-                <div class="field">
-                  <div class="input">
-                    <input type="text" class="short" id="course-problems-general-attempts" placeholder="0 or higher" value="0">
-                    <span class="tip tip-stacked">${_('Students will this have this number of chances to answer a problem. To set infinite atttempts, use "0"')}</span>
-                  </div>
-                </div>
-              </div>
-            </section><!-- .settings-problems-general -->
-
-            <section class="settings-problems-assignment-1 settings-extras">
-              <header>
-                <h3>[${_("Assignment Type Name")}]</h3>
-              </header>
-
-              <div class="row row-col2">
-                <h4 class="label">${_("Problem Randomization:")}</h4>
-
-                <div class="field">
-                  <div class="input input-radio">
-                    <input checked="checked" type="radio" name="course-problems-assignment-1-randomization" id="course-problems-assignment-1-randomization-always" value="${_('Always')}">
-
-                    <div class="copy">
-                      <label for="course-problems-assignment-1-randomization-always">${_("Always")}</label>
-                      <span class="tip tip-stacked">${_("<strong>randomize all</strong> problems")}</span>
-                  </div>
-                  </div>
-
-                  <div class="input input-radio">
-                    <input type="radio" name="course-problems-assignment-1-randomization" id="course-problems-assignment-1-randomization-never" value="${_('Never')}">
-
-                    <div class="copy">
-                      <label for="course-problems-assignment-1-randomization-never">${_("Never")}</label>
-                      <span class="tip tip-stacked">${_("<strong>do not randomize</strong> problems")}</span>
-                  </div>
-                </div>
-
-                  <div class="input input-radio">
-                    <input type="radio" name="course-problems-assignment-1-randomization" id="course-problems-assignment-1-randomization-perstudent" value="${_('Per Student')}">
-
-                    <div class="copy">
-                      <label for="course-problems-assignment-1-randomization-perstudent">${_("Per Student")}</label>
-                      <span class="tip tip-stacked">${_("randomize problems <strong>per student</strong>")}</span>
-                  </div>
-                  </div>
-                </div>
-              </div>
-
-              <div class="row row-col2">
-                <h4 class="label">${_("Show Answers:")}</h4>
-
-                <div class="field">
-                  <div class="input input-radio">
-                    <input checked="checked" type="radio" name="course-problems-assignment-1-showanswer" id="course-problems-assignment-1-showanswer-always" value="${_('Always')}">
-
-                    <div class="copy">
-                      <label for="course-problems-assignment-1-showanswer-always">${_("Always")}</label>
-                      <span class="tip tip-stacked">${_("Answers will be shown after the number of attempts has been met")}</span>
-                  </div>
-                </div>
-
-                  <div class="input input-radio">
-                    <input type="radio" name="course-problems-assignment-1-showanswer" id="course-problems-assignment-1-showanswer-never" value="${_('Never')}">
-
-                    <div class="copy">
-                      <label for="pcourse-roblems-assignment-1-showanswer-never">${_("Never")}</label>
-                      <span class="tip tip-stacked">${_("Answers will never be shown, regardless of attempts")}</span>
-                  </div>
-                  </div>
-                </div>
-              </div>
-
-              <div class="row row-col2">
-                <label for="course-problems-assignment-1-attempts">${_("Number of Attempts <br /> Allowed on Problems: ")}</label>
-
-                <div class="field">
-                  <div class="input">
-                    <input type="text" class="short" id="course-problems-assignment-1-attempts" placeholder="${_('0 or higher')}" value="0">
-                    <span class="tip tip-stacked">${_('Students will this have this number of chances to answer a problem. To set infinite atttempts, use "0"')}</span>
-                  </div>
-                </div>
-              </div>
-            </section><!-- .settings-problems-assignment-1 -->
-          </section><!-- .settings-problems -->
-
-          <section class="settings-discussions">
-            <h2 class="title">${_("Discussions")}</h2>
-
-            <section class="settings-discussions-general">
-              <header>
-                <h3>${_("General Settings")}</h3>
-                <span class="detail">${_("Course-wide settings for online discussion")}</span>
-              </header>
-
-              <div class="row row-col2">
-                <h4 class="label">${_("Anonymous Discussions:")}</h4>
-
-                <div class="field">
-                  <div class="input input-radio">
-                    <input type="radio" name="course-discussions-anonymous" id="course-discussions-anonymous-allow" value="${_('Allow')}">
-
-                    <div class="copy">
-                      <label for="course-discussions-anonymous-allow">${_("Allow")}</label>
-                      <span class="tip tip-stacked">${_("Students and faculty <strong>will be able to post anonymously</strong>")}</span>
-                  </div>
-                  </div>
-
-                  <div class="input input-radio">
-                    <input checked="checked" type="radio" name="course-discussions-anonymous" id="course-discussions-anonymous-dontallow" value="${_('Do Not Allow')}">
-
-                    <div class="copy">
-                      <label for="course-discussions-anonymous-dontallow">${_("Do not allow")}</label>
-                      <span class="tip tip-stacked">${_("<strong>Posting anonymously is not allowed</strong>. Any previous anonymous posts <strong>will be reverted to non-anonymous</strong>")}</span>
-                  </div>
-                </div>
-                </div>
-              </div>
-
-              <div class="row row-col2">
-                <h4 class="label">${_("Anonymous Discussions:")}</h4>
-
-                <div class="field">
-                  <div class="input input-radio">
-                    <input checked="checked" type="radio" name="course-discussions-anonymous" id="course-discussions-anonymous-allow" value="${_('Allow')}">
-
-                    <div class="copy">
-                      <label for="course-discussions-anonymous-allow">${_("Allow")}</label>
-                      <span class="tip tip-stacked">${_("Students and faculty <strong>will be able to post anonymously</strong>")}</span>
-                    </div>
-                  </div>
-
-                  <div class="input input-radio">
-                    <input disabled="disabled" type="radio" name="course-discussions-anonymous" id="course-discussions-anonymous-dontallow" value="${_('Do Not Allow')}">
-
-                    <div class="copy">
-                      <label for="course-discussions-anonymous-dontallow">${_("Do not allow")}</label>
-                      <span class="tip tip-stacked">${_("This option is disabled since there are previous discussions that are anonymous.")}</span>
-                    </div>
-                  </div>
-                </div>
-              </div>
-
-              <div class="row row-col2">
-                <h4 class="label">${_("Discussion Categories")}</h4>
-
-                <div class="field enum">
-                  <ul class="input-list course-discussions-categories-list sortable">
-                    <li class="input input-existing input-default course-discussions-categories-list-item sortable-item">
-                      <div class="group">
-                        <label for="course-discussions-categories-1-name">${_("Category Name:")} </label>
-                        <input type="text" class="course-discussions-categories-name" id="course-discussions-categories-1-name" placeholder="" value="${_('General')}" disabled="disabled">
-                      </div>
-
-                      <a href="#" class="drag-handle"></a>
-                    </li>
-
-                    <li class="input input-existing input-default course-discussions-categories-list-item sortable-item">
-                      <div class="group">
-                        <label for="course-discussions-categories-2-name">${_("Category Name:")} </label>
-                        <input type="text" class="course-discussions-categories-name" id="course-discussions-categories-2-name" placeholder="" value="Feedback" disabled="disabled">
-                      </div>
-
-                      <a href="#" class="drag-handle"></a>
-                    </li>
-
-                    <li class="input input-existing input-default course-discussions-categories-list-item sortable-item">
-                      <div class="group">
-                        <label for="course-discussions-categories-3-name">${_("Category Name:")} </label>
-                        <input type="text" class="course-discussions-categories-name" id="course-discussions-categories-3-name" placeholder="" value="${_('Troubleshooting')}" disabled="disabled">
-                      </div>
-
-                      <a href="#" class="drag-handle"></a>
-                    </li>
-
-                    <li class="input input-existing course-discussions-categories-list-item sortable-item">
-                      <div class="group">
-                        <label for="course-discussions-categories-4-name">${_("Category Name:")} </label>
-                        <input type="text" class="course-discussions-categories-name" id="course-discussions-categories-4-name" placeholder="" value="${_('Study Groups')}">
-
-                        <a href="#" class="remove-item remove-course-discussions-categories-data"><span class="delete-icon"></span> ${_("Delete Category")}</a>
-                      </div>
-
-                      <a href="#" class="drag-handle"></a>
-                    </li>
-
-                    <li class="input input-existing course-discussions-categories-list-item sortable-item">
-                      <div class="group">
-                        <label for="course-discussions-categories-5-name">${_("Category Name:")} </label>
-                        <input type="text" class="course-discussions-categories-name" id="course-discussions-categories-5-name" placeholder="" value="${_('Lectures')}">
-                      </div>
-
-                      <a href="#" class="remove-item remove-course-discussions-categories-data"><span class="delete-icon"></span> ${_("Delete Category")}</a>
-
-                      <a href="#" class="drag-handle"></a>
-                    </li>
-
-                    <li class="input input-existing course-discussions-categories-list-item sortable-item">
-                      <div class="group">
-                        <label for="course-discussions-categories-6-name">${_("Category Name:")} </label>
-                        <input type="text" class="course-discussions-categories-name" id="course-discussions-categories-6-name" placeholder="" value="${_('Labs')}">
-                      </div>
-
-                      <a href="#" class="remove-item remove-course-discussions-categories-data"><span class="delete-icon"></span> ${_("Delete Category")}</a>
-
-                      <a href="#" class="drag-handle"></a>
-                    </li>
-
-                    <li class="input input-existing course-discussions-categories-list-item sortable-item">
-                      <div class="group">
-                        <label for="course-discussions-categories-6-name">${_("Category Name:")} </label>
-                        <input type="text" class="course-discussions-categories-name" id="course-discussions-categories-6-name" placeholder="" value="">
-                      </div>
-
-                      <a href="#" class="remove-item remove-course-discussions-categories-data"><span class="delete-icon"></span> ${_("Delete Category")}</a>
-
-                      <a href="#" class="drag-handle"></a>
-                    </li>
-                  </ul>
-
-                  <a href="#" class="new-item new-course-discussions-categories-item add-categories-data">
-                    <span class="plus-icon"></span>${_("New Discussion Category")}
-                  </a>
-                </div>
-              </div>
-            </section><!-- .settings-discussions-general -->
-          </section><!-- .settings-discussions -->
-        </div>
-      </article>
-    </div>
-  </div>
-  <footer></footer>
-</%block>
diff --git a/cms/templates/static-pages.html b/cms/templates/static-pages.html
deleted file mode 100644
index 4086f55e09..0000000000
--- a/cms/templates/static-pages.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<%! from django.utils.translation import ugettext as _ %>
-<%inherit file="base.html" />
-<%! from django.core.urlresolvers import reverse %>
-<%block name="title">${_("Static Pages")}</%block>
-<%block name="bodyclass">view-static-pages</%block>
-
-<%block name="content">
-<div class="main-wrapper">
-  <div class="inner-wrapper">
-    <h1>Static Pages</h1>
-    <div class="page-actions">
-
-    </div>
-    <article class="static-page-overview">
-    <a href="#" class="new-static-page-button wip-box"><span class="plus-icon"></span> ${_("New Static Page")}</a>
-      <ul class="static-page-list">
-        <li class="static-page-item">
-          <a href="#" class="page-name">${_("Course Info")}</a>
-          <div class="item-actions">
-            <a href="#" class="edit-button wip"><span class="delete-icon"></span></a>
-            <a href="#" class="drag-handle wip"></a>
-          </div>
-        </li>
-        <li class="static-page-item">
-          <a href="#" class="page-name">${_("Textbook")}</a>
-          <div class="item-actions">
-            <a href="#" class="edit-button wip"><span class="delete-icon"></span></a>
-            <a href="#" class="drag-handle wip"></a>
-          </div>
-        </li>
-        <li class="static-page-item">
-          <a href="#" class="page-name">${_("Syllabus")}</a>
-          <div class="item-actions">
-            <a href="#" class="edit-button wip"><span class="delete-icon"></span></a>
-            <a href="#" class="drag-handle wip"></a>
-          </div>
-        </li>
-      </ul>
-    </article>
-  </div>
-</div>
-</%block>
diff --git a/cms/templates/widgets/_ui-dnd-indicator-after.html b/cms/templates/widgets/_ui-dnd-indicator-after.html
new file mode 100644
index 0000000000..256e7926ff
--- /dev/null
+++ b/cms/templates/widgets/_ui-dnd-indicator-after.html
@@ -0,0 +1 @@
+<span class="draggable-drop-indicator draggable-drop-indicator-after"><i class="icon-caret-right"></i></span>
diff --git a/cms/templates/widgets/_ui-dnd-indicator-before.html b/cms/templates/widgets/_ui-dnd-indicator-before.html
new file mode 100644
index 0000000000..e76f19c043
--- /dev/null
+++ b/cms/templates/widgets/_ui-dnd-indicator-before.html
@@ -0,0 +1 @@
+<span class="draggable-drop-indicator draggable-drop-indicator-before"><i class="icon-caret-right"></i></span>
diff --git a/cms/templates/widgets/_ui-dnd-indicator-initial.html b/cms/templates/widgets/_ui-dnd-indicator-initial.html
new file mode 100644
index 0000000000..5ab8fddfe2
--- /dev/null
+++ b/cms/templates/widgets/_ui-dnd-indicator-initial.html
@@ -0,0 +1 @@
+<span class="draggable-drop-indicator draggable-drop-indicator-initial"><i class="icon-caret-right"></i></span>
diff --git a/cms/templates/widgets/source-edit.html b/cms/templates/widgets/source-edit.html
index 6797fd224f..2475d03873 100644
--- a/cms/templates/widgets/source-edit.html
+++ b/cms/templates/widgets/source-edit.html
@@ -28,7 +28,7 @@
   </section>
 
   <script type = "text/javascript">
-require(["jquery", "codemirror/stex"], function($) {
+require(["jquery", "jquery.leanModal", "codemirror/stex"], function($) {
   hlstrig = $('#hls-trig-${hlskey}');
   hlsmodal = $('#hls-modal-${hlskey}');
 
diff --git a/cms/templates/widgets/units.html b/cms/templates/widgets/units.html
index 4e971736f7..c4409b92b6 100644
--- a/cms/templates/widgets/units.html
+++ b/cms/templates/widgets/units.html
@@ -5,13 +5,16 @@
 This def will enumerate through a passed in subsection and list all of the units
 -->
 <%def name="enum_units(subsection, actions=True, selected=None, sortable=True, subsection_units=None)">
-<ol ${'class="sortable-unit-list"' if sortable else ''} data-subsection-id="${subsection.location}">
+<ol ${'class="sortable-unit-list"' if sortable else ''}>
   <%
     if subsection_units is None:
       subsection_units = subsection.get_children()
   %>
   % for unit in subsection_units:
-  <li class="leaf unit" data-id="${unit.location}">
+  <li class="courseware-unit leaf unit is-draggable" data-id="${unit.location}" data-parent-id="${subsection.location.url()}">
+
+    <%include file="_ui-dnd-indicator-before.html" />
+
     <%
       unit_state = compute_unit_state(unit)
       if unit.location == selected:
@@ -27,13 +30,17 @@ This def will enumerate through a passed in subsection and list all of the units
       % if actions:
       <div class="item-actions">
 	<a href="#" data-tooltip="Delete this unit" class="delete-button" data-id="${unit.location}"><span class="delete-icon"></span></a>
-	<a href="#" data-tooltip="Drag to sort" class="drag-handle"></a>
+	<span data-tooltip="Drag to sort" class="drag-handle unit-drag-handle"></span>
       </div>
       % endif
     </div>
+
+    <%include file="_ui-dnd-indicator-after.html" />
   </li>
   % endfor
   <li>
+    <%include file="_ui-dnd-indicator-initial.html" />
+
     <a href="#" class="new-unit-item" data-category="${new_unit_category}" data-parent="${subsection.location}">
       <span class="new-unit-icon"></span>New Unit
     </a>
diff --git a/cms/urls.py b/cms/urls.py
index 43358e5f35..b465b07f32 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -70,9 +70,6 @@ urlpatterns = ('',  # nopep8
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/(?P<category>[^/]+)/(?P<name>[^/]+)/gradeas.*$',
         'contentstore.views.assignment_type_update', name='assignment_type_update'),
 
-    url(r'^pages/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$',
-        'contentstore.views.static_pages',
-        name='static_pages'),
     url(r'^edit_tabs/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$',
         'contentstore.views.edit_tabs', name='edit_tabs'),
 
diff --git a/common/djangoapps/service_status/test.py b/common/djangoapps/service_status/test.py
index 1c4f10497e..4fe53aaa79 100644
--- a/common/djangoapps/service_status/test.py
+++ b/common/djangoapps/service_status/test.py
@@ -42,6 +42,6 @@ class CeleryConfigTest(unittest.TestCase):
 
         # We don't know the other dict values exactly,
         # but we can assert that they take the right form
-        self.assertTrue(isinstance(result_dict['task_id'], unicode))
-        self.assertTrue(isinstance(result_dict['time'], float))
+        self.assertIsInstance(result_dict['task_id'], unicode)
+        self.assertIsInstance(result_dict['time'], float)
         self.assertTrue(result_dict['time'] > 0.0)
diff --git a/common/djangoapps/terrain/course_helpers.py b/common/djangoapps/terrain/course_helpers.py
index 1d41e880ea..40c89b1087 100644
--- a/common/djangoapps/terrain/course_helpers.py
+++ b/common/djangoapps/terrain/course_helpers.py
@@ -2,7 +2,7 @@
 # pylint: disable=W0621
 
 from lettuce import world
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Group
 from student.models import CourseEnrollment
 from xmodule.modulestore.django import editable_modulestore
 from xmodule.contentstore.django import contentstore
@@ -50,6 +50,21 @@ def register_by_course_id(course_id, username='robot', password='test', is_staff
     CourseEnrollment.enroll(user, course_id)
 
 
+@world.absorb
+def add_to_course_staff(username, course_num):
+    """
+    Add the user with `username` to the course staff group
+    for `course_num`.
+    """
+    # Based on code in lms/djangoapps/courseware/access.py
+    group_name = "instructor_{}".format(course_num)
+    group, _ = Group.objects.get_or_create(name=group_name)
+    group.save()
+
+    user = User.objects.get(username=username)
+    user.groups.add(group)
+
+
 @world.absorb
 def clear_courses():
     # Flush and initialize the module store
diff --git a/common/djangoapps/terrain/steps.py b/common/djangoapps/terrain/steps.py
index f9e9d93fc2..86f0419849 100644
--- a/common/djangoapps/terrain/steps.py
+++ b/common/djangoapps/terrain/steps.py
@@ -11,7 +11,6 @@
 # Disable the "unused argument" warning because lettuce uses "step"
 #pylint: disable=W0613
 
-import re
 from lettuce import world, step
 from .course_helpers import *
 from .ui_helpers import *
@@ -23,32 +22,15 @@ logger = getLogger(__name__)
 
 
 @step(r'I wait (?:for )?"(\d+\.?\d*)" seconds?$')
-def wait(step, seconds):
+def wait_for_seconds(step, seconds):
     world.wait(seconds)
 
-REQUIREJS_WAIT = {
-    re.compile('settings-details'): [
-        "jquery", "js/models/course",
-        "js/models/settings/course_details", "js/views/settings/main"],
-    re.compile('settings-advanced'): [
-        "jquery", "js/models/course", "js/models/settings/advanced",
-        "js/views/settings/advanced", "codemirror"],
-    re.compile('edit\/.+vertical'): [
-        "jquery", "js/models/course", "coffee/src/models/module",
-        "coffee/src/views/unit", "jquery.ui"],
-}
-
 
 @step('I reload the page$')
 def reload_the_page(step):
     world.wait_for_ajax_complete()
     world.browser.reload()
-    requirements = None
-    for test, req in REQUIREJS_WAIT.items():
-        if test.search(world.browser.url):
-            requirements = req
-            break
-    world.wait_for_requirejs(requirements)
+    world.wait_for_js_to_load()
 
 
 @step('I press the browser back button$')
@@ -163,9 +145,9 @@ def should_see_in_the_page(step, doesnt_appear, text):
     else:
         multiplier = 1
     if doesnt_appear:
-        assert world.browser.is_text_not_present(text, wait_time=5*multiplier)
+        assert world.browser.is_text_not_present(text, wait_time=5 * multiplier)
     else:
-        assert world.browser.is_text_present(text, wait_time=5*multiplier)
+        assert world.browser.is_text_present(text, wait_time=5 * multiplier)
 
 
 @step('I am logged in$')
diff --git a/common/djangoapps/terrain/ui_helpers.py b/common/djangoapps/terrain/ui_helpers.py
index 5189bf82cb..be52c4bd3d 100644
--- a/common/djangoapps/terrain/ui_helpers.py
+++ b/common/djangoapps/terrain/ui_helpers.py
@@ -4,11 +4,13 @@
 from lettuce import world
 import time
 import json
+import re
 import platform
 from textwrap import dedent
 from urllib import quote_plus
 from selenium.common.exceptions import (
-    WebDriverException, TimeoutException, StaleElementReferenceException)
+    WebDriverException, TimeoutException,
+    StaleElementReferenceException)
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
@@ -16,11 +18,50 @@ from lettuce.django import django_url
 from nose.tools import assert_true  # pylint: disable=E0611
 
 
+REQUIREJS_WAIT = {
+    # Settings - Schedule & Details
+    re.compile('^Schedule & Details Settings \|'): [
+        "jquery", "js/models/course",
+        "js/models/settings/course_details", "js/views/settings/main"],
+
+    # Settings - Advanced Settings
+    re.compile('^Advanced Settings \|'): [
+        "jquery", "js/models/course", "js/models/settings/advanced",
+        "js/views/settings/advanced", "codemirror"],
+
+    # Individual Unit (editing)
+    re.compile('^Individual Unit \|'): [
+        "coffee/src/models/module", "coffee/src/views/unit",
+        "coffee/src/views/module_edit"],
+
+    # Content - Outline
+    # Note that calling your org, course number, or display name, 'course' will mess this up
+    re.compile('^Course Outline \|'): [
+        "js/models/course", "js/models/location", "js/models/section",
+        "js/views/overview", "js/views/section_edit"],
+
+    # Dashboard
+    re.compile('^My Courses \|'): [
+        "js/sock", "gettext", "js/base",
+        "jquery.ui", "coffee/src/main", "underscore"],
+}
+
+
 @world.absorb
 def wait(seconds):
     time.sleep(float(seconds))
 
 
+@world.absorb
+def wait_for_js_to_load():
+    requirements = None
+    for test, req in REQUIREJS_WAIT.items():
+        if test.search(world.browser.title):
+            requirements = req
+            break
+    world.wait_for_requirejs(requirements)
+
+
 # Selenium's `execute_async_script` function pauses Selenium's execution
 # until the browser calls a specific Javascript callback; in effect,
 # Selenium goes to sleep until the JS callback function wakes it back up again.
@@ -28,8 +69,6 @@ def wait(seconds):
 # passed to this callback get returned from the `execute_async_script`
 # function, which allows the JS to communicate information back to Python.
 # Ref: https://selenium.googlecode.com/svn/trunk/docs/api/dotnet/html/M_OpenQA_Selenium_IJavaScriptExecutor_ExecuteAsyncScript.htm
-
-
 @world.absorb
 def wait_for_js_variable_truthy(variable):
     """
@@ -37,7 +76,7 @@ def wait_for_js_variable_truthy(variable):
     environment until the given variable is defined and truthy. This process
     guards against page reloads, and seamlessly retries on the next page.
     """
-    js = """
+    javascript = """
         var callback = arguments[arguments.length - 1];
         var unloadHandler = function() {{
           callback("unload");
@@ -56,7 +95,13 @@ def wait_for_js_variable_truthy(variable):
         }}, 10);
     """.format(variable=variable)
     for _ in range(5):  # 5 attempts max
-        result = world.browser.driver.execute_async_script(dedent(js))
+        try:
+            result = world.browser.driver.execute_async_script(dedent(javascript))
+        except WebDriverException as wde:
+            if "document unloaded while waiting for result" in wde.msg:
+                result = "unload"
+            else:
+                raise
         if result == "unload":
             # we ran this on the wrong page. Wait a bit, and try again, when the
             # browser has loaded the next page.
@@ -105,7 +150,7 @@ def wait_for_requirejs(dependencies=None):
     if dependencies[0] != "jquery":
         dependencies.insert(0, "jquery")
 
-    js = """
+    javascript = """
         var callback = arguments[arguments.length - 1];
         if(window.require) {{
           requirejs.onError = callback;
@@ -126,19 +171,33 @@ def wait_for_requirejs(dependencies=None):
         }}
     """.format(deps=json.dumps(dependencies))
     for _ in range(5):  # 5 attempts max
-        result = world.browser.driver.execute_async_script(dedent(js))
+        try:
+            result = world.browser.driver.execute_async_script(dedent(javascript))
+        except WebDriverException as wde:
+            if "document unloaded while waiting for result" in wde.msg:
+                result = "unload"
+            else:
+                raise
         if result == "unload":
             # we ran this on the wrong page. Wait a bit, and try again, when the
             # browser has loaded the next page.
             world.wait(1)
             continue
         elif result not in (None, True, False):
-            # we got a require.js error
-            msg = "Error loading dependencies: type={0} modules={1}".format(
-                result['requireType'], result['requireModules'])
-            err = RequireJSError(msg)
-            err.error = result
-            raise err
+            # We got a require.js error
+            # Sometimes requireJS will throw an error with requireType=require
+            # This doesn't seem to cause problems on the page, so we ignore it
+            if result['requireType'] == 'require':
+                world.wait(1)
+                continue
+
+            # Otherwise, fail and report the error
+            else:
+                msg = "Error loading dependencies: type={0} modules={1}".format(
+                    result['requireType'], result['requireModules'])
+                err = RequireJSError(msg)
+                err.error = result
+                raise err
         else:
             return result
 
@@ -153,7 +212,7 @@ def wait_for_ajax_complete():
     keeps track of this information, go here:
     http://stackoverflow.com/questions/3148225/jquery-active-function#3148506
     """
-    js = """
+    javascript = """
         var callback = arguments[arguments.length - 1];
         if(!window.jQuery) {callback(false);}
         var intervalID = setInterval(function() {
@@ -163,13 +222,13 @@ def wait_for_ajax_complete():
           }
         }, 100);
     """
-    world.browser.driver.execute_async_script(dedent(js))
+    world.browser.driver.execute_async_script(dedent(javascript))
 
 
 @world.absorb
 def visit(url):
     world.browser.visit(django_url(url))
-    wait_for_requirejs()
+    wait_for_js_to_load()
 
 
 @world.absorb
@@ -238,11 +297,11 @@ def css_has_value(css_selector, value, index=0):
 
 @world.absorb
 def wait_for(func, timeout=5):
-        WebDriverWait(
-            driver=world.browser.driver,
-            timeout=timeout,
-            ignored_exceptions=(StaleElementReferenceException)
-        ).until(func)
+    WebDriverWait(
+        driver=world.browser.driver,
+        timeout=timeout,
+        ignored_exceptions=(StaleElementReferenceException)
+    ).until(func)
 
 
 @world.absorb
@@ -336,17 +395,15 @@ def css_click(css_selector, index=0, wait_time=30):
     This method will return True if the click worked.
     """
     wait_for_clickable(css_selector, timeout=wait_time)
-    assert_true(world.css_find(css_selector)[index].visible,
-                msg="Element {}[{}] is present but not visible".format(css_selector, index))
+    assert_true(
+        world.css_visible(css_selector, index=index),
+        msg="Element {}[{}] is present but not visible".format(css_selector, index)
+    )
 
-    # Sometimes you can't click in the center of the element, as
-    # another element might be on top of it. In this case, try
-    # clicking in the upper left corner.
-    try:
-        return retry_on_exception(lambda: world.css_find(css_selector)[index].click())
-
-    except WebDriverException:
-        return css_click_at(css_selector, index=index)
+    result = retry_on_exception(lambda: world.css_find(css_selector)[index].click())
+    if result:
+        wait_for_js_to_load()
+    return result
 
 
 @world.absorb
@@ -361,22 +418,6 @@ def css_check(css_selector, index=0, wait_time=30):
     return css_click(css_selector=css_selector, index=index, wait_time=wait_time)
 
 
-@world.absorb
-def css_click_at(css_selector, index=0, x_coord=10, y_coord=10, timeout=5):
-    '''
-    A method to click at x,y coordinates of the element
-    rather than in the center of the element
-    '''
-    wait_for_clickable(css_selector, timeout=timeout)
-    element = css_find(css_selector)[index]
-    assert_true(element.visible,
-                msg="Element {}[{}] is present but not visible".format(css_selector, index))
-
-    element.action_chains.move_to_element_with_offset(element._element, x_coord, y_coord)
-    element.action_chains.click()
-    element.action_chains.perform()
-
-
 @world.absorb
 def select_option(name, value, index=0, wait_time=30):
     '''
@@ -406,6 +447,7 @@ def css_fill(css_selector, text, index=0):
 @world.absorb
 def click_link(partial_text, index=0):
     retry_on_exception(lambda: world.browser.find_link_by_partial_text(partial_text)[index].click())
+    wait_for_js_to_load()
 
 
 @world.absorb
@@ -512,7 +554,6 @@ def retry_on_exception(func, max_attempts=5, ignored_exceptions=StaleElementRefe
     while attempt < max_attempts:
         try:
             return func()
-            break
         except ignored_exceptions:
             world.wait(1)
             attempt += 1
diff --git a/common/djangoapps/track/backends/mongodb.py b/common/djangoapps/track/backends/mongodb.py
index 79d0505edd..1196735889 100644
--- a/common/djangoapps/track/backends/mongodb.py
+++ b/common/djangoapps/track/backends/mongodb.py
@@ -11,7 +11,7 @@ from pymongo.errors import PyMongoError
 from track.backends import BaseBackend
 
 
-log = logging.getLogger('track.backends.mongodb')
+log = logging.getLogger(__name__)
 
 
 class MongoBackend(BaseBackend):
@@ -64,14 +64,17 @@ class MongoBackend(BaseBackend):
             **extra
         )
 
-        self.collection = self.connection[db_name][collection_name]
+        database = self.connection[db_name]
 
         if user or password:
-            self.collection.database.authenticate(user, password)
+            database.authenticate(user, password)
+
+        self.collection = database[collection_name]
 
         self._create_indexes()
 
     def _create_indexes(self):
+        """Ensures the proper fields are indexed"""
         # WARNING: The collection will be locked during the index
         # creation. If the collection has a large number of
         # documents in it, the operation can take a long time.
@@ -83,8 +86,12 @@ class MongoBackend(BaseBackend):
         self.collection.ensure_index('event_type')
 
     def send(self, event):
+        """Insert the event in to the Mongo collection"""
         try:
             self.collection.insert(event, manipulate=False)
         except PyMongoError:
+            # The event will be lost in case of a connection error.
+            # pymongo will re-connect/re-authenticate automatically
+            # during the next event.
             msg = 'Error inserting to MongoDB event tracker backend'
             log.exception(msg)
diff --git a/common/djangoapps/xmodule_modifiers.py b/common/djangoapps/xmodule_modifiers.py
index 568dfbc260..b6d9ffe5a1 100644
--- a/common/djangoapps/xmodule_modifiers.py
+++ b/common/djangoapps/xmodule_modifiers.py
@@ -134,7 +134,7 @@ def add_histogram(user, block, view, frag, context):  # pylint: disable=unused-a
         return frag
 
     block_id = block.id
-    if block.descriptor.has_score:
+    if block.has_score:
         histogram = grade_histogram(block_id)
         render_histogram = len(histogram) > 0
     else:
@@ -142,7 +142,7 @@ def add_histogram(user, block, view, frag, context):  # pylint: disable=unused-a
         render_histogram = False
 
     if settings.MITX_FEATURES.get('ENABLE_LMS_MIGRATION'):
-        [filepath, filename] = getattr(block.descriptor, 'xml_attributes', {}).get('filename', ['', None])
+        [filepath, filename] = getattr(block, 'xml_attributes', {}).get('filename', ['', None])
         osfs = block.system.filestore
         if filename is not None and osfs.exists(filename):
             # if original, unmangled filename exists then use it (github
@@ -163,13 +163,13 @@ def add_histogram(user, block, view, frag, context):  # pylint: disable=unused-a
     # TODO (ichuang): use _has_access_descriptor.can_load in lms.courseware.access, instead of now>mstart comparison here
     now = datetime.datetime.now(UTC())
     is_released = "unknown"
-    mstart = block.descriptor.start
+    mstart = block.start
 
     if mstart is not None:
         is_released = "<font color='red'>Yes!</font>" if (now > mstart) else "<font color='green'>Not yet</font>"
 
     staff_context = {'fields': [(name, field.read_from(block)) for name, field in block.fields.items()],
-                     'xml_attributes': getattr(block.descriptor, 'xml_attributes', {}),
+                     'xml_attributes': getattr(block, 'xml_attributes', {}),
                      'location': block.location,
                      'xqa_key': block.xqa_key,
                      'source_file': source_file,
diff --git a/common/lib/capa/capa/templates/drag_and_drop_input.html b/common/lib/capa/capa/templates/drag_and_drop_input.html
index 4c2fe50e86..8b8feb993c 100644
--- a/common/lib/capa/capa/templates/drag_and_drop_input.html
+++ b/common/lib/capa/capa/templates/drag_and_drop_input.html
@@ -6,7 +6,7 @@
     <div class="drag_and_drop_problem_json" id="drag_and_drop_json_${id}"
         style="display:none;">${drag_and_drop_json}</div>
 
-    <div class="script_placeholder" data-src="/static/js/capa/drag_and_drop.js"></div>
+    <div class="script_placeholder" data-src="${STATIC_URL}js/capa/drag_and_drop.js"></div>
 
     % if status == 'unsubmitted':
         <div class="unanswered" id="status_${id}">
diff --git a/common/lib/capa/capa/tests/test_inputtypes.py b/common/lib/capa/capa/tests/test_inputtypes.py
index d131aed020..626ed52d8c 100644
--- a/common/lib/capa/capa/tests/test_inputtypes.py
+++ b/common/lib/capa/capa/tests/test_inputtypes.py
@@ -951,7 +951,7 @@ class DragAndDropTest(unittest.TestCase):
     '''
 
     def test_rendering(self):
-        path_to_images = '/static/images/'
+        path_to_images = '/dummy-static/images/'
 
         xml_str = """
         <drag_and_drop_input id="prob_1_2" img="{path}about_1.png" target_outline="false">
@@ -978,15 +978,15 @@ class DragAndDropTest(unittest.TestCase):
 
         user_input = {  # order matters, for string comparison
                         "target_outline": "false",
-                        "base_image": "/static/images/about_1.png",
+                        "base_image": "/dummy-static/images/about_1.png",
                         "draggables": [
 {"can_reuse": "", "label": "Label 1", "id": "1", "icon": "", "target_fields": []},
-{"can_reuse": "", "label": "cc", "id": "name_with_icon", "icon": "/static/images/cc.jpg", "target_fields": []},
-{"can_reuse": "", "label": "arrow-left", "id": "with_icon", "icon": "/static/images/arrow-left.png", "can_reuse": "", "target_fields": []},
+{"can_reuse": "", "label": "cc", "id": "name_with_icon", "icon": "/dummy-static/images/cc.jpg", "target_fields": []},
+{"can_reuse": "", "label": "arrow-left", "id": "with_icon", "icon": "/dummy-static/images/arrow-left.png", "can_reuse": "", "target_fields": []},
 {"can_reuse": "", "label": "Label2", "id": "5", "icon": "", "can_reuse": "", "target_fields": []},
-{"can_reuse": "", "label": "Mute", "id": "2", "icon": "/static/images/mute.png", "can_reuse": "", "target_fields": []},
-{"can_reuse": "", "label": "spinner", "id": "name_label_icon3", "icon": "/static/images/spinner.gif", "can_reuse": "", "target_fields": []},
-{"can_reuse": "", "label": "Star", "id": "name4", "icon": "/static/images/volume.png", "can_reuse": "", "target_fields": []},
+{"can_reuse": "", "label": "Mute", "id": "2", "icon": "/dummy-static/images/mute.png", "can_reuse": "", "target_fields": []},
+{"can_reuse": "", "label": "spinner", "id": "name_label_icon3", "icon": "/dummy-static/images/spinner.gif", "can_reuse": "", "target_fields": []},
+{"can_reuse": "", "label": "Star", "id": "name4", "icon": "/dummy-static/images/volume.png", "can_reuse": "", "target_fields": []},
 {"can_reuse": "", "label": "Label3", "id": "7", "icon": "", "can_reuse": "", "target_fields": []}],
                         "one_per_target": "True",
                         "targets": [
diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 6ffbf7bd06..0034e9d899 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -15,7 +15,7 @@ from capa.responsetypes import StudentInputError, \
     ResponseError, LoncapaProblemError
 from capa.util import convert_files_to_filenames
 from .progress import Progress
-from xmodule.x_module import XModule
+from xmodule.x_module import XModule, module_attr
 from xmodule.raw_module import RawDescriptor
 from xmodule.exceptions import NotFoundError, ProcessingError
 from xblock.fields import Scope, String, Boolean, Dict, Integer, Float
@@ -884,6 +884,8 @@ class CapaModule(CapaFields, XModule):
             'max_value': score['total'],
         })
 
+        return {'grade': score['score'], 'max_grade': score['total']}
+
     def check_problem(self, data):
         """
         Checks whether answers to a problem are correct
@@ -951,7 +953,7 @@ class CapaModule(CapaFields, XModule):
                 return {'success': msg}
             raise
 
-        self.publish_grade()
+        published_grade = self.publish_grade()
 
         # success = correct if ALL questions in this problem are correct
         success = 'correct'
@@ -961,6 +963,8 @@ class CapaModule(CapaFields, XModule):
 
         # NOTE: We are logging both full grading and queued-grading submissions. In the latter,
         #       'success' will always be incorrect
+        event_info['grade'] = published_grade['grade']
+        event_info['max_grade'] = published_grade['max_grade']
         event_info['correct_map'] = correct_map.get_dict()
         event_info['success'] = success
         event_info['attempts'] = self.attempts
@@ -1193,3 +1197,33 @@ class CapaDescriptor(CapaFields, RawDescriptor):
                                     CapaDescriptor.force_save_button, CapaDescriptor.markdown,
                                     CapaDescriptor.text_customization])
         return non_editable_fields
+
+    # Proxy to CapaModule for access to any of its attributes
+    answer_available = module_attr('answer_available')
+    check_button_name = module_attr('check_button_name')
+    check_problem = module_attr('check_problem')
+    choose_new_seed = module_attr('choose_new_seed')
+    closed = module_attr('closed')
+    get_answer = module_attr('get_answer')
+    get_problem = module_attr('get_problem')
+    get_problem_html = module_attr('get_problem_html')
+    get_state_for_lcp = module_attr('get_state_for_lcp')
+    handle_input_ajax = module_attr('handle_input_ajax')
+    handle_problem_html_error = module_attr('handle_problem_html_error')
+    handle_ungraded_response = module_attr('handle_ungraded_response')
+    is_attempted = module_attr('is_attempted')
+    is_correct = module_attr('is_correct')
+    is_past_due = module_attr('is_past_due')
+    is_submitted = module_attr('is_submitted')
+    lcp = module_attr('lcp')
+    make_dict_of_responses = module_attr('make_dict_of_responses')
+    new_lcp = module_attr('new_lcp')
+    publish_grade = module_attr('publish_grade')
+    rescore_problem = module_attr('rescore_problem')
+    reset_problem = module_attr('reset_problem')
+    save_problem = module_attr('save_problem')
+    set_state_from_lcp = module_attr('set_state_from_lcp')
+    should_show_check_button = module_attr('should_show_check_button')
+    should_show_reset_button = module_attr('should_show_reset_button')
+    should_show_save_button = module_attr('should_show_save_button')
+    update_score = module_attr('update_score')
diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 0bc79a4a1c..6dc2ac045b 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -496,7 +496,7 @@ class CombinedOpenEndedDescriptor(CombinedOpenEndedFields, RawDescriptor):
     metadata_translations = {
         'is_graded': 'graded',
         'attempts': 'max_attempts',
-        }
+    }
 
     def get_context(self):
         _context = RawDescriptor.get_context(self)
diff --git a/common/lib/xmodule/xmodule/conditional_module.py b/common/lib/xmodule/xmodule/conditional_module.py
index a489b8a19f..f80184832f 100644
--- a/common/lib/xmodule/xmodule/conditional_module.py
+++ b/common/lib/xmodule/xmodule/conditional_module.py
@@ -18,6 +18,7 @@ log = logging.getLogger('mitx.' + __name__)
 
 
 class ConditionalFields(object):
+    has_children = True
     show_tag_list = List(help="Poll answers", scope=Scope.content)
 
 
@@ -148,7 +149,7 @@ class ConditionalModule(ConditionalFields, XModule):
                                                context)
             return json.dumps({'html': [html], 'message': bool(message)})
 
-        html = [self.runtime.render_child(child, None, 'student_view').content for child in self.get_display_items()]
+        html = [child.render('student_view').content for child in self.get_display_items()]
 
         return json.dumps({'html': html})
 
diff --git a/common/lib/xmodule/xmodule/crowdsource_hinter.py b/common/lib/xmodule/xmodule/crowdsource_hinter.py
index b302982b05..62bfe5b586 100644
--- a/common/lib/xmodule/xmodule/crowdsource_hinter.py
+++ b/common/lib/xmodule/xmodule/crowdsource_hinter.py
@@ -113,17 +113,17 @@ class CrowdsourceHinterModule(CrowdsourceHinterFields, XModule):
 
         try:
             child = self.get_display_items()[0]
-            out = self.runtime.render_child(child, None, 'student_view').content
+            out = child.render('student_view').content
             # The event listener uses the ajax url to find the child.
-            child_url = child.runtime.ajax_url
+            child_id = child.id
         except IndexError:
             out = u"Error in loading crowdsourced hinter - can't find child problem."
-            child_url = ''
+            child_id = ''
 
         # Wrap the module in a <section>.  This lets us pass data attributes to the javascript.
-        out += u'<section class="crowdsource-wrapper" data-url="{ajax_url}" data-child-url="{child_url}"> </section>'.format(
+        out += u'<section class="crowdsource-wrapper" data-url="{ajax_url}" data-child-id="{child_id}"> </section>'.format(
             ajax_url=self.runtime.ajax_url,
-            child_url=child_url
+            child_id=child_id
         )
 
         return out
diff --git a/common/lib/xmodule/xmodule/css/lti/lti.scss b/common/lib/xmodule/xmodule/css/lti/lti.scss
index 97a8f62d54..152963516c 100644
--- a/common/lib/xmodule/xmodule/css/lti/lti.scss
+++ b/common/lib/xmodule/xmodule/css/lti/lti.scss
@@ -2,8 +2,23 @@ div.lti {
     // align center
     margin: 0 auto;
 
-    h3.error_message {
-        display: block;
+    .wrapper-lti-link {
+        @include font-size(14);
+        position: relative;
+        background-color: $sidebar-color;
+        padding: ($baseline*1.8) ($baseline*1.5) ($baseline*1.1) $baseline;
+
+        .lti-link {
+            position: absolute;
+            top: ($baseline*1.8);
+            right: $baseline;
+
+            .link_lti_new_window {
+                @extend .gray-button;
+                @include font-size(13);
+                @include line-height(14);
+            }
+        }
     }
 
     form.ltiLaunchForm {
@@ -13,18 +28,8 @@ div.lti {
     iframe.ltiLaunchFrame {
         width: 100%;
         height: 800px;
-        display: none;
+        display: block;
         border: 0px;
         overflow-x: hidden;
     }
-
-    &.rendered {
-        iframe.ltiLaunchFrame {
-            display: block;
-        }
-
-        h3.error_message {
-            display: none;
-        }
-    }
 }
diff --git a/common/lib/xmodule/xmodule/css/video/display.scss b/common/lib/xmodule/xmodule/css/video/display.scss
index 538f4672cc..ed0131c54c 100644
--- a/common/lib/xmodule/xmodule/css/video/display.scss
+++ b/common/lib/xmodule/xmodule/css/video/display.scss
@@ -27,6 +27,33 @@ div.video {
     height: 0px;
   }
 
+  .wrapper-downloads {
+    margin: 0;
+    padding: 0;
+
+    .video-sources,
+    .video-tracks {
+      display: inline-block;
+      margin: ($baseline*.75) ($baseline/2) 0 0;
+
+      a {
+        @include transition(all 0.25s ease-in-out 0s);
+        @include font-size(14);
+        display: inline-block;
+        border-radius: 3px 3px 3px 3px;
+        background-color: $very-light-text;
+        padding: ($baseline*.75);
+        color: $lighter-base-font-color;
+
+        &:hover {
+          background-color: $action-primary-active-bg;
+          color: $very-light-text;
+        }
+      }
+
+    }
+  }
+
   article.video-wrapper {
     float: left;
     margin-right: flex-gutter(9);
@@ -392,7 +419,7 @@ div.video {
             @include transition(none);
             -webkit-font-smoothing: antialiased;
             width: 30px;
-          
+
             &:hover, &:active {
               background-color: #444;
               color: #fff;
@@ -457,7 +484,7 @@ div.video {
           text-indent: -9999px;
           @include transition(none);
           width: 30px;
-          
+
           &:hover, &:active {
             background-color: #444;
             color: #fff;
@@ -611,7 +638,6 @@ div.video {
     ol.subtitles {
         width: 0;
         height: 0;
-        visibility: hidden;
     }
 
     ol.subtitles.html5 {
@@ -645,7 +671,6 @@ div.video {
       ol.subtitles {
         right: -(flex-grid(4));
         width: auto;
-        visibility: hidden;
       }
     }
 
diff --git a/common/lib/xmodule/xmodule/error_module.py b/common/lib/xmodule/xmodule/error_module.py
index 7fc3747f44..c6c798a114 100644
--- a/common/lib/xmodule/xmodule/error_module.py
+++ b/common/lib/xmodule/xmodule/error_module.py
@@ -77,7 +77,7 @@ class ErrorDescriptor(ErrorFields, XModuleDescriptor):
     module_class = ErrorModule
 
     def get_html(self):
-        return ''
+        return u''
 
     @classmethod
     def _construct(cls, system, contents, error_msg, location):
diff --git a/common/lib/xmodule/xmodule/js/fixtures/crowdsource_hinter.html b/common/lib/xmodule/xmodule/js/fixtures/crowdsource_hinter.html
index 02122017bd..e8d327a514 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/crowdsource_hinter.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/crowdsource_hinter.html
@@ -1,8 +1,8 @@
 <li id="vert-0" data-id="i4x://Me/19.002/crowdsource_hinter/crowdsource_hinter_def7a1142dd0">
-    
+
 
 <section class="xmodule_display xmodule_CrowdsourceHinterModule" data-type="Hinter" id="hinter-root">
-    
+
 
 <section class="xmodule_display xmodule_CapaModule" data-type="Problem" id="problem">
   <section id="problem_i4x-Me-19_002-problem-Numerical_Input" class="problems-wrapper" data-problem-id="i4x://Me/19.002/problem/Numerical_Input" data-url="/courses/Me/19.002/Test/modx/i4x://Me/19.002/problem/Numerical_Input" data-progress_status="done" data-progress_detail="1/1">
@@ -44,7 +44,7 @@
 
 
 
-<section class="crowdsource-wrapper" data-url="/courses/Me/19.002/Test/modx/i4x://Me/19.002/crowdsource_hinter/crowdsource_hinter_def7a1142dd0" data-child-url="/courses/Me/19.002/Test/modx/i4x://Me/19.002/problem/Numerical_Input" style="display: none;"> </section>
+<section class="crowdsource-wrapper" data-url="/courses/Me/19.002/Test/modx/i4x://Me/19.002/crowdsource_hinter/crowdsource_hinter_def7a1142dd0" data-child-id="i4x://Me/19.002/problem/Numerical_Input" style="display: none;"> </section>
 </section>
 
 
diff --git a/common/lib/xmodule/xmodule/js/fixtures/lti.html b/common/lib/xmodule/xmodule/js/fixtures/lti.html
index ae545970ce..14bea7d771 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/lti.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/lti.html
@@ -1,36 +1,31 @@
-<div id="lti_id" class="lti">
+<div class="lti-wrapper">
+    <div id="lti_id" class="lti" data-open_in_a_new_page="true">
 
-    <form
-        action="http://www.example.com"
-        name="ltiLaunchForm"
-        class="ltiLaunchForm"
-        method="post"
-        target="ltiLaunchFrame"
-        enctype="application/x-www-form-urlencoded"
-    >
-        <input name="launch_presentation_return_url" value="" />
-        <input name="lti_version" value="LTI-1p0" />
-        <input name="user_id" value="student" />
-        <input name="oauth_nonce" value="28347958723982798572" />
-        <input name="oauth_timestamp" value="2389479832" />
-        <input name="oauth_consumer_key" value="" />
-        <input name="lis_result_sourcedid" value="" />
-        <input name="oauth_signature_method" value="HMAC-SHA1" />
-        <input name="oauth_version" value="1.0" />
-        <input name="role" value="student" />
-        <input name="lis_outcome_service_url" value="" />
-        <input name="oauth_signature" value="89ru3289r3ry283y3r82ryr38yr" />
-        <input name="lti_message_type" value="basic-lti-launch-request" />
-        <input name="oauth_callback" value="about:blank" />
+        <form
+            action=""
+            name="ltiLaunchForm"
+            class="ltiLaunchForm"
+            method="post"
+            target="_blank"
+            enctype="application/x-www-form-urlencoded"
+        >
+            <input name="launch_presentation_return_url" value="" />
+            <input name="lti_version" value="LTI-1p0" />
+            <input name="user_id" value="student" />
+            <input name="oauth_nonce" value="28347958723982798572" />
+            <input name="oauth_timestamp" value="2389479832" />
+            <input name="oauth_consumer_key" value="" />
+            <input name="lis_result_sourcedid" value="" />
+            <input name="oauth_signature_method" value="HMAC-SHA1" />
+            <input name="oauth_version" value="1.0" />
+            <input name="role" value="student" />
+            <input name="lis_outcome_service_url" value="" />
+            <input name="oauth_signature" value="89ru3289r3ry283y3r82ryr38yr" />
+            <input name="lti_message_type" value="basic-lti-launch-request" />
+            <input name="oauth_callback" value="about:blank" />
 
-        <input type="submit" value="Press to Launch" />
-    </form>
-
-    <h3 class="error_message">
-        Please provide launch_url. Click "Edit", and fill in the
-        required fields.
-    </h3>
-
-    <iframe name="ltiLaunchFrame" class="ltiLaunchFrame" src=""></iframe>
+            <input type="submit" value="Press to Launch" />
+        </form>
 
+    </div>
 </div>
diff --git a/common/lib/xmodule/xmodule/js/fixtures/video.html b/common/lib/xmodule/xmodule/js/fixtures/video.html
index f607430ba0..e80bd3a0dd 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/video.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/video.html
@@ -12,6 +12,7 @@
         data-autoplay="False"
         data-yt-test-timeout="1500"
         data-yt-test-url="https://gdata.youtube.com/feeds/api/videos/"
+        data-autohide-html5="True"
       >
         <div class="focus_grabber first"></div>
 
@@ -44,7 +45,7 @@
                     </div>
                   </div>
                   <a href="#" class="add-fullscreen" title="Fill browser" role="button" aria-disabled="false">Fill Browser</a>
-                  <a href="#" class="quality_control" title="HD" role="button" aria-disabled="false">HD</a>
+                  <a href="#" class="quality_control" title="HD off" role="button" aria-disabled="false">HD off</a>
                   <a href="#" class="hide-subtitles" title="Turn off captions" role="button" aria-disabled="false">Captions</a>
                 </div>
               </div>
diff --git a/common/lib/xmodule/xmodule/js/fixtures/video_all.html b/common/lib/xmodule/xmodule/js/fixtures/video_all.html
index 57052bf65d..e7a46e1bc2 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/video_all.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/video_all.html
@@ -15,6 +15,7 @@
         data-autoplay="False"
         data-yt-test-timeout="1500"
         data-yt-test-url="https://gdata.youtube.com/feeds/api/videos/"
+        data-autohide-html5="True"
       >
         <div class="focus_grabber first"></div>
 
@@ -47,7 +48,7 @@
                     </div>
                   </div>
                   <a href="#" class="add-fullscreen" title="Fill browser" role="button" aria-disabled="false">Fill Browser</a>
-                  <a href="#" class="quality_control" title="HD" role="button" aria-disabled="false">HD</a>
+                  <a href="#" class="quality_control" title="HD off" role="button" aria-disabled="false">HD off</a>
                   <a href="#" class="hide-subtitles" title="Turn off captions" role="button" aria-disabled="false">Captions</a>
                 </div>
               </div>
diff --git a/common/lib/xmodule/xmodule/js/fixtures/video_html5.html b/common/lib/xmodule/xmodule/js/fixtures/video_html5.html
index 32789b6ba9..fcb5a3c319 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/video_html5.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/video_html5.html
@@ -15,6 +15,7 @@
         data-autoplay="False"
         data-yt-test-timeout="1500"
         data-yt-test-url="https://gdata.youtube.com/feeds/api/videos/"
+        data-autohide-html5="True"
       >
         <div class="focus_grabber first"></div>
 
diff --git a/common/lib/xmodule/xmodule/js/fixtures/video_no_captions.html b/common/lib/xmodule/xmodule/js/fixtures/video_no_captions.html
index 61975784c1..ceb24299e9 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/video_no_captions.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/video_no_captions.html
@@ -12,6 +12,7 @@
         data-autoplay="False"
         data-yt-test-timeout="1500"
         data-yt-test-url="https://gdata.youtube.com/feeds/api/videos/"
+        data-autohide-html5="True"
       >
         <div class="focus_grabber first"></div>
 
diff --git a/common/lib/xmodule/xmodule/js/fixtures/video_yt_multiple.html b/common/lib/xmodule/xmodule/js/fixtures/video_yt_multiple.html
index c6b40cdf16..6a53a33970 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/video_yt_multiple.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/video_yt_multiple.html
@@ -12,6 +12,7 @@
         data-autoplay="False"
         data-yt-test-timeout="1500"
         data-yt-test-url="https://gdata.youtube.com/feeds/api/videos/"
+        data-autohide-html5="True"
       >
         <div class="focus_grabber first"></div>
 
@@ -44,7 +45,7 @@
                     </div>
                   </div>
                   <a href="#" class="add-fullscreen" title="Fill browser" role="button" aria-disabled="false">Fill Browser</a>
-                  <a href="#" class="quality_control" title="HD" role="button" aria-disabled="false">HD</a>
+                  <a href="#" class="quality_control" title="HD off" role="button" aria-disabled="false">HD off</a>
                   <a href="#" class="hide-subtitles" title="Turn off captions" role="button" aria-disabled="false">Captions</a>
                 </div>
               </div>
@@ -73,6 +74,8 @@
         data-autoplay="False"
         data-yt-test-timeout="1500"
         data-yt-test-url="https://gdata.youtube.com/feeds/api/videos/"
+
+        data-autohide-html5="True"
       >
         <div class="tc-wrapper">
           <article class="video-wrapper">
@@ -130,6 +133,8 @@
         data-autoplay="False"
         data-yt-test-timeout="1500"
         data-yt-test-url="https://gdata.youtube.com/feeds/api/videos/"
+
+        data-autohide-html5="True"
       >
         <div class="tc-wrapper">
           <article class="video-wrapper">
diff --git a/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee b/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee
index d8decf6574..99344c2983 100644
--- a/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee
+++ b/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee
@@ -139,12 +139,12 @@ describe 'Problem', ->
 
     it 'log the problem_graded event, after the problem is done grading.', ->
       spyOn($, 'postWithPrefix').andCallFake (url, answers, callback) ->
-        response = 
+        response =
           success: 'correct'
           contents: 'mock grader response'
         callback(response)
       @problem.check()
-      expect(Logger.log).toHaveBeenCalledWith 'problem_graded', ['foo=1&bar=2', 'mock grader response'], @problem.url
+      expect(Logger.log).toHaveBeenCalledWith 'problem_graded', ['foo=1&bar=2', 'mock grader response'], @problem.id
 
     it 'submit the answer for check', ->
       spyOn $, 'postWithPrefix'
diff --git a/common/lib/xmodule/xmodule/js/spec/helper.coffee b/common/lib/xmodule/xmodule/js/spec/helper.coffee
index bed85cee4d..1a4f4cbb28 100644
--- a/common/lib/xmodule/xmodule/js/spec/helper.coffee
+++ b/common/lib/xmodule/xmodule/js/spec/helper.coffee
@@ -1,5 +1,6 @@
 # Stub Youtube API
 window.YT =
+  Player: ->
   PlayerState:
     UNSTARTED: -1
     ENDED: 0
@@ -7,6 +8,7 @@ window.YT =
     PAUSED: 2
     BUFFERING: 3
     CUED: 5
+  ready: (f) -> f()
 
 window.STATUS = window.YT.PlayerState
 
@@ -58,7 +60,7 @@ window.jQuery.ajaxWithPrefix = (url, settings) ->
     oldAjaxWithPrefix.apply @, arguments
 
 # Time waitsFor() should wait for before failing a test.
-window.WAIT_TIMEOUT = 1000
+window.WAIT_TIMEOUT = 5000
 
 jasmine.getFixtures().fixturesPath += 'fixtures'
 
diff --git a/common/lib/xmodule/xmodule/js/spec/lti/constructor.js b/common/lib/xmodule/xmodule/js/spec/lti/constructor.js
index f016d42d9d..cda1d7988d 100644
--- a/common/lib/xmodule/xmodule/js/spec/lti/constructor.js
+++ b/common/lib/xmodule/xmodule/js/spec/lti/constructor.js
@@ -5,77 +5,158 @@
  *
  *
  * The front-end part of the LTI module is really simple. If an action
- * is set for the hidden LTI form, then it is submited, and the results are
- * redirected to an iframe.
+ * is set for the hidden LTI form, then it is submitted, and the results are
+ * redirected to an iframe or to a new window (based on the
+ * "open_in_a_new_page" attribute).
  *
- * We will test that the form is only submited when the action is set (i.e.
- * not empty).
+ * We will test that the form is only submitted when the action is set (i.e.
+ * not empty, and not the default one).
  *
  * Other aspects of LTI module will be covered by Python unit tests and
  * acceptance tests.
- *
  */
 
 /*
- * "Hence that general is skilful in attack whose opponent does not know what
- * to defend; and he is skilful in defense whose opponent does not know what
+ * "Hence that general is skillful in attack whose opponent does not know what
+ * to defend; and he is skillful in defense whose opponent does not know what
  * to attack."
  *
  * ~ Sun Tzu
  */
 
 (function () {
+    var element, container, form, link,
+        IN_NEW_WINDOW = 'true',
+        IN_IFRAME = 'false',
+        EMPTY_URL = '',
+        DEFAULT_URL = 'http://www.example.com',
+        NEW_URL = 'http://www.example.com/some_book';
+
+    function initialize(target, action) {
+        var tempEl;
+
+        loadFixtures('lti.html');
+
+        element = $('.lti-wrapper');
+        container = element.find('.lti');
+        form = container.find('.ltiLaunchForm');
+
+        if (target === IN_IFRAME) {
+            container.data('open_in_a_new_page', 'false');
+            form.attr('target', 'ltiLaunchFrame');
+        }
+
+        form.attr('action', action);
+
+        // If we have a new proper action (non-default), we create either
+        // a link that will submit the form, or an iframe that will contain
+        // the answer of auto submitted form.
+        if (action !== EMPTY_URL && action !== DEFAULT_URL) {
+            if (target === IN_NEW_WINDOW) {
+                $('<a />', {
+                    href: '#',
+                    class: 'link_lti_new_window'
+                }).appendTo(container);
+
+                link = container.find('.link_lti_new_window');
+            } else {
+                $('<iframe />', {
+                    name: 'ltiLaunchFrame',
+                    class: 'ltiLaunchFrame',
+                    src: ''
+                }).appendTo(container);
+            }
+        }
+
+        spyOnEvent(form, 'submit');
+
+        LTI(element);
+    }
+
     describe('LTI', function () {
-        describe('constructor', function () {
-            describe('before settings were filled in', function () {
-                var element, errorMessage, frame;
+        describe('initialize', function () {
+            describe(
+                'open_in_a_new_page is "true", launch URL is empty',
+                function () {
 
-                // This function will be executed before each of the it() specs
-                // in this suite.
                 beforeEach(function () {
-                    loadFixtures('lti.html');
-
-                    element = $('#lti_id');
-                    errorMessage = element.find('.error_message');
-                    form = element.find('.ltiLaunchForm');
-                    frame = element.find('.ltiLaunchFrame');
-
-                    spyOnEvent(form, 'submit');
-
-                    LTI(element);
+                    initialize(IN_NEW_WINDOW, EMPTY_URL);
                 });
 
-                it(
-                    'when URL setting is not filled form is not submited',
-                    function () {
-
+                it('form is not submitted', function () {
                     expect('submit').not.toHaveBeenTriggeredOn(form);
                 });
             });
 
-            describe('After the settings were filled in', function () {
-                var element, errorMessage, frame;
+            describe(
+                'open_in_a_new_page is "true", launch URL is default',
+                function () {
 
-                // This function will be executed before each of the it() specs
-                // in this suite.
                 beforeEach(function () {
-                    loadFixtures('lti.html');
-
-                    element = $('#lti_id');
-                    errorMessage = element.find('.error_message');
-                    form = element.find('.ltiLaunchForm');
-                    frame = element.find('.ltiLaunchFrame');
-
-                    spyOnEvent(form, 'submit');
-
-                    // The user "fills in" the necessary settings, and the
-                    // form will get an action URL.
-                    form.attr('action', 'http://www.example.com/test_submit');
-
-                    LTI(element);
+                    initialize(IN_NEW_WINDOW, DEFAULT_URL);
                 });
 
-                it('when URL setting is filled form is submited', function () {
+                it('form is not submitted', function () {
+                    expect('submit').not.toHaveBeenTriggeredOn(form);
+                });
+            });
+
+            describe(
+                'open_in_a_new_page is "true", launch URL is not empty, and ' +
+                'not default',
+                function () {
+
+                beforeEach(function () {
+                    initialize(IN_NEW_WINDOW, NEW_URL);
+                });
+
+                it('form is not submitted', function () {
+                    expect('submit').not.toHaveBeenTriggeredOn(form);
+                });
+
+                it('after link is clicked, form is submitted', function () {
+                    link.trigger('click');
+
+                    expect('submit').toHaveBeenTriggeredOn(form);
+                });
+            });
+
+            describe(
+                'open_in_a_new_page is "false", launch URL is empty',
+                function () {
+
+                beforeEach(function () {
+                    initialize(IN_IFRAME, EMPTY_URL);
+                });
+
+                it('form is not submitted', function () {
+                    expect('submit').not.toHaveBeenTriggeredOn(form);
+                });
+            });
+
+            describe(
+                'open_in_a_new_page is "false", launch URL is default',
+                function () {
+
+                beforeEach(function () {
+                    initialize(IN_IFRAME, DEFAULT_URL);
+                });
+
+                it('form is not submitted', function () {
+                    expect('submit').not.toHaveBeenTriggeredOn(form);
+                });
+            });
+
+            describe(
+                'open_in_a_new_page is "false", launch URL is not empty, ' +
+                'and not default',
+                function () {
+
+                beforeEach(function () {
+                    initialize(IN_IFRAME, NEW_URL);
+                });
+
+                it('form is submitted', function () {
                     expect('submit').toHaveBeenTriggeredOn(form);
                 });
             });
diff --git a/common/lib/xmodule/xmodule/js/spec/video/general_spec.js b/common/lib/xmodule/xmodule/js/spec/video/general_spec.js
index 3444f5389f..7803099aa8 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/general_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/general_spec.js
@@ -11,8 +11,6 @@
 
         afterEach(function () {
             window.OldVideoPlayer = undefined;
-            window.onYouTubePlayerAPIReady = undefined;
-            window.onHTML5PlayerAPIReady = undefined;
             $('source').remove();
         });
 
@@ -214,14 +212,23 @@
                 // Total ajax calls made.
                 numAjaxCalls = $.ajax.calls.length;
 
-                // Subtract ajax calls to get captions.
+                // Subtract ajax calls to get captions via
+                // state.videoCaption.fetchCaption() function.
                 numAjaxCalls -= $.ajaxWithPrefix.calls.length;
 
-                // Subtract ajax calls to get metadata for each video.
+                // Subtract ajax calls to get metadata for each video via
+                // state.getVideoMetadata() function.
+                numAjaxCalls -= 3;
+
+                // Subtract ajax calls to log event 'pause_video' via
+                // state.videoPlayer.log() function.
                 numAjaxCalls -= 3;
 
                 // This should leave just one call. It was made to check
-                // for YT availability.
+                // for YT availability. This is done in state.initialize()
+                // function. SPecifically, with the statement
+                //
+                //     this.youtubeXhr = this.getVideoMetadata();
                 expect(numAjaxCalls).toBe(1);
             });
         });
diff --git a/common/lib/xmodule/xmodule/js/spec/video/html5_video_spec.js b/common/lib/xmodule/xmodule/js/spec/video/html5_video_spec.js
index 85db07ac87..8851aee4d8 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/html5_video_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/html5_video_spec.js
@@ -16,7 +16,7 @@
         });
 
         afterEach(function() {
-            YT.Player = void 0;
+            state = undefined;
             $.fn.scrollTo.reset();
             $('.subtitles').remove();
             $('source').remove();
@@ -28,7 +28,7 @@
                 spyOn(player, 'callStateChangeCallback').andCallThrough();
             });
 
-            describe('click', function () {
+            describe('[click]', function () {
                 describe('when player is paused', function () {
                     beforeEach(function () {
                         spyOn(player.video, 'play').andCallThrough();
@@ -40,10 +40,7 @@
                         expect(player.video.play).toHaveBeenCalled();
                     });
 
-                    // Temporarily disabled due to intermittent failures
-                    // Fails with "timeout: timed out after 1000 msec waiting for Player state should be changed"
-                    // on Firefox
-                    xit('player state was changed', function () {
+                    it('player state was changed', function () {
                         waitsFor(function () {
                             return player.getPlayerState() !== STATUS.PAUSED;
                         }, 'Player state should be changed', WAIT_TIMEOUT);
@@ -63,41 +60,41 @@
                         });
                     });
                 });
-            });
 
-            describe('when player is played', function () {
-                beforeEach(function () {
-                    spyOn(player.video, 'pause').andCallThrough();
-                    player.playerState  = STATUS.PLAYING;
-                    $(player.videoEl).trigger('click');
-                });
-
-                it('native event was called', function () {
-                    expect(player.video.pause).toHaveBeenCalled();
-                });
-
-                it('player state was changed', function () {
-                    waitsFor(function () {
-                        return player.getPlayerState() !== STATUS.PLAYING;
-                    }, 'Player state should be changed', WAIT_TIMEOUT);
-
-                    runs(function () {
-                        expect(player.getPlayerState()).toBe(STATUS.PAUSED);
+                describe('[player is playing]', function () {
+                    beforeEach(function () {
+                        spyOn(player.video, 'pause').andCallThrough();
+                        player.playerState  = STATUS.PLAYING;
+                        $(player.videoEl).trigger('click');
                     });
-                });
 
-                it('callback was called', function () {
-                    waitsFor(function () {
-                        return player.getPlayerState() !== STATUS.PLAYING;
-                    }, 'Player state should be changed', WAIT_TIMEOUT);
+                    it('native event was called', function () {
+                        expect(player.video.pause).toHaveBeenCalled();
+                    });
 
-                    runs(function () {
-                        expect(player.callStateChangeCallback).toHaveBeenCalled();
+                    it('player state was changed', function () {
+                        waitsFor(function () {
+                            return player.getPlayerState() !== STATUS.PLAYING;
+                        }, 'Player state should be changed', WAIT_TIMEOUT);
+
+                        runs(function () {
+                            expect(player.getPlayerState()).toBe(STATUS.PAUSED);
+                        });
+                    });
+
+                    it('callback was called', function () {
+                        waitsFor(function () {
+                            return player.getPlayerState() !== STATUS.PLAYING;
+                        }, 'Player state should be changed', WAIT_TIMEOUT);
+
+                        runs(function () {
+                            expect(player.callStateChangeCallback).toHaveBeenCalled();
+                        });
                     });
                 });
             });
 
-            describe('play', function () {
+            describe('[play]', function () {
                 beforeEach(function () {
                     spyOn(player.video, 'play').andCallThrough();
                     player.playerState = STATUS.PAUSED;
@@ -129,10 +126,14 @@
                 });
             });
 
-            describe('pause', function () {
+            describe('[pause]', function () {
                 beforeEach(function () {
                     spyOn(player.video, 'pause').andCallThrough();
+                    player.playerState = STATUS.UNSTARTED;
                     player.playVideo();
+                    waitsFor(function () {
+                        return player.getPlayerState() !== STATUS.UNSTARTED;
+                    }, 'Video never started playing', WAIT_TIMEOUT);
                     player.pauseVideo();
                 });
 
@@ -142,7 +143,7 @@
 
                 it('player state was changed', function () {
                     waitsFor(function () {
-                        return player.getPlayerState() !== STATUS.UNSTARTED;
+                        return player.getPlayerState() !== STATUS.PLAYING;
                     }, 'Player state should be changed', WAIT_TIMEOUT);
 
                     runs(function () {
@@ -152,7 +153,7 @@
 
                 it('callback was called', function () {
                     waitsFor(function () {
-                        return player.getPlayerState() !== STATUS.UNSTARTED;
+                        return player.getPlayerState() !== STATUS.PLAYING;
                     }, 'Player state should be changed', WAIT_TIMEOUT);
                     runs(function () {
                         expect(player.callStateChangeCallback).toHaveBeenCalled();
@@ -160,7 +161,7 @@
                 });
             });
 
-            describe('canplay', function () {
+            describe('[canplay]', function () {
                 beforeEach(function () {
                     waitsFor(function () {
                         return player.getPlayerState() !== STATUS.UNSTARTED;
@@ -192,7 +193,7 @@
                 });
             });
 
-            describe('ended', function () {
+            describe('[ended]', function () {
                 beforeEach(function () {
                     waitsFor(function () {
                         return player.getPlayerState() !== STATUS.UNSTARTED;
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
index 0f729da62d..061576efd2 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
@@ -1,673 +1,798 @@
-(function() {
-  describe('VideoCaption', function() {
-    var state, videoPlayer, videoCaption, videoSpeedControl, oldOTBD;
+(function () {
+    describe('VideoCaption', function () {
+        var state, videoPlayer, videoCaption, videoSpeedControl, oldOTBD;
 
-    function initialize() {
-      loadFixtures('video_all.html');
-      state = new Video('#example');
-      videoPlayer = state.videoPlayer;
-      videoCaption = state.videoCaption;
-      videoSpeedControl = state.videoSpeedControl;
-      videoControl = state.videoControl;
-    }
+        function initialize() {
+            loadFixtures('video_all.html');
+            state = new Video('#example');
+            videoPlayer = state.videoPlayer;
+            videoCaption = state.videoCaption;
+            videoSpeedControl = state.videoSpeedControl;
+            videoControl = state.videoControl;
+        }
 
-    beforeEach(function() {
-      oldOTBD = window.onTouchBasedDevice;
-      window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn(false);
-      initialize();
-    });
-
-    afterEach(function() {
-      YT.Player = void 0;
-      $.fn.scrollTo.reset();
-      $('.subtitles').remove();
-      $('source').remove();
-      window.onTouchBasedDevice = oldOTBD;
-    });
-
-    describe('constructor', function() {
-      describe('always', function() {
-        beforeEach(function() {
-          spyOn($, 'ajaxWithPrefix').andCallThrough();
-          initialize();
-        });
-
-        it('create the caption element', function() {
-          expect($('.video')).toContain('ol.subtitles');
-        });
-
-        it('add caption control to video player', function() {
-          expect($('.video')).toContain('a.hide-subtitles');
-        });
-
-        it('fetch the caption', function() {
-          waitsFor(function () {
-            if (videoCaption.loaded === true) {
-                return true;
-            }
-
-            return false;
-          }, 'Expect captions to be loaded.', 1000);
-
-          runs(function () {
-              expect($.ajaxWithPrefix).toHaveBeenCalledWith({
-                url: videoCaption.captionURL(),
-                notifyOnError: false,
-                success: jasmine.any(Function),
-                error: jasmine.any(Function),
-              });
-          });
-        });
-
-        it('bind window resize event', function() {
-          expect($(window)).toHandleWith('resize', videoCaption.resize);
-        });
-
-        it('bind the hide caption button', function() {
-          expect($('.hide-subtitles')).toHandleWith('click', videoCaption.toggle);
-        });
-
-        it('bind the mouse movement', function() {
-          expect($('.subtitles')).toHandleWith('mouseover', videoCaption.onMouseEnter);
-          expect($('.subtitles')).toHandleWith('mouseout', videoCaption.onMouseLeave);
-          expect($('.subtitles')).toHandleWith('mousemove', videoCaption.onMovement);
-          expect($('.subtitles')).toHandleWith('mousewheel', videoCaption.onMovement);
-          expect($('.subtitles')).toHandleWith('DOMMouseScroll', videoCaption.onMovement);
-        });
-
-        it('bind the scroll', function() {
-          expect($('.subtitles')).toHandleWith('scroll', videoCaption.autoShowCaptions);
-          expect($('.subtitles')).toHandleWith('scroll', videoControl.showControls);
-        });
-      });
-
-      describe('when on a non touch-based device', function() {
-        beforeEach(function() {
-          initialize();
-        });
-
-        it('render the caption', function() {
-          var captionsData;
-
-          captionsData = jasmine.stubbedCaption;
-          $('.subtitles li[data-index]').each(function(index, link) {
-            expect($(link)).toHaveData('index', index);
-            expect($(link)).toHaveData('start', captionsData.start[index]);
-            expect($(link)).toHaveAttr('tabindex', 0);
-            expect($(link)).toHaveText(captionsData.text[index]);
-          });
-        });
-
-        it('add a padding element to caption', function() {
-          expect($('.subtitles li:first').hasClass('spacing')).toBe(true);
-          expect($('.subtitles li:last').hasClass('spacing')).toBe(true);
-        });
-
-        it('bind all the caption link', function() {
-          $('.subtitles li[data-index]').each(function(index, link) {
-            expect($(link)).toHandleWith('mouseover', videoCaption.captionMouseOverOut);
-            expect($(link)).toHandleWith('mouseout', videoCaption.captionMouseOverOut);
-            expect($(link)).toHandleWith('mousedown', videoCaption.captionMouseDown);
-            expect($(link)).toHandleWith('click', videoCaption.captionClick);
-            expect($(link)).toHandleWith('focus', videoCaption.captionFocus);
-            expect($(link)).toHandleWith('blur', videoCaption.captionBlur);
-            expect($(link)).toHandleWith('keydown', videoCaption.captionKeyDown);
-          });
-        });
-
-        it('set rendered to true', function() {
-          expect(videoCaption.rendered).toBeTruthy();
-        });
-      });
-
-      describe('when on a touch-based device', function() {
-        beforeEach(function() {
-          window.onTouchBasedDevice.andReturn(true);
-          initialize();
-        });
-
-        it('show explaination message', function() {
-          expect($('.subtitles li')).toHaveHtml("Caption will be displayed when you start playing the video.");
-        });
-
-        it('does not set rendered to true', function() {
-          expect(videoCaption.rendered).toBeFalsy();
-        });
-      });
-
-      describe('when no captions file was specified', function () {
-        beforeEach(function () {
-          loadFixtures('video_all.html');
-
-          // Unspecify the captions file.
-          $('#example').find('#video_id').data('sub', '');
-
-          state = new Video('#example');
-          videoCaption = state.videoCaption;
-        });
-
-        it('captions panel is not shown', function () {
-          expect(videoCaption.hideSubtitlesEl).toBeHidden();
-        });
-      });
-    });
-
-    describe('mouse movement', function() {
-      // We will store default window.setTimeout() function here.
-      var oldSetTimeout = null;
-
-      beforeEach(function() {
-        // Store original window.setTimeout() function. If we do not do this, then
-        // all other tests that rely on code which uses window.setTimeout()
-        // function might (and probably will) fail.
-        oldSetTimeout = window.setTimeout;
-        // Redefine window.setTimeout() function as a spy.
-        window.setTimeout = jasmine.createSpy().andCallFake(function(callback, timeout) { return 5; })
-        window.setTimeout.andReturn(100);
-        spyOn(window, 'clearTimeout');
-      });
-
-      afterEach(function () {
-        // Reset the default window.setTimeout() function. If we do not do this,
-        // then all other tests that rely on code which uses window.setTimeout()
-        // function might (and probably will) fail.
-        window.setTimeout = oldSetTimeout;
-      });
-
-      describe('when cursor is outside of the caption box', function() {
-        beforeEach(function() {
-          $(window).trigger(jQuery.Event('mousemove'));
-        });
-
-        it('does not set freezing timeout', function() {
-          expect(videoCaption.frozen).toBeFalsy();
-        });
-      });
-
-      describe('when cursor is in the caption box', function() {
-        beforeEach(function() {
-          $('.subtitles').trigger(jQuery.Event('mouseenter'));
-        });
-
-        it('set the freezing timeout', function() {
-          expect(videoCaption.frozen).toEqual(100);
-        });
-
-        describe('when the cursor is moving', function() {
-          beforeEach(function() {
-            $('.subtitles').trigger(jQuery.Event('mousemove'));
-          });
-
-          it('reset the freezing timeout', function() {
-            expect(window.clearTimeout).toHaveBeenCalledWith(100);
-          });
-        });
-
-        describe('when the mouse is scrolling', function() {
-          beforeEach(function() {
-            $('.subtitles').trigger(jQuery.Event('mousewheel'));
-          });
-
-          it('reset the freezing timeout', function() {
-            expect(window.clearTimeout).toHaveBeenCalledWith(100);
-          });
-        });
-      });
-
-      describe('when cursor is moving out of the caption box', function() {
-        beforeEach(function() {
-          videoCaption.frozen = 100;
-          $.fn.scrollTo.reset();
-        });
-
-        describe('always', function() {
-          beforeEach(function() {
-            $('.subtitles').trigger(jQuery.Event('mouseout'));
-          });
-
-          it('reset the freezing timeout', function() {
-            expect(window.clearTimeout).toHaveBeenCalledWith(100);
-          });
-
-          it('unfreeze the caption', function() {
-            expect(videoCaption.frozen).toBeNull();
-          });
-        });
-
-        describe('when the player is playing', function() {
-          beforeEach(function() {
-            videoCaption.playing = true;
-            $('.subtitles li[data-index]:first').addClass('current');
-            $('.subtitles').trigger(jQuery.Event('mouseout'));
-          });
-
-          it('scroll the caption', function() {
-            expect($.fn.scrollTo).toHaveBeenCalled();
-          });
-        });
-
-        describe('when the player is not playing', function() {
-          beforeEach(function() {
-            videoCaption.playing = false;
-            $('.subtitles').trigger(jQuery.Event('mouseout'));
-          });
-
-          it('does not scroll the caption', function() {
-            expect($.fn.scrollTo).not.toHaveBeenCalled();
-          });
-        });
-      });
-    });
-
-    describe('search', function() {
-      it('return a correct caption index', function() {
-        expect(videoCaption.search(0)).toEqual(-1);
-        expect(videoCaption.search(3120)).toEqual(1);
-        expect(videoCaption.search(6270)).toEqual(2);
-        expect(videoCaption.search(8490)).toEqual(2);
-        expect(videoCaption.search(21620)).toEqual(4);
-        expect(videoCaption.search(24920)).toEqual(5);
-      });
-    });
-
-    describe('play', function() {
-      describe('when the caption was not rendered', function() {
-        beforeEach(function() {
-          window.onTouchBasedDevice.andReturn(true);
-          initialize();
-          videoCaption.play();
-        });
-
-        it('render the caption', function() {
-          var captionsData;
-
-          captionsData = jasmine.stubbedCaption;
-          $('.subtitles li[data-index]').each(function(index, link) {
-            expect($(link)).toHaveData('index', index);
-            expect($(link)).toHaveData('start', captionsData.start[index]);
-            expect($(link)).toHaveAttr('tabindex', 0);
-            expect($(link)).toHaveText(captionsData.text[index]);
-          });
-        });
-
-        it('add a padding element to caption', function() {
-          expect($('.subtitles li:first')).toBe('.spacing');
-          expect($('.subtitles li:last')).toBe('.spacing');
-        });
-
-        it('bind all the caption link', function() {
-          $('.subtitles li[data-index]').each(function(index, link) {
-            expect($(link)).toHandleWith('mouseover', videoCaption.captionMouseOverOut);
-            expect($(link)).toHandleWith('mouseout', videoCaption.captionMouseOverOut);
-            expect($(link)).toHandleWith('mousedown', videoCaption.captionMouseDown);
-            expect($(link)).toHandleWith('click', videoCaption.captionClick);
-            expect($(link)).toHandleWith('focus', videoCaption.captionFocus);
-            expect($(link)).toHandleWith('blur', videoCaption.captionBlur);
-            expect($(link)).toHandleWith('keydown', videoCaption.captionKeyDown);
-          });
-        });
-
-        it('set rendered to true', function() {
-          expect(videoCaption.rendered).toBeTruthy();
-        });
-
-        it('set playing to true', function() {
-          expect(videoCaption.playing).toBeTruthy();
-        });
-      });
-    });
-
-    describe('pause', function() {
-      beforeEach(function() {
-        videoCaption.playing = true;
-        videoCaption.pause();
-      });
-
-      it('set playing to false', function() {
-        expect(videoCaption.playing).toBeFalsy();
-      });
-    });
-
-    describe('updatePlayTime', function() {
-      describe('when the video speed is 1.0x', function() {
-        beforeEach(function() {
-          videoSpeedControl.currentSpeed = '1.0';
-          videoCaption.updatePlayTime(25.000);
-        });
-
-        it('search the caption based on time', function() {
-          expect(videoCaption.currentIndex).toEqual(5);
-        });
-      });
-
-      describe('when the video speed is not 1.0x', function() {
-        beforeEach(function() {
-          videoSpeedControl.currentSpeed = '0.75';
-          videoCaption.updatePlayTime(25.000);
-        });
-
-        it('search the caption based on 1.0x speed', function() {
-          expect(videoCaption.currentIndex).toEqual(5);
-        });
-      });
-
-      describe('when the index is not the same', function() {
-        beforeEach(function() {
-          videoCaption.currentIndex = 1;
-          $('.subtitles li[data-index=5]').addClass('current');
-          videoCaption.updatePlayTime(25.000);
-        });
-
-        it('deactivate the previous caption', function() {
-          expect($('.subtitles li[data-index=1]')).not.toHaveClass('current');
-        });
-
-        it('activate new caption', function() {
-          expect($('.subtitles li[data-index=5]')).toHaveClass('current');
-        });
-
-        it('save new index', function() {
-          expect(videoCaption.currentIndex).toEqual(5);
-        });
-
-        it('scroll caption to new position', function() {
-          expect($.fn.scrollTo).toHaveBeenCalled();
-        });
-      });
-
-      describe('when the index is the same', function() {
-        beforeEach(function() {
-          videoCaption.currentIndex = 1;
-          $('.subtitles li[data-index=3]').addClass('current');
-          videoCaption.updatePlayTime(15.000);
-        });
-
-        it('does not change current subtitle', function() {
-          expect($('.subtitles li[data-index=3]')).toHaveClass('current');
-        });
-      });
-    });
-
-    describe('resize', function() {
-      beforeEach(function() {
-        initialize();
-        $('.subtitles li[data-index=1]').addClass('current');
-        videoCaption.resize();
-      });
-
-      describe('set the height of caption container', function(){
-        // Temporarily disabled due to intermittent failures
-        // with error "Expected 745 to be close to 805, 2." in Firefox
-        xit('when CC button is enabled', function() {
-          var realHeight = parseInt($('.subtitles').css('maxHeight'), 10),
-              shouldBeHeight = $('.video-wrapper').height();
-
-          // Because of some problems with rounding on different enviroments:
-          // Linux * Mac * FF * Chrome
-          expect(realHeight).toBeCloseTo(shouldBeHeight, 2);
-        });
-
-        it('when CC button is disabled ', function() {
-          var realHeight, videoWrapperHeight, progressSliderHeight,
-            controlHeight, shouldBeHeight;
-
-          state.captionsHidden = true;
-          videoCaption.setSubtitlesHeight();
-
-          realHeight = parseInt($('.subtitles').css('maxHeight'), 10);
-          videoWrapperHeight = $('.video-wrapper').height();
-          progressSliderHeight = videoControl.sliderEl.height();
-          controlHeight = videoControl.el.height();
-          shouldBeHeight = videoWrapperHeight -
-                           0.5 * progressSliderHeight -
-                           controlHeight;
-
-          expect(realHeight).toBe(shouldBeHeight);
-        });
-      });
-
-      it('set the height of caption spacing', function() {
-        var firstSpacing, lastSpacing;
-        firstSpacing = Math.abs(parseInt($('.subtitles .spacing:first').css('height'), 10));
-        lastSpacing = Math.abs(parseInt($('.subtitles .spacing:last').css('height'), 10));
-        expect(firstSpacing - videoCaption.topSpacingHeight()).toBeLessThan(1);
-        expect(lastSpacing - videoCaption.bottomSpacingHeight()).toBeLessThan(1);
-      });
-
-      it('scroll caption to new position', function() {
-        expect($.fn.scrollTo).toHaveBeenCalled();
-      });
-    });
-
-    describe('scrollCaption', function() {
-      beforeEach(function() {
-        initialize();
-      });
-
-      describe('when frozen', function() {
-        beforeEach(function() {
-          videoCaption.frozen = true;
-          $('.subtitles li[data-index=1]').addClass('current');
-          videoCaption.scrollCaption();
-        });
-
-        it('does not scroll the caption', function() {
-          expect($.fn.scrollTo).not.toHaveBeenCalled();
-        });
-      });
-
-      describe('when not frozen', function() {
-        beforeEach(function() {
-          videoCaption.frozen = false;
-        });
-
-        describe('when there is no current caption', function() {
-          beforeEach(function() {
-            videoCaption.scrollCaption();
-          });
-
-          it('does not scroll the caption', function() {
-            expect($.fn.scrollTo).not.toHaveBeenCalled();
-          });
-        });
-
-        describe('when there is a current caption', function() {
-          beforeEach(function() {
-            $('.subtitles li[data-index=1]').addClass('current');
-            videoCaption.scrollCaption();
-          });
-
-          it('scroll to current caption', function() {
-            expect($.fn.scrollTo).toHaveBeenCalled();
-          });
-        });
-      });
-    });
-
-    describe('seekPlayer', function() {
-      describe('when the video speed is 1.0x', function() {
-        beforeEach(function() {
-          videoSpeedControl.currentSpeed = '1.0';
-          $('.subtitles li[data-start="14910"]').trigger('click');
-        });
-
-        // Temporarily disabled due to intermittent failures
-        // Fails with error: "InvalidStateError: An attempt was made to
-        // use an object that is not, or is no longer, usable
-        // Expected 0 to equal 14.91."
-        // on Firefox
-        xit('trigger seek event with the correct time', function() {
-          expect(videoPlayer.currentTime).toEqual(14.91);
-        });
-      });
-
-      describe('when the video speed is not 1.0x', function() {
-        beforeEach(function() {
-          initialize();
-          videoSpeedControl.currentSpeed = '0.75';
-          $('.subtitles li[data-start="14910"]').trigger('click');
-        });
-
-        it('trigger seek event with the correct time', function() {
-          expect(videoPlayer.currentTime).toEqual(14.91);
-        });
-      });
-
-      describe('when the player type is Flash at speed 0.75x', function () {
         beforeEach(function () {
+            oldOTBD = window.onTouchBasedDevice;
+            window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice')
+                .andReturn(false);
             initialize();
-            videoSpeedControl.currentSpeed = '0.75';
-            state.currentPlayerMode = 'flash';
-            $('.subtitles li[data-start="14910"]').trigger('click');
         });
 
-        it('trigger seek event with the correct time', function () {
-            expect(videoPlayer.currentTime).toEqual(15);
+        afterEach(function () {
+            YT.Player = undefined;
+            $.fn.scrollTo.reset();
+            $('.subtitles').remove();
+            $('source').remove();
+            window.onTouchBasedDevice = oldOTBD;
+        });
+
+        describe('constructor', function () {
+            describe('always', function () {
+                beforeEach(function () {
+                    spyOn($, 'ajaxWithPrefix').andCallThrough();
+                    initialize();
+                });
+
+                it('create the caption element', function () {
+                    expect($('.video')).toContain('ol.subtitles');
+                });
+
+                it('add caption control to video player', function () {
+                    expect($('.video')).toContain('a.hide-subtitles');
+                });
+
+                it('fetch the caption', function () {
+                    waitsFor(function () {
+                        if (videoCaption.loaded === true) {
+                            return true;
+                        }
+
+                        return false;
+                    }, 'Expect captions to be loaded.', 1000);
+
+                    runs(function () {
+                        expect($.ajaxWithPrefix).toHaveBeenCalledWith({
+                            url: videoCaption.captionURL(),
+                            notifyOnError: false,
+                            success: jasmine.any(Function),
+                            error: jasmine.any(Function)
+                        });
+                    });
+                });
+
+                it('bind window resize event', function () {
+                    expect($(window)).toHandleWith(
+                        'resize', videoCaption.resize
+                    );
+                });
+
+                it('bind the hide caption button', function () {
+                    expect($('.hide-subtitles')).toHandleWith(
+                        'click', videoCaption.toggle
+                    );
+                });
+
+                it('bind the mouse movement', function () {
+                    expect($('.subtitles')).toHandleWith(
+                        'mouseover', videoCaption.onMouseEnter
+                    );
+                    expect($('.subtitles')).toHandleWith(
+                        'mouseout', videoCaption.onMouseLeave
+                    );
+                    expect($('.subtitles')).toHandleWith(
+                        'mousemove', videoCaption.onMovement
+                    );
+                    expect($('.subtitles')).toHandleWith(
+                        'mousewheel', videoCaption.onMovement
+                    );
+                    expect($('.subtitles')).toHandleWith(
+                        'DOMMouseScroll', videoCaption.onMovement
+                    );
+                });
+
+                it('bind the scroll', function () {
+                    expect($('.subtitles'))
+                        .toHandleWith('scroll', videoCaption.autoShowCaptions);
+                    expect($('.subtitles'))
+                        .toHandleWith('scroll', videoControl.showControls);
+                });
+            });
+
+            describe('when on a non touch-based device', function () {
+                beforeEach(function () {
+                    initialize();
+                });
+
+                it('render the caption', function () {
+                    var captionsData;
+
+                    captionsData = jasmine.stubbedCaption;
+                    $('.subtitles li[data-index]').each(
+                        function (index, link) {
+
+                        expect($(link)).toHaveData('index', index);
+                        expect($(link)).toHaveData(
+                            'start', captionsData.start[index]
+                        );
+                        expect($(link)).toHaveAttr('tabindex', 0);
+                        expect($(link)).toHaveText(captionsData.text[index]);
+                    });
+                });
+
+                it('add a padding element to caption', function () {
+                    expect($('.subtitles li:first').hasClass('spacing'))
+                        .toBe(true);
+                    expect($('.subtitles li:last').hasClass('spacing'))
+                        .toBe(true);
+                });
+
+                it('bind all the caption link', function () {
+                    $('.subtitles li[data-index]').each(
+                        function (index, link) {
+
+                        expect($(link)).toHandleWith(
+                            'mouseover', videoCaption.captionMouseOverOut
+                        );
+                        expect($(link)).toHandleWith(
+                            'mouseout', videoCaption.captionMouseOverOut
+                        );
+                        expect($(link)).toHandleWith(
+                            'mousedown', videoCaption.captionMouseDown
+                        );
+                        expect($(link)).toHandleWith(
+                            'click', videoCaption.captionClick
+                        );
+                        expect($(link)).toHandleWith(
+                            'focus', videoCaption.captionFocus
+                        );
+                        expect($(link)).toHandleWith(
+                            'blur', videoCaption.captionBlur
+                        );
+                        expect($(link)).toHandleWith(
+                            'keydown', videoCaption.captionKeyDown
+                        );
+                    });
+                });
+
+                it('set rendered to true', function () {
+                    expect(videoCaption.rendered).toBeTruthy();
+                });
+            });
+
+            describe('when on a touch-based device', function () {
+                beforeEach(function () {
+                    window.onTouchBasedDevice.andReturn(true);
+                    initialize();
+                });
+
+                it('show explaination message', function () {
+                    expect($('.subtitles li')).toHaveHtml(
+                        'Caption will be displayed when you start playing ' +
+                        'the video.'
+                    );
+                });
+
+                it('does not set rendered to true', function () {
+                    expect(videoCaption.rendered).toBeFalsy();
+                });
+            });
+
+            describe('when no captions file was specified', function () {
+                beforeEach(function () {
+                    loadFixtures('video_all.html');
+
+                    // Unspecify the captions file.
+                    $('#example').find('#video_id').data('sub', '');
+
+                    state = new Video('#example');
+                    videoCaption = state.videoCaption;
+                });
+
+                it('captions panel is not shown', function () {
+                    expect(videoCaption.hideSubtitlesEl).toBeHidden();
+                });
+            });
+        });
+
+        describe('mouse movement', function () {
+            // We will store default window.setTimeout() function here.
+            var oldSetTimeout = null;
+
+            beforeEach(function () {
+                // Store original window.setTimeout() function. If we do not do
+                // this, then all other tests that rely on code which uses
+                // window.setTimeout() function might (and probably will) fail.
+                oldSetTimeout = window.setTimeout;
+                // Redefine window.setTimeout() function as a spy.
+                window.setTimeout = jasmine.createSpy().andCallFake(
+                    function (callback, timeout) {
+                        return 5;
+                    }
+                );
+                window.setTimeout.andReturn(100);
+                spyOn(window, 'clearTimeout');
+            });
+
+            afterEach(function () {
+                // Reset the default window.setTimeout() function. If we do not
+                // do this, then all other tests that rely on code which uses
+                // window.setTimeout() function might (and probably will) fail.
+                window.setTimeout = oldSetTimeout;
+            });
+
+            describe('when cursor is outside of the caption box', function () {
+                beforeEach(function () {
+                    $(window).trigger(jQuery.Event('mousemove'));
+                });
+
+                it('does not set freezing timeout', function () {
+                    expect(videoCaption.frozen).toBeFalsy();
+                });
+            });
+
+            describe('when cursor is in the caption box', function () {
+                beforeEach(function () {
+                    $('.subtitles').trigger(jQuery.Event('mouseenter'));
+                });
+
+                it('set the freezing timeout', function () {
+                    expect(videoCaption.frozen).toEqual(100);
+                });
+
+                describe('when the cursor is moving', function () {
+                    beforeEach(function () {
+                        $('.subtitles').trigger(jQuery.Event('mousemove'));
+                    });
+
+                    it('reset the freezing timeout', function () {
+                        expect(window.clearTimeout).toHaveBeenCalledWith(100);
+                    });
+                });
+
+                describe('when the mouse is scrolling', function () {
+                    beforeEach(function () {
+                        $('.subtitles').trigger(jQuery.Event('mousewheel'));
+                    });
+
+                    it('reset the freezing timeout', function () {
+                        expect(window.clearTimeout).toHaveBeenCalledWith(100);
+                    });
+                });
+            });
+
+            describe(
+                'when cursor is moving out of the caption box',
+                function () {
+
+                beforeEach(function () {
+                    videoCaption.frozen = 100;
+                    $.fn.scrollTo.reset();
+                });
+
+                describe('always', function () {
+                    beforeEach(function () {
+                        $('.subtitles').trigger(jQuery.Event('mouseout'));
+                    });
+
+                    it('reset the freezing timeout', function () {
+                        expect(window.clearTimeout).toHaveBeenCalledWith(100);
+                    });
+
+                    it('unfreeze the caption', function () {
+                        expect(videoCaption.frozen).toBeNull();
+                    });
+                });
+
+                describe('when the player is playing', function () {
+                    beforeEach(function () {
+                        videoCaption.playing = true;
+                        $('.subtitles li[data-index]:first')
+                            .addClass('current');
+                        $('.subtitles').trigger(jQuery.Event('mouseout'));
+                    });
+
+                    it('scroll the caption', function () {
+                        expect($.fn.scrollTo).toHaveBeenCalled();
+                    });
+                });
+
+                describe('when the player is not playing', function () {
+                    beforeEach(function () {
+                        videoCaption.playing = false;
+                        $('.subtitles').trigger(jQuery.Event('mouseout'));
+                    });
+
+                    it('does not scroll the caption', function () {
+                        expect($.fn.scrollTo).not.toHaveBeenCalled();
+                    });
+                });
+            });
+        });
+
+        describe('search', function () {
+            it('return a correct caption index', function () {
+                expect(videoCaption.search(0)).toEqual(-1);
+                expect(videoCaption.search(3120)).toEqual(1);
+                expect(videoCaption.search(6270)).toEqual(2);
+                expect(videoCaption.search(8490)).toEqual(2);
+                expect(videoCaption.search(21620)).toEqual(4);
+                expect(videoCaption.search(24920)).toEqual(5);
+            });
+        });
+
+        describe('play', function () {
+            describe('when the caption was not rendered', function () {
+                beforeEach(function () {
+                    window.onTouchBasedDevice.andReturn(true);
+                    initialize();
+                    videoCaption.play();
+                });
+
+                it('render the caption', function () {
+                    var captionsData;
+
+                    captionsData = jasmine.stubbedCaption;
+                    $('.subtitles li[data-index]').each(
+                        function (index, link) {
+
+                        expect($(link)).toHaveData('index', index);
+                        expect($(link)).toHaveData(
+                            'start', captionsData.start[index]
+                        );
+                        expect($(link)).toHaveAttr('tabindex', 0);
+                        expect($(link)).toHaveText(captionsData.text[index]);
+                    });
+                });
+
+                it('add a padding element to caption', function () {
+                    expect($('.subtitles li:first')).toBe('.spacing');
+                    expect($('.subtitles li:last')).toBe('.spacing');
+                });
+
+                it('bind all the caption link', function () {
+                    $('.subtitles li[data-index]').each(
+                        function (index, link) {
+
+                        expect($(link)).toHandleWith(
+                            'mouseover', videoCaption.captionMouseOverOut
+                        );
+                        expect($(link)).toHandleWith(
+                            'mouseout', videoCaption.captionMouseOverOut
+                        );
+                        expect($(link)).toHandleWith(
+                            'mousedown', videoCaption.captionMouseDown
+                        );
+                        expect($(link)).toHandleWith(
+                            'click', videoCaption.captionClick
+                        );
+                        expect($(link)).toHandleWith(
+                            'focus', videoCaption.captionFocus
+                        );
+                        expect($(link)).toHandleWith(
+                            'blur', videoCaption.captionBlur
+                        );
+                        expect($(link)).toHandleWith(
+                            'keydown', videoCaption.captionKeyDown
+                        );
+                    });
+                });
+
+                it('set rendered to true', function () {
+                    expect(videoCaption.rendered).toBeTruthy();
+                });
+
+                it('set playing to true', function () {
+                    expect(videoCaption.playing).toBeTruthy();
+                });
+            });
+        });
+
+        describe('pause', function () {
+            beforeEach(function () {
+                videoCaption.playing = true;
+                videoCaption.pause();
+            });
+
+            it('set playing to false', function () {
+                expect(videoCaption.playing).toBeFalsy();
+            });
+        });
+
+        describe('updatePlayTime', function () {
+            describe('when the video speed is 1.0x', function () {
+                beforeEach(function () {
+                    videoSpeedControl.currentSpeed = '1.0';
+                    videoCaption.updatePlayTime(25.000);
+                });
+
+                it('search the caption based on time', function () {
+                    expect(videoCaption.currentIndex).toEqual(5);
+                });
+            });
+
+            describe('when the video speed is not 1.0x', function () {
+                beforeEach(function () {
+                    videoSpeedControl.currentSpeed = '0.75';
+                    videoCaption.updatePlayTime(25.000);
+                });
+
+                it('search the caption based on 1.0x speed', function () {
+                    expect(videoCaption.currentIndex).toEqual(5);
+                });
+            });
+
+            describe('when the index is not the same', function () {
+                beforeEach(function () {
+                    videoCaption.currentIndex = 1;
+                    $('.subtitles li[data-index=5]').addClass('current');
+                    videoCaption.updatePlayTime(25.000);
+                });
+
+                it('deactivate the previous caption', function () {
+                    expect($('.subtitles li[data-index=1]'))
+                        .not.toHaveClass('current');
+                });
+
+                it('activate new caption', function () {
+                    expect($('.subtitles li[data-index=5]'))
+                        .toHaveClass('current');
+                });
+
+                it('save new index', function () {
+                    expect(videoCaption.currentIndex).toEqual(5);
+                });
+
+                it('scroll caption to new position', function () {
+                    expect($.fn.scrollTo).toHaveBeenCalled();
+                });
+            });
+
+            describe('when the index is the same', function () {
+                beforeEach(function () {
+                    videoCaption.currentIndex = 1;
+                    $('.subtitles li[data-index=3]').addClass('current');
+                    videoCaption.updatePlayTime(15.000);
+                });
+
+                it('does not change current subtitle', function () {
+                    expect($('.subtitles li[data-index=3]'))
+                        .toHaveClass('current');
+                });
+            });
+        });
+
+        describe('resize', function () {
+            beforeEach(function () {
+                initialize();
+                $('.subtitles li[data-index=1]').addClass('current');
+                videoCaption.resize();
+            });
+
+            describe('set the height of caption container', function () {
+                // Temporarily disabled due to intermittent failures
+                // with error "Expected 745 to be close to 805, 2." in Firefox
+                xit('when CC button is enabled', function () {
+                    var realHeight = parseInt(
+                            $('.subtitles').css('maxHeight'), 10
+                        ),
+                        shouldBeHeight = $('.video-wrapper').height();
+
+                    // Because of some problems with rounding on different
+                    // environments: Linux * Mac * FF * Chrome
+                    expect(realHeight).toBeCloseTo(shouldBeHeight, 2);
+                });
+
+                it('when CC button is disabled ', function () {
+                    var realHeight, videoWrapperHeight, progressSliderHeight,
+                        controlHeight, shouldBeHeight;
+
+                    state.captionsHidden = true;
+                    videoCaption.setSubtitlesHeight();
+
+                    realHeight = parseInt(
+                        $('.subtitles').css('maxHeight'), 10
+                    );
+                    videoWrapperHeight = $('.video-wrapper').height();
+                    progressSliderHeight = videoControl.sliderEl.height();
+                    controlHeight = videoControl.el.height();
+                    shouldBeHeight = videoWrapperHeight -
+                        0.5 * progressSliderHeight -
+                        controlHeight;
+
+                    expect(realHeight).toBe(shouldBeHeight);
+                });
+            });
+
+            it('set the height of caption spacing', function () {
+                var firstSpacing, lastSpacing;
+
+                firstSpacing = Math.abs(parseInt(
+                    $('.subtitles .spacing:first').css('height'), 10
+                ));
+                lastSpacing = Math.abs(parseInt(
+                    $('.subtitles .spacing:last').css('height'), 10
+                ));
+
+                expect(firstSpacing - videoCaption.topSpacingHeight())
+                    .toBeLessThan(1);
+                expect(lastSpacing - videoCaption.bottomSpacingHeight())
+                    .toBeLessThan(1);
+            });
+
+            it('scroll caption to new position', function () {
+                expect($.fn.scrollTo).toHaveBeenCalled();
+            });
+        });
+
+        describe('scrollCaption', function () {
+            beforeEach(function () {
+                initialize();
+            });
+
+            describe('when frozen', function () {
+                beforeEach(function () {
+                    videoCaption.frozen = true;
+                    $('.subtitles li[data-index=1]').addClass('current');
+                    videoCaption.scrollCaption();
+                });
+
+                it('does not scroll the caption', function () {
+                    expect($.fn.scrollTo).not.toHaveBeenCalled();
+                });
+            });
+
+            describe('when not frozen', function () {
+                beforeEach(function () {
+                    videoCaption.frozen = false;
+                });
+
+                describe('when there is no current caption', function () {
+                    beforeEach(function () {
+                        videoCaption.scrollCaption();
+                    });
+
+                    it('does not scroll the caption', function () {
+                        expect($.fn.scrollTo).not.toHaveBeenCalled();
+                    });
+                });
+
+                describe('when there is a current caption', function () {
+                    beforeEach(function () {
+                        $('.subtitles li[data-index=1]').addClass('current');
+                        videoCaption.scrollCaption();
+                    });
+
+                    it('scroll to current caption', function () {
+                        expect($.fn.scrollTo).toHaveBeenCalled();
+                    });
+                });
+            });
+        });
+
+        describe('seekPlayer', function () {
+            describe('when the video speed is 1.0x', function () {
+                beforeEach(function () {
+                    videoSpeedControl.currentSpeed = '1.0';
+                    $('.subtitles li[data-start="14910"]').trigger('click');
+                });
+
+                // Temporarily disabled due to intermittent failures
+                // Fails with error: "InvalidStateError: An attempt was made to
+                // use an object that is not, or is no longer, usable
+                // Expected 0 to equal 14.91."
+                // on Firefox
+                xit('trigger seek event with the correct time', function () {
+                    expect(videoPlayer.currentTime).toEqual(14.91);
+                });
+            });
+
+            describe('when the video speed is not 1.0x', function () {
+                beforeEach(function () {
+                    initialize();
+                    videoSpeedControl.currentSpeed = '0.75';
+                    $('.subtitles li[data-start="14910"]').trigger('click');
+                });
+
+                it('trigger seek event with the correct time', function () {
+                    expect(videoPlayer.currentTime).toEqual(14.91);
+                });
+            });
+
+            describe('when the player type is Flash at speed 0.75x',
+                function () {
+
+                beforeEach(function () {
+                    initialize();
+                    videoSpeedControl.currentSpeed = '0.75';
+                    state.currentPlayerMode = 'flash';
+                    $('.subtitles li[data-start="14910"]').trigger('click');
+                });
+
+                it('trigger seek event with the correct time', function () {
+                    expect(videoPlayer.currentTime).toEqual(15);
+                });
+            });
+        });
+
+        describe('toggle', function () {
+            beforeEach(function () {
+                initialize();
+                spyOn(videoPlayer, 'log');
+                $('.subtitles li[data-index=1]').addClass('current');
+            });
+
+            describe('when the caption is visible', function () {
+                beforeEach(function () {
+                    state.el.removeClass('closed');
+                    videoCaption.toggle(jQuery.Event('click'));
+                });
+
+                it('log the hide_transcript event', function () {
+                    expect(videoPlayer.log).toHaveBeenCalledWith(
+                        'hide_transcript',
+                        {
+                            currentTime: videoPlayer.currentTime
+                        }
+                    );
+                });
+
+                it('hide the caption', function () {
+                    expect(state.el).toHaveClass('closed');
+                });
+            });
+
+            describe('when the caption is hidden', function () {
+                beforeEach(function () {
+                    state.el.addClass('closed');
+                    videoCaption.toggle(jQuery.Event('click'));
+                });
+
+                it('log the show_transcript event', function () {
+                    expect(videoPlayer.log).toHaveBeenCalledWith(
+                        'show_transcript',
+                        {
+                            currentTime: videoPlayer.currentTime
+                        }
+                    );
+                });
+
+                it('show the caption', function () {
+                    expect(state.el).not.toHaveClass('closed');
+                });
+
+                it('scroll the caption', function () {
+                    expect($.fn.scrollTo).toHaveBeenCalled();
+                });
+            });
+        });
+
+        describe('caption accessibility', function () {
+            beforeEach(function () {
+                initialize();
+            });
+
+            describe('when getting focus through TAB key', function () {
+                beforeEach(function () {
+                    videoCaption.isMouseFocus = false;
+                    $('.subtitles li[data-index=0]').trigger(
+                        jQuery.Event('focus')
+                    );
+                });
+
+                it('shows an outline around the caption', function () {
+                    expect($('.subtitles li[data-index=0]'))
+                        .toHaveClass('focused');
+                });
+
+                it('has automatic scrolling disabled', function () {
+                    expect(videoCaption.autoScrolling).toBe(false);
+                });
+            });
+
+            describe('when loosing focus through TAB key', function () {
+                beforeEach(function () {
+                    $('.subtitles li[data-index=0]').trigger(
+                        jQuery.Event('blur')
+                    );
+                });
+
+                it('does not show an outline around the caption', function () {
+                    expect($('.subtitles li[data-index=0]'))
+                        .not.toHaveClass('focused');
+                });
+
+                it('has automatic scrolling enabled', function () {
+                    expect(videoCaption.autoScrolling).toBe(true);
+                });
+            });
+
+            describe(
+                'when same caption gets the focus through mouse after ' +
+                'having focus through TAB key',
+                function () {
+
+                beforeEach(function () {
+                    videoCaption.isMouseFocus = false;
+                    $('.subtitles li[data-index=0]')
+                        .trigger(jQuery.Event('focus'));
+                    $('.subtitles li[data-index=0]')
+                        .trigger(jQuery.Event('mousedown'));
+                });
+
+                it('does not show an outline around it', function () {
+                    expect($('.subtitles li[data-index=0]'))
+                        .not.toHaveClass('focused');
+                });
+
+                it('has automatic scrolling enabled', function () {
+                    expect(videoCaption.autoScrolling).toBe(true);
+                });
+            });
+
+            describe(
+                'when a second caption gets focus through mouse after ' +
+                'first had focus through TAB key',
+                function () {
+
+                var subDataLiIdx__0, subDataLiIdx__1;
+
+                beforeEach(function () {
+                    subDataLiIdx__0 = $('.subtitles li[data-index=0]');
+                    subDataLiIdx__1 = $('.subtitles li[data-index=1]');
+
+                    videoCaption.isMouseFocus = false;
+
+                    subDataLiIdx__0.trigger(jQuery.Event('focus'));
+                    subDataLiIdx__0.trigger(jQuery.Event('blur'));
+
+                    videoCaption.isMouseFocus = true;
+
+                    subDataLiIdx__1.trigger(jQuery.Event('mousedown'));
+                });
+
+                it('does not show an outline around the first', function () {
+                    expect(subDataLiIdx__0).not.toHaveClass('focused');
+                });
+
+                it('does not show an outline around the second', function () {
+                    expect(subDataLiIdx__1).not.toHaveClass('focused');
+                });
+
+                it('has automatic scrolling enabled', function () {
+                    expect(videoCaption.autoScrolling).toBe(true);
+                });
+            });
+
+            xdescribe('when enter key is pressed on a caption', function () {
+                var subDataLiIdx__0;
+
+                beforeEach(function () {
+                    var e;
+
+                    subDataLiIdx__0 = $('.subtitles li[data-index=0]');
+
+                    spyOn(videoCaption, 'seekPlayer').andCallThrough();
+                    videoCaption.isMouseFocus = false;
+                    subDataLiIdx__0.trigger(jQuery.Event('focus'));
+                    e = jQuery.Event('keydown');
+                    e.which = 13; // ENTER key
+                    subDataLiIdx__0.trigger(e);
+                });
+
+                // Temporarily disabled due to intermittent failures.
+                //
+                // Fails with error: "InvalidStateError: InvalidStateError: An
+                // attempt was made to use an object that is not, or is no
+                // longer, usable".
+                xit('shows an outline around it', function () {
+                    expect(subDataLiIdx__0).toHaveClass('focused');
+                });
+
+                xit('calls seekPlayer', function () {
+                    expect(videoCaption.seekPlayer).toHaveBeenCalled();
+                });
+            });
         });
-      });
     });
 
-    describe('toggle', function() {
-      beforeEach(function() {
-        initialize();
-        spyOn(videoPlayer, 'log');
-        $('.subtitles li[data-index=1]').addClass('current');
-      });
-
-      describe('when the caption is visible', function() {
-        beforeEach(function() {
-          state.el.removeClass('closed');
-          videoCaption.toggle(jQuery.Event('click'));
-        });
-
-        it('log the hide_transcript event', function() {
-          expect(videoPlayer.log).toHaveBeenCalledWith('hide_transcript', {
-            currentTime: videoPlayer.currentTime
-          });
-        });
-
-        it('hide the caption', function() {
-          expect(state.el).toHaveClass('closed');
-        });
-      });
-
-      describe('when the caption is hidden', function() {
-        beforeEach(function() {
-          state.el.addClass('closed');
-          videoCaption.toggle(jQuery.Event('click'));
-        });
-
-        it('log the show_transcript event', function() {
-          expect(videoPlayer.log).toHaveBeenCalledWith('show_transcript', {
-            currentTime: videoPlayer.currentTime
-          });
-        });
-
-        it('show the caption', function() {
-          expect(state.el).not.toHaveClass('closed');
-        });
-
-        it('scroll the caption', function() {
-          expect($.fn.scrollTo).toHaveBeenCalled();
-        });
-      });
-    });
-
-    describe('caption accessibility', function() {
-      beforeEach(function() {
-        initialize();
-      });
-
-      describe('when getting focus through TAB key', function() {
-        beforeEach(function() {
-          videoCaption.isMouseFocus = false;
-          $('.subtitles li[data-index=0]').trigger(jQuery.Event('focus'));
-        });
-
-        it('shows an outline around the caption', function() {
-          expect($('.subtitles li[data-index=0]')).toHaveClass('focused');
-        });
-
-        it('has automatic scrolling disabled', function() {
-          expect(videoCaption.autoScrolling).toBe(false);
-        });
-      });
-
-      describe('when loosing focus through TAB key', function() {
-        beforeEach(function() {
-          $('.subtitles li[data-index=0]').trigger(jQuery.Event('blur'));
-        });
-
-        it('does not show an outline around the caption', function() {
-          expect($('.subtitles li[data-index=0]')).not.toHaveClass('focused');
-        });
-
-        it('has automatic scrolling enabled', function() {
-          expect(videoCaption.autoScrolling).toBe(true);
-        });
-      });
-
-      describe('when same caption gets the focus through mouse after having focus through TAB key', function() {
-        beforeEach(function() {
-          videoCaption.isMouseFocus = false;
-          $('.subtitles li[data-index=0]').trigger(jQuery.Event('focus'));
-          $('.subtitles li[data-index=0]').trigger(jQuery.Event('mousedown'));
-        });
-
-        it('does not show an outline around it', function() {
-          expect($('.subtitles li[data-index=0]')).not.toHaveClass('focused');
-        });
-
-        it('has automatic scrolling enabled', function() {
-          expect(videoCaption.autoScrolling).toBe(true);
-        });
-      });
-
-      describe('when a second caption gets focus through mouse after first had focus through TAB key', function() {
-        beforeEach(function() {
-          videoCaption.isMouseFocus = false;
-          $('.subtitles li[data-index=0]').trigger(jQuery.Event('focus'));
-          $('.subtitles li[data-index=0]').trigger(jQuery.Event('blur'));
-          videoCaption.isMouseFocus = true;
-          $('.subtitles li[data-index=1]').trigger(jQuery.Event('mousedown'));
-        });
-
-        it('does not show an outline around the first', function() {
-          expect($('.subtitles li[data-index=0]')).not.toHaveClass('focused');
-        });
-
-        it('does not show an outline around the second', function() {
-          expect($('.subtitles li[data-index=1]')).not.toHaveClass('focused');
-        });
-
-        it('has automatic scrolling enabled', function() {
-          expect(videoCaption.autoScrolling).toBe(true);
-        });
-      });
-
-      xdescribe('when enter key is pressed on a caption', function() {
-        beforeEach(function() {
-          var e;
-          spyOn(videoCaption, 'seekPlayer').andCallThrough();
-          videoCaption.isMouseFocus = false;
-          $('.subtitles li[data-index=0]').trigger(jQuery.Event('focus'));
-          e = jQuery.Event('keydown');
-          e.which = 13; // ENTER key
-          $('.subtitles li[data-index=0]').trigger(e);
-        });
-
-        // Temporarily disabled due to intermittent failures
-        // Fails with error: "InvalidStateError: InvalidStateError: An attempt
-        // was made to use an object that is not, or is no longer, usable"
-        xit('shows an outline around it', function() {
-          expect($('.subtitles li[data-index=0]')).toHaveClass('focused');
-        });
-
-        xit('calls seekPlayer', function() {
-           expect(videoCaption.seekPlayer).toHaveBeenCalled();
-        });
-      });
-    });
-  });
-
 }).call(this);
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js
index a7df088d67..00f51a4c80 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js
@@ -83,7 +83,8 @@
 
         window.YT = {
             Player: function () { },
-            PlayerState: oldYT.PlayerState
+            PlayerState: oldYT.PlayerState,
+            ready: function(f){f();}
         };
 
         spyOn(window.YT, 'Player');
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_quality_control_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_quality_control_spec.js
index eb2f19aa60..01f7a5b979 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_quality_control_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_quality_control_spec.js
@@ -20,17 +20,38 @@
     });
 
     describe('constructor', function() {
+      var oldYT = window.YT;
+
       beforeEach(function() {
+        window.YT = {
+            Player: function () { },
+            PlayerState: oldYT.PlayerState,
+            ready: function(f){f();}
+        };
+
         initialize();
       });
 
-      // Disabled when ARIA markup was added to the anchor
-      xit('render the quality control', function() {
-        expect(videoControl.secondaryControlsEl.html()).toContain("<a href=\"#\" class=\"quality_control\" title=\"HD\">");
+      afterEach(function () {
+        window.YT = oldYT;
+      });
+
+      it('render the quality control', function() {
+        expect(videoControl.secondaryControlsEl.html())
+          .toContain(
+            '<a ' +
+              'href="#" ' +
+              'class="quality_control" ' +
+              'title="HD off" ' +
+              'role="button" ' +
+              'aria-disabled="false"' +
+            '>HD off</a>'
+          );
       });
 
       it('bind the quality control', function() {
-        expect($('.quality_control')).toHandleWith('click', videoQualityControl.toggleQuality);
+        expect($('.quality_control'))
+          .toHandleWith('click', videoQualityControl.toggleQuality);
       });
     });
   });
diff --git a/common/lib/xmodule/xmodule/js/src/capa/display.coffee b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
index 7786daecf7..7982cbbf65 100644
--- a/common/lib/xmodule/xmodule/js/src/capa/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
@@ -248,7 +248,7 @@ class @Problem
             @updateProgress response
           else
             @gentle_alert response.success
-        Logger.log 'problem_graded', [@answers, response.contents], @url
+        Logger.log 'problem_graded', [@answers, response.contents], @id
 
     if not abort_submission
       $.ajaxWithPrefix("#{@url}/problem_check", settings)
@@ -271,7 +271,7 @@ class @Problem
             @el.removeClass 'showed'
         else
           @gentle_alert response.success
-      Logger.log 'problem_graded', [@answers, response.contents], @url
+      Logger.log 'problem_graded', [@answers, response.contents], @id
 
   reset: =>
     Logger.log 'problem_reset', @answers
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 030d93e9b5..644f63e3ec 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -533,7 +533,7 @@ class @CombinedOpenEnded
   gentle_alert: (msg) =>
     if @$el.find(@oe_alert_sel).length
       @$el.find(@oe_alert_sel).remove()
-    alert_elem = "<div class='open-ended-alert'>" + msg + "</div>"
+    alert_elem = "<div class='open-ended-alert' role='alert'>" + msg + "</div>"
     @$el.find('.open-ended-action').after(alert_elem)
     @$el.find(@oe_alert_sel).css(opacity: 0).animate(opacity: 1, 700)
 
diff --git a/common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee b/common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee
index f9f3e43826..8c22477034 100644
--- a/common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee
@@ -7,7 +7,7 @@ class @Hinter
   constructor: (element) ->
     @el = $(element).find('.crowdsource-wrapper')
     @url = @el.data('url')
-    Logger.listen('problem_graded', @el.data('child-url'), @capture_problem)
+    Logger.listen('problem_graded', @el.data('child-id'), @capture_problem)
     @render()
 
   capture_problem: (event_type, data, element) =>
diff --git a/common/lib/xmodule/xmodule/js/src/lti/lti.js b/common/lib/xmodule/xmodule/js/src/lti/lti.js
index 7d5b183f21..9454b0c346 100644
--- a/common/lib/xmodule/xmodule/js/src/lti/lti.js
+++ b/common/lib/xmodule/xmodule/js/src/lti/lti.js
@@ -1,9 +1,43 @@
+/**
+ * File: lti.js
+ *
+ * Purpose: LTI module constructor. Given an LTI element, we process it.
+ *
+ *
+ * Inside the element there is a form. If that form has a valid action
+ * attribute, then we do one of:
+ *
+ *     1.) Submit the form. The results will be shown on the current page in an
+ *         iframe.
+ *     2.) Attach a handler function to a link which will submit the form. The
+ *         results will be shown in a new window.
+ *
+ * The 'open_in_a_new_page' data attribute of the LTI element dictates which of
+ * the two actions will be performed.
+ */
+
+/*
+ * So the thing to do when working on a motorcycle, as in any other task, is to
+ * cultivate the peace of mind which does not separate one's self from one's
+ * surroundings. When that is done successfully, then everything else follows
+ * naturally. Peace of mind produces right values, right values produce right
+ * thoughts. Right thoughts produce right actions and right actions produce
+ * work which will be a material reflection for others to see of the serenity
+ * at the center of it all.
+ *
+ * ~ Robert M. Pirsig
+ */
+
 window.LTI = (function () {
     // Function initialize(element)
     //
-    // Initialize the LTI iframe.
+    // Initialize the LTI module.
+    //
+    // @param element    DOM element, or jQuery element object.
+    //
+    // @return    undefined
     function initialize(element) {
-        var form;
+        var form, openInANewPage, formAction;
 
         // In cms (Studio) the element is already a jQuery object. In lms it is
         // a DOM object.
@@ -13,12 +47,36 @@ window.LTI = (function () {
         element = $(element);
 
         form = element.find('.ltiLaunchForm');
+        formAction = form.attr('action');
+
+        // If action is empty string, or action is the default URL that should
+        // not cause a form submit.
+        if (!formAction || formAction === 'http://www.example.com') {
+
+            // Nothing to do - no valid action provided. Error message will be
+            // displaced in browser (HTML).
+            return;
+        }
+
+        // We want a Boolean 'true' or 'false'. First we will retrieve the data
+        // attribute, and then we will parse it via native JSON.parse().
+        openInANewPage = element.find('.lti').data('open_in_a_new_page');
+        openInANewPage = JSON.parse(openInANewPage);
 
         // If the Form's action attribute is set (i.e. we can perform a normal
-        // submit), then we submit the form and make the frame shown.
-        if (form.attr('action') && form.attr('action') !== 'http://www.example.com') {
+        // submit), then we (depending on instance settings) submit the form
+        // when user will click on a link, or submit the form immediately.
+        if (openInANewPage === true) {
+            element.find('.link_lti_new_window').on('click', function () {
+                form.submit();
+            });
+        } else {
+            // At this stage the form exists on the page and has a valid
+            // action. We are safe to submit it, even if `openInANewPage` is
+            // set to some weird value.
+            //
+            // Best case scenario is that `openInANewPage` is set to `true`.
             form.submit();
-            element.find('.lti').addClass('rendered');
         }
     }
 
diff --git a/common/lib/xmodule/xmodule/js/src/video/01_initialize.js b/common/lib/xmodule/xmodule/js/src/video/01_initialize.js
index 7f8057c025..b3c5fb91bc 100644
--- a/common/lib/xmodule/xmodule/js/src/video/01_initialize.js
+++ b/common/lib/xmodule/xmodule/js/src/video/01_initialize.js
@@ -92,23 +92,12 @@ function (VideoPlayer) {
         // Require JS. At the time when we reach this code, the stand alone
         // HTML5 player is already loaded, so no further testing in that case
         // is required.
-        var onPlayerReadyFunc;
-        if (
-            (
-                (state.videoType === 'youtube') &&
-                (window.YT) &&
-                (window.YT.Player)
-            ) ||
-            (state.videoType === 'html5')
-        ) {
-            VideoPlayer(state);
+        if(state.videoType === 'youtube') {
+            YT.ready(function() {
+                VideoPlayer(state);
+            })
         } else {
-            if (state.videoType === 'youtube') {
-                onPlayerReadyFunc = 'onYouTubePlayerAPIReady';
-            } else {
-                onPlayerReadyFunc = 'onHTML5PlayerAPIReady';
-            }
-            window[onPlayerReadyFunc] = _.bind(VideoPlayer, window, state);
+            VideoPlayer(state);
         }
     }
 
@@ -264,15 +253,21 @@ function (VideoPlayer) {
     // The function set initial configuration and preparation.
 
     function initialize(element) {
-        var _this = this, tempYtTestTimeout;
+        var _this = this,
+            regExp = /^true$/i,
+            data, tempYtTestTimeout;
         // This is used in places where we instead would have to check if an
         // element has a CSS class 'fullscreen'.
         this.isFullScreen = false;
 
         // The parent element of the video, and the ID.
         this.el = $(element).find('.video');
+        this.elVideoWrapper = this.el.find('.video-wrapper');
         this.id = this.el.attr('id').replace(/video_/, '');
 
+        // jQuery .data() return object with keys in lower camelCase format.
+        data = this.el.data();
+
         console.log(
             '[Video info]: Initializing video with id "' + this.id + '".'
         );
@@ -283,32 +278,26 @@ function (VideoPlayer) {
         this.config = {
             element: element,
 
-            start:              this.el.data('start'),
-            end:                this.el.data('end'),
-
-            caption_data_dir:   this.el.data('caption-data-dir'),
-            caption_asset_path: this.el.data('caption-asset-path'),
-            show_captions:      (
-                                    this.el.data('show-captions')
-                                        .toString().toLowerCase() === 'true'
-                                ),
-            youtubeStreams:     this.el.data('streams'),
-
-            sub:                this.el.data('sub'),
-            mp4Source:          this.el.data('mp4-source'),
-            webmSource:         this.el.data('webm-source'),
-            oggSource:          this.el.data('ogg-source'),
-
-            ytTestUrl:   this.el.data('yt-test-url'),
-
+            start:              data['start'],
+            end:                data['end'],
+            caption_data_dir:   data['captionDataDir'],
+            caption_asset_path: data['captionAssetPath'],
+            show_captions:      regExp.test(data['showCaptions'].toString()),
+            youtubeStreams:     data['streams'],
+            autohideHtml5:      regExp.test(data['autohideHtml5'].toString()),
+            sub:                data['sub'],
+            mp4Source:          data['mp4Source'],
+            webmSource:         data['webmSource'],
+            oggSource:          data['oggSource'],
+            ytTestUrl:          data['ytTestUrl'],
             fadeOutTimeout:     1400,
-
+            captionsFreezeTime: 10000,
             availableQualities: ['hd720', 'hd1080', 'highres']
         };
 
         // Check if the YT test timeout has been set. If not, or it is in
         // improper format, then set to default value.
-        tempYtTestTimeout = parseInt(this.el.data('yt-test-timeout'), 10);
+        tempYtTestTimeout = parseInt(data['ytTestTimeout'], 10);
         if (!isFinite(tempYtTestTimeout)) {
             tempYtTestTimeout = 1500;
         }
diff --git a/common/lib/xmodule/xmodule/js/src/video/03_video_player.js b/common/lib/xmodule/xmodule/js/src/video/03_video_player.js
index 03fcb19351..0fcbe42578 100644
--- a/common/lib/xmodule/xmodule/js/src/video/03_video_player.js
+++ b/common/lib/xmodule/xmodule/js/src/video/03_video_player.js
@@ -420,7 +420,7 @@ function (HTML5Video) {
             this.videoPlayer.player.setPlaybackRate(this.speed);
         }
 
-        /* The following has been commented out to make sure autoplay is 
+        /* The following has been commented out to make sure autoplay is
            disabled for students.
         if (
             !onTouchBasedDevice() &&
diff --git a/common/lib/xmodule/xmodule/js/src/video/04_video_control.js b/common/lib/xmodule/xmodule/js/src/video/04_video_control.js
index 796ba07060..8ba7490cef 100644
--- a/common/lib/xmodule/xmodule/js/src/video/04_video_control.js
+++ b/common/lib/xmodule/xmodule/js/src/video/04_video_control.js
@@ -57,7 +57,7 @@ function () {
             state.videoControl.play();
         }
 
-        if (state.videoType === 'html5') {
+        if ((state.videoType === 'html5') && (state.config.autohideHtml5)) {
             state.videoControl.fadeOutTimeout = state.config.fadeOutTimeout;
 
             state.videoControl.el.addClass('html5');
@@ -81,7 +81,7 @@ function () {
         state.videoControl.fullScreenEl.on('click', state.videoControl.toggleFullScreen);
         $(document).on('keyup', state.videoControl.exitFullScreen);
 
-        if (state.videoType === 'html5') {
+        if ((state.videoType === 'html5') && (state.config.autohideHtml5)) {
             state.el.on('mousemove', state.videoControl.showControls);
             state.el.on('keydown', state.videoControl.showControls);
         }
diff --git a/common/lib/xmodule/xmodule/js/src/video/05_video_quality_control.js b/common/lib/xmodule/xmodule/js/src/video/05_video_quality_control.js
index cff103468d..fc8449c8d2 100644
--- a/common/lib/xmodule/xmodule/js/src/video/05_video_quality_control.js
+++ b/common/lib/xmodule/xmodule/js/src/video/05_video_quality_control.js
@@ -59,14 +59,24 @@ function () {
     // ***************************************************************
 
     function onQualityChange(value) {
+        var controlStateStr;
         this.videoQualityControl.quality = value;
 
         if (_.indexOf(this.config.availableQualities, value) !== -1) {
-            this.videoQualityControl.el.addClass('active');
+            controlStateStr = gettext('HD on');
+            this.videoQualityControl.el
+                                    .addClass('active')
+                                    .attr('title', controlStateStr)
+                                    .text(controlStateStr);
         } else {
-            this.videoQualityControl.el.removeClass('active');
+            controlStateStr = gettext('HD off');
+            this.videoQualityControl.el
+                                    .removeClass('active')
+                                    .attr('title', controlStateStr)
+                                    .text(controlStateStr);
+
         }
-    }
+    }       
 
     // This function change quality of video.
     // Right now we haven't ability to choose quality of HD video,
diff --git a/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js b/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js
index 71198335e6..21cc64e81c 100644
--- a/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js
+++ b/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js
@@ -34,46 +34,63 @@ function () {
 
     // function _makeFunctionsPublic(state)
     //
-    //     Functions which will be accessible via 'state' object. When called, these functions will
-    //     get the 'state' object as a context.
+    //     Functions which will be accessible via 'state' object. When called,
+    //     these functions will get the 'state' object as a context.
     function _makeFunctionsPublic(state) {
-        state.videoCaption.autoShowCaptions        = _.bind(autoShowCaptions, state);
-        state.videoCaption.autoHideCaptions        = _.bind(autoHideCaptions, state);
-        state.videoCaption.resize                  = _.bind(resize, state);
-        state.videoCaption.toggle                  = _.bind(toggle, state);
-        state.videoCaption.onMouseEnter            = _.bind(onMouseEnter, state);
-        state.videoCaption.onMouseLeave            = _.bind(onMouseLeave, state);
-        state.videoCaption.onMovement              = _.bind(onMovement, state);
-        state.videoCaption.renderCaption           = _.bind(renderCaption, state);
-        state.videoCaption.captionHeight           = _.bind(captionHeight, state);
-        state.videoCaption.topSpacingHeight        = _.bind(topSpacingHeight, state);
-        state.videoCaption.bottomSpacingHeight     = _.bind(bottomSpacingHeight, state);
-        state.videoCaption.scrollCaption           = _.bind(scrollCaption, state);
-        state.videoCaption.search                  = _.bind(search, state);
-        state.videoCaption.play                    = _.bind(play, state);
-        state.videoCaption.pause                   = _.bind(pause, state);
-        state.videoCaption.seekPlayer              = _.bind(seekPlayer, state);
-        state.videoCaption.hideCaptions            = _.bind(hideCaptions, state);
-        state.videoCaption.calculateOffset         = _.bind(calculateOffset, state);
-        state.videoCaption.updatePlayTime          = _.bind(updatePlayTime, state);
-        state.videoCaption.setSubtitlesHeight      = _.bind(setSubtitlesHeight, state);
+        state.videoCaption.autoShowCaptions    = _.bind(
+            autoShowCaptions, state
+        );
+        state.videoCaption.autoHideCaptions    = _.bind(
+            autoHideCaptions, state
+        );
+        state.videoCaption.resize              = _.bind(resize, state);
+        state.videoCaption.toggle              = _.bind(toggle, state);
+        state.videoCaption.onMouseEnter        = _.bind(onMouseEnter, state);
+        state.videoCaption.onMouseLeave        = _.bind(onMouseLeave, state);
+        state.videoCaption.onMovement          = _.bind(onMovement, state);
+        state.videoCaption.renderCaption       = _.bind(renderCaption, state);
+        state.videoCaption.captionHeight       = _.bind(captionHeight, state);
+        state.videoCaption.topSpacingHeight    = _.bind(
+            topSpacingHeight, state
+        );
+        state.videoCaption.bottomSpacingHeight = _.bind(
+            bottomSpacingHeight, state
+        );
+        state.videoCaption.scrollCaption       = _.bind(scrollCaption, state);
+        state.videoCaption.search              = _.bind(search, state);
+        state.videoCaption.play                = _.bind(play, state);
+        state.videoCaption.pause               = _.bind(pause, state);
+        state.videoCaption.seekPlayer          = _.bind(seekPlayer, state);
+        state.videoCaption.hideCaptions        = _.bind(hideCaptions, state);
+        state.videoCaption.calculateOffset     = _.bind(
+            calculateOffset, state
+        );
+        state.videoCaption.updatePlayTime      = _.bind(updatePlayTime, state);
+        state.videoCaption.setSubtitlesHeight  = _.bind(
+            setSubtitlesHeight, state
+        );
 
-        state.videoCaption.renderElements          = _.bind(renderElements, state);
-        state.videoCaption.bindHandlers            = _.bind(bindHandlers, state);
-        state.videoCaption.fetchCaption            = _.bind(fetchCaption, state);
-        state.videoCaption.captionURL              = _.bind(captionURL, state);
-        state.videoCaption.captionMouseOverOut     = _.bind(captionMouseOverOut, state);
-        state.videoCaption.captionMouseDown        = _.bind(captionMouseDown, state);
-        state.videoCaption.captionClick            = _.bind(captionClick, state);
-        state.videoCaption.captionFocus            = _.bind(captionFocus, state);
-        state.videoCaption.captionBlur             = _.bind(captionBlur, state);
-        state.videoCaption.captionKeyDown          = _.bind(captionKeyDown, state);
+        state.videoCaption.renderElements      = _.bind(renderElements, state);
+        state.videoCaption.bindHandlers        = _.bind(bindHandlers, state);
+        state.videoCaption.fetchCaption        = _.bind(fetchCaption, state);
+        state.videoCaption.captionURL          = _.bind(captionURL, state);
+        state.videoCaption.captionMouseOverOut = _.bind(
+            captionMouseOverOut, state
+        );
+        state.videoCaption.captionMouseDown    = _.bind(
+            captionMouseDown, state
+        );
+        state.videoCaption.captionClick        = _.bind(captionClick, state);
+        state.videoCaption.captionFocus        = _.bind(captionFocus, state);
+        state.videoCaption.captionBlur         = _.bind(captionBlur, state);
+        state.videoCaption.captionKeyDown      = _.bind(captionKeyDown, state);
     }
 
     // ***************************************************************
     // Public functions start here.
-    // These are available via the 'state' object. Their context ('this' keyword) is the 'state' object.
-    // The magic private function that makes them available and sets up their context is makeFunctionsPublic().
+    // These are available via the 'state' object. Their context ('this'
+    // keyword) is the 'state' object. The magic private function that makes
+    // them available and sets up their context is makeFunctionsPublic().
     // ***************************************************************
 
     /**
@@ -109,10 +126,13 @@ function () {
 
     // function bindHandlers()
     //
-    //     Bind any necessary function callbacks to DOM events (click, mousemove, etc.).
+    //     Bind any necessary function callbacks to DOM events (click,
+    //     mousemove, etc.).
     function bindHandlers() {
         $(window).bind('resize', this.videoCaption.resize);
-        this.videoCaption.hideSubtitlesEl.on('click', this.videoCaption.toggle);
+        this.videoCaption.hideSubtitlesEl.on(
+            'click', this.videoCaption.toggle
+        );
 
         this.videoCaption.subtitlesEl
             .on(
@@ -132,14 +152,40 @@ function () {
                 this.videoCaption.onMovement
             );
 
-        if (this.videoType === 'html5') {
-            this.el.on('mousemove', this.videoCaption.autoShowCaptions);
-            this.el.on('keydown', this.videoCaption.autoShowCaptions);
+        if ((this.videoType === 'html5') && (this.config.autohideHtml5)) {
+            this.el.on({
+                mousemove: this.videoCaption.autoShowCaptions,
+                keydown: this.videoCaption.autoShowCaptions
+            });
 
-            // Moving slider on subtitles is not a mouse move,
-            // but captions and controls should be showed.
-            this.videoCaption.subtitlesEl.on('scroll', this.videoCaption.autoShowCaptions);
-            this.videoCaption.subtitlesEl.on('scroll', this.videoControl.showControls);
+            // Moving slider on subtitles is not a mouse move, but captions and
+            // controls should be shown.
+            this.videoCaption.subtitlesEl
+                .on(
+                    'scroll', this.videoCaption.autoShowCaptions
+                )
+                .on(
+                    'scroll', this.videoControl.showControls
+                );
+        } else if (!this.config.autohideHtml5) {
+            this.videoCaption.subtitlesEl.on({
+                keydown: this.videoCaption.autoShowCaptions,
+                focus: this.videoCaption.autoShowCaptions,
+
+                // Moving slider on subtitles is not a mouse move, but captions
+                // should not be auto-hidden.
+                scroll: this.videoCaption.autoShowCaptions,
+
+                mouseout: this.videoCaption.autoHideCaptions,
+                blur: this.videoCaption.autoHideCaptions
+            });
+
+            this.videoCaption.hideSubtitlesEl.on({
+                mousemove: this.videoCaption.autoShowCaptions,
+
+                mouseout: this.videoCaption.autoHideCaptions,
+                blur: this.videoCaption.autoHideCaptions
+            });
         }
     }
 
@@ -209,7 +255,8 @@ function () {
     }
 
     function captionURL() {
-        return '' + this.config.caption_asset_path + this.youtubeId('1.0') + '.srt.sjson';
+        return '' + this.config.caption_asset_path +
+            this.youtubeId('1.0') + '.srt.sjson';
     }
 
     function autoShowCaptions(event) {
@@ -224,13 +271,19 @@ function () {
                 this.videoCaption.subtitlesEl.show();
                 this.captionState = 'visible';
             } else if (this.captionState === 'hiding') {
-                this.videoCaption.subtitlesEl.stop(true, false).css('opacity', 1).show();
+                this.videoCaption.subtitlesEl
+                    .stop(true, false).css('opacity', 1).show();
                 this.captionState = 'visible';
             } else if (this.captionState === 'visible') {
                 clearTimeout(this.captionHideTimeout);
             }
 
-            this.captionHideTimeout = setTimeout(this.videoCaption.autoHideCaptions, this.videoCaption.fadeOutTimeout);
+            if (this.config.autohideHtml5) {
+                this.captionHideTimeout = setTimeout(
+                    this.videoCaption.autoHideCaptions,
+                    this.videoCaption.fadeOutTimeout
+                );
+            }
 
             this.captionsShowLock = false;
         }
@@ -249,15 +302,21 @@ function () {
 
         _this = this;
 
-        this.videoCaption.subtitlesEl.fadeOut(this.videoCaption.fadeOutTimeout, function () {
-            _this.captionState = 'invisible';
-        });
+        this.videoCaption.subtitlesEl
+            .fadeOut(
+                this.videoCaption.fadeOutTimeout,
+                function () {
+                    _this.captionState = 'invisible';
+                }
+            );
     }
 
     function resize() {
         this.videoCaption.subtitlesEl
-            .find('.spacing:first').height(this.videoCaption.topSpacingHeight())
-            .find('.spacing:last').height(this.videoCaption.bottomSpacingHeight());
+            .find('.spacing:first')
+            .height(this.videoCaption.topSpacingHeight())
+            .find('.spacing:last')
+            .height(this.videoCaption.bottomSpacingHeight());
 
         this.videoCaption.scrollCaption();
 
@@ -269,7 +328,10 @@ function () {
             clearTimeout(this.videoCaption.frozen);
         }
 
-        this.videoCaption.frozen = setTimeout(this.videoCaption.onMouseLeave, 10000);
+        this.videoCaption.frozen = setTimeout(
+            this.videoCaption.onMouseLeave,
+            this.config.captionsFreezeTime
+        );
     }
 
     function onMouseLeave() {
@@ -285,6 +347,10 @@ function () {
     }
 
     function onMovement() {
+        if (!this.config.autohideHtml5) {
+            this.videoCaption.autoShowCaptions();
+        }
+
         this.videoCaption.onMouseEnter();
     }
 
@@ -292,16 +358,28 @@ function () {
         var container = $('<ol>'),
             _this = this;
 
-        this.el.find('.video-wrapper').after(this.videoCaption.subtitlesEl);
-        this.el.find('.video-controls .secondary-controls').append(this.videoCaption.hideSubtitlesEl);
+        this.elVideoWrapper.after(this.videoCaption.subtitlesEl);
+        this.el.find('.video-controls .secondary-controls')
+            .append(this.videoCaption.hideSubtitlesEl);
 
         this.videoCaption.setSubtitlesHeight();
 
-        if (this.videoType === 'html5') {
+        if ((this.videoType === 'html5') && (this.config.autohideHtml5)) {
             this.videoCaption.fadeOutTimeout = this.config.fadeOutTimeout;
 
             this.videoCaption.subtitlesEl.addClass('html5');
-            this.captionHideTimeout = setTimeout(this.videoCaption.autoHideCaptions, this.videoCaption.fadeOutTimeout);
+            this.captionHideTimeout = setTimeout(
+                this.videoCaption.autoHideCaptions,
+                this.videoCaption.fadeOutTimeout
+            );
+        } else if (!this.config.autohideHtml5) {
+            this.videoCaption.fadeOutTimeout = this.config.fadeOutTimeout;
+            this.videoCaption.subtitlesEl.addClass('html5');
+
+            this.captionHideTimeout = setTimeout(
+                this.videoCaption.autoHideCaptions,
+                0
+            );
         }
 
         this.videoCaption.hideCaptions(this.hide_captions);
@@ -322,17 +400,18 @@ function () {
             container.append(liEl);
         });
 
-        this.videoCaption.subtitlesEl.html(container.html());
-
-        this.videoCaption.subtitlesEl.find('li[data-index]').on({
-            mouseover:  this.videoCaption.captionMouseOverOut,
-            mouseout:   this.videoCaption.captionMouseOverOut,
-            mousedown:  this.videoCaption.captionMouseDown,
-            click:      this.videoCaption.captionClick,
-            focus:      this.videoCaption.captionFocus,
-            blur:       this.videoCaption.captionBlur,
-            keydown:    this.videoCaption.captionKeyDown
-        });
+        this.videoCaption.subtitlesEl
+            .html(container.html())
+            .find('li[data-index]')
+            .on({
+                mouseover:  this.videoCaption.captionMouseOverOut,
+                mouseout:   this.videoCaption.captionMouseOverOut,
+                mousedown:  this.videoCaption.captionMouseDown,
+                click:      this.videoCaption.captionClick,
+                focus:      this.videoCaption.captionFocus,
+                blur:       this.videoCaption.captionBlur,
+                keydown:    this.videoCaption.captionKeyDown
+            });
 
         // Enables or disables automatic scrolling of the captions when the
         // video is playing. This feature has to be disabled when tabbing
@@ -344,16 +423,24 @@ function () {
         this.videoCaption.autoScrolling = true;
         // Keeps track of where the focus is situated in the array of captions.
         // Used to implement the automatic scrolling behavior and decide if the
-        // outline around a caption has to be hidden or shown on a mouseenter or
-        // mouseleave. Initially, no caption has the focus, set the index to -1.
+        // outline around a caption has to be hidden or shown on a mouseenter
+        // or mouseleave. Initially, no caption has the focus, set the
+        // index to -1.
         this.videoCaption.currentCaptionIndex = -1;
         // Used to track if the focus is coming from a click or tabbing. This
         // has to be known to decide if, when a caption gets the focus, an
         // outline has to be drawn (tabbing) or not (mouse click).
         this.videoCaption.isMouseFocus = false;
 
-        this.videoCaption.subtitlesEl.prepend($('<li class="spacing">').height(this.videoCaption.topSpacingHeight()));
-        this.videoCaption.subtitlesEl.append($('<li class="spacing">').height(this.videoCaption.bottomSpacingHeight()));
+        this.videoCaption.subtitlesEl
+            .prepend(
+                $('<li class="spacing">')
+                    .height(this.videoCaption.topSpacingHeight())
+            )
+            .append(
+                $('<li class="spacing">')
+                    .height(this.videoCaption.bottomSpacingHeight())
+            );
 
         this.videoCaption.rendered = true;
     }
@@ -403,7 +490,10 @@ function () {
             caption.addClass('focused');
             // The second and second to last elements turn automatic scrolling
             // off again as it may have been enabled in captionBlur.
-            if (captionIndex <= 1 || captionIndex >= this.videoCaption.captions.length-2) {
+            if (
+                captionIndex <= 1 ||
+                captionIndex >= this.videoCaption.captions.length - 2
+            ) {
                 this.videoCaption.autoScrolling = false;
             }
         }
@@ -413,13 +503,15 @@ function () {
         var caption = $(event.target),
             captionIndex = parseInt(caption.attr('data-index'), 10);
         caption.removeClass('focused');
-        // If we are on first or last index, we have to turn automatic scroll on
-        // again when losing focus. There is no way to know in what direction we
-        // are tabbing. So we could be on the first element and tabbing back out
-        // of the captions or on the last element and tabbing forward out of the
-        // captions.
+        // If we are on first or last index, we have to turn automatic scroll
+        // on again when losing focus. There is no way to know in what
+        // direction we are tabbing. So we could be on the first element and
+        // tabbing back out of the captions or on the last element and tabbing
+        // forward out of the captions.
         if (captionIndex === 0 ||
             captionIndex === this.videoCaption.captions.length-1) {
+            this.videoCaption.autoHideCaptions();
+
             this.videoCaption.autoScrolling = true;
         }
     }
@@ -434,9 +526,13 @@ function () {
     function scrollCaption() {
         var el = this.videoCaption.subtitlesEl.find('.current:first');
 
-        // Automatic scrolling gets disabled if one of the captions has received
-        // focus through tabbing.
-        if (!this.videoCaption.frozen && el.length && this.videoCaption.autoScrolling) {
+        // Automatic scrolling gets disabled if one of the captions has
+        // received focus through tabbing.
+        if (
+            !this.videoCaption.frozen &&
+            el.length &&
+            this.videoCaption.autoScrolling
+        ) {
             this.videoCaption.subtitlesEl.scrollTo(
                 el,
                 {
@@ -565,25 +661,46 @@ function () {
     }
 
     function topSpacingHeight() {
-        return this.videoCaption.calculateOffset(this.videoCaption.subtitlesEl.find('li:not(.spacing):first'));
+        return this.videoCaption.calculateOffset(
+            this.videoCaption.subtitlesEl.find('li:not(.spacing):first')
+        );
     }
 
     function bottomSpacingHeight() {
-        return this.videoCaption.calculateOffset(this.videoCaption.subtitlesEl.find('li:not(.spacing):last'));
+        return this.videoCaption.calculateOffset(
+            this.videoCaption.subtitlesEl.find('li:not(.spacing):last')
+        );
     }
 
     function toggle(event) {
         event.preventDefault();
 
         if (this.el.hasClass('closed')) {
+            this.videoCaption.autoShowCaptions();
             this.videoCaption.hideCaptions(false);
         } else {
             this.videoCaption.hideCaptions(true);
+
+            // In the case when captions are not auto-hidden based on mouse
+            // movement anywhere on the video, we must hide them explicitly
+            // after the "CC" button has been clicked (to hide captions).
+            //
+            // Otherwise, in order for the captions to disappear again, the
+            // user must move the mouse button over the "CC" button, or over
+            // the captions themselves. In this case, an "autoShow" will be
+            // triggered, and after a timeout, an "autoHide".
+            if (!this.config.autohideHtml5) {
+                this.captionHideTimeout = setTimeout(
+                    this.videoCaption.autoHideCaptions(),
+                    0
+                );
+            }
         }
     }
 
     function hideCaptions(hide_captions, update_cookie) {
-        var type;
+        var hideSubtitlesEl = this.videoCaption.hideSubtitlesEl,
+            type;
 
         if (typeof update_cookie === 'undefined') {
             update_cookie = true;
@@ -592,14 +709,20 @@ function () {
         if (hide_captions) {
             type = 'hide_transcript';
             this.captionsHidden = true;
-            this.videoCaption.hideSubtitlesEl.attr('title', gettext('Turn on captions'));
-            this.videoCaption.hideSubtitlesEl.text(gettext('Turn on captions'));
+
+            hideSubtitlesEl
+                .attr('title', gettext('Turn on captions'))
+                .text(gettext('Turn on captions'));
+
             this.el.addClass('closed');
         } else {
             type = 'show_transcript';
             this.captionsHidden = false;
-            this.videoCaption.hideSubtitlesEl.attr('title', gettext('Turn off captions'));
-            this.videoCaption.hideSubtitlesEl.text(gettext('Turn off captions'));
+
+            hideSubtitlesEl
+                .attr('title', gettext('Turn off captions'))
+                .text(gettext('Turn off captions'));
+
             this.el.removeClass('closed');
             this.videoCaption.scrollCaption();
         }
@@ -621,27 +744,43 @@ function () {
     }
 
     function captionHeight() {
+        var paddingTop;
+
         if (this.isFullScreen) {
-            return $(window).height() - this.el.find('.video-controls').height() -
-                    0.5 * this.videoControl.sliderEl.height() -
-                    2 * parseInt(this.videoCaption.subtitlesEl.css('padding-top'), 10);
+            paddingTop = parseInt(
+                this.videoCaption.subtitlesEl.css('padding-top'), 10
+            );
+
+            return $(window).height() -
+                this.videoControl.el.height() -
+                0.5 * this.videoControl.sliderEl.height() -
+                2 * paddingTop;
         } else {
-            return this.el.find('.video-wrapper').height();
+            return this.elVideoWrapper.height();
         }
     }
 
     function setSubtitlesHeight() {
         var height = 0;
-        if (this.videoType === 'html5'){
+        if (
+            ((this.videoType === 'html5') && (this.config.autohideHtml5)) ||
+            (!this.config.autohideHtml5)
+        ){
             // on page load captionHidden = undefined
             if  (
-                (this.captionsHidden === undefined && this.hide_captions === true ) ||
-                (this.captionsHidden === true) ) {
-                // In case of html5 autoshowing subtitles,
-                // we ajdust height of subs, by height of scrollbar
-                height = this.videoControl.el.height() + 0.5 * this.videoControl.sliderEl.height();
-                // height of videoControl does not contain height of slider.
-                // (css is set to absolute, to avoid yanking when slider autochanges its height)
+                (
+                    this.captionsHidden === undefined &&
+                    this.hide_captions === true
+                ) ||
+                (this.captionsHidden === true)
+            ) {
+                // In case of html5 autoshowing subtitles, we adjust height of
+                // subs, by height of scrollbar.
+                height = this.videoControl.el.height() +
+                    0.5 * this.videoControl.sliderEl.height();
+                // Height of videoControl does not contain height of slider.
+                // css is set to absolute, to avoid yanking when slider
+                // autochanges its height.
             }
         }
         this.videoCaption.subtitlesEl.css({
diff --git a/common/lib/xmodule/xmodule/js/src/video/10_main.js b/common/lib/xmodule/xmodule/js/src/video/10_main.js
index df81ba898e..9f20a1c87e 100644
--- a/common/lib/xmodule/xmodule/js/src/video/10_main.js
+++ b/common/lib/xmodule/xmodule/js/src/video/10_main.js
@@ -1,5 +1,42 @@
 (function (requirejs, require, define) {
 
+// In the case when the Video constructor will be called before
+// RequireJS finishes loading all of the Video dependencies, we will have
+// a mock function that will collect all the elements that must be
+// initialized as Video elements.
+//
+// Once RequireJS will load all of the necessary dependencies, main code
+// will invoke the mock function with the second parameter set to truthy value.
+// This will trigger the actual Video constructor on all elements that
+// are stored in a temporary list.
+window.Video = (function () {
+    // Temporary storage place for elements that must be initialized as Video
+    // elements.
+    var tempCallStack = [];
+
+    return function (element, processTempCallStack) {
+        // If mock function was called with second parameter set to truthy
+        // value, we invoke the real `window.Video` on all the stored elements
+        // so far.
+        if (processTempCallStack) {
+            $.each(tempCallStack, function (index, element) {
+                // By now, `window.Video` is the real constructor.
+                window.Video(element);
+            });
+
+            return;
+        }
+
+        // If normal call to `window.Video` constructor, store the element
+        // for later initializing.
+        tempCallStack.push(element);
+
+        // Real Video constructor returns the `state` object. The mock
+        // function will return an empty object.
+        return {};
+    };
+}());
+
 // Main module.
 require(
 [
@@ -23,7 +60,8 @@ function (
     VideoCaption
 ) {
     var previousState,
-        youtubeXhr = null;
+        youtubeXhr = null,
+        oldVideo = window.Video;
 
     // Because this constructor can be called multiple times on a single page (when
     // the user switches verticals, the page doesn't reload, but the content changes), we must
@@ -79,6 +117,10 @@ function (
     window.Video.clearYoutubeXhr = function () {
         youtubeXhr = null;
     };
+
+    // Invoke the mock Video constructor so that the elements stored within
+    // it can be processed by the real `window.Video` constructor.
+    oldVideo(null, true);
 });
 
 }(RequireJS.requirejs, RequireJS.require, RequireJS.define));
diff --git a/common/lib/xmodule/xmodule/lti_module.py b/common/lib/xmodule/xmodule/lti_module.py
index e2c4832251..cea54e6e3d 100644
--- a/common/lib/xmodule/xmodule/lti_module.py
+++ b/common/lib/xmodule/xmodule/lti_module.py
@@ -8,12 +8,15 @@ http://www.imsglobal.org/LTI/v1p1p1/ltiIMGv1p1p1.html
 import logging
 import oauthlib.oauth1
 import urllib
+import json
 
 from xmodule.editing_module import MetadataOnlyEditingDescriptor
+from xmodule.raw_module import EmptyDataRawDescriptor
 from xmodule.x_module import XModule
 from xmodule.course_module import CourseDescriptor
 from pkg_resources import resource_string
 from xblock.core import String, Scope, List
+from xblock.fields import Boolean
 
 log = logging.getLogger(__name__)
 
@@ -45,6 +48,7 @@ class LTIFields(object):
     lti_id = String(help="Id of the tool", default='', scope=Scope.settings)
     launch_url = String(help="URL of the tool", default='http://www.example.com', scope=Scope.settings)
     custom_parameters = List(help="Custom parameters (vbid, book_location, etc..)", scope=Scope.settings)
+    open_in_a_new_page = Boolean(help="Should LTI be opened in new page?", default=True, scope=Scope.settings)
 
 
 class LTIModule(LTIFields, XModule):
@@ -92,10 +96,10 @@ class LTIModule(LTIFields, XModule):
 
             <form
                     action="${launch_url}"
-                    name="ltiLaunchForm"
+                    name="ltiLaunchForm-${element_id}"
                     class="ltiLaunchForm"
                     method="post"
-                    target="ltiLaunchFrame"
+                    target="ltiLaunchFrame-${element_id}"
                     encType="application/x-www-form-urlencoded"
                 >
                     <input name="launch_presentation_return_url" value="" />
@@ -169,14 +173,15 @@ class LTIModule(LTIFields, XModule):
             client_key,
             client_secret
         )
-
         context = {
             'input_fields': input_fields,
 
             # these params do not participate in oauth signing
             'launch_url': self.launch_url,
             'element_id': self.location.html_id(),
-            'element_class': self.location.category,
+            'element_class': self.category,
+            'open_in_a_new_page': self.open_in_a_new_page,
+            'display_name': self.display_name,
         }
 
         return self.system.render_template('lti.html', context)
@@ -254,8 +259,8 @@ oauth_consumer_key="", oauth_signature="frVp4JuvT1mVXlxktiAUjQ7%2F1cw%3D"'}
         return params
 
 
-class LTIModuleDescriptor(LTIFields, MetadataOnlyEditingDescriptor):
+class LTIModuleDescriptor(LTIFields, MetadataOnlyEditingDescriptor, EmptyDataRawDescriptor):
     """
-    LTIModuleDescriptor provides no export/import to xml.
+    Descriptor for LTI Xmodule.
     """
     module_class = LTIModule
diff --git a/common/lib/xmodule/xmodule/modulestore/django.py b/common/lib/xmodule/xmodule/modulestore/django.py
index 284f5e4eb7..f608c98619 100644
--- a/common/lib/xmodule/xmodule/modulestore/django.py
+++ b/common/lib/xmodule/xmodule/modulestore/django.py
@@ -7,10 +7,13 @@ Passes settings.MODULESTORE as kwargs to MongoModuleStore
 from __future__ import absolute_import
 from importlib import import_module
 
+import re
+
 from django.conf import settings
 from django.core.cache import get_cache, InvalidCacheBackendError
 from django.dispatch import Signal
 from xmodule.modulestore.loc_mapper_store import LocMapperStore
+from xmodule.util.django import get_current_request_hostname
 
 # We may not always have the request_cache module available
 try:
@@ -67,11 +70,41 @@ def create_modulestore_instance(engine, options):
     )
 
 
-def modulestore(name='default'):
+def get_default_store_name_for_current_request():
+    """
+    This method will return the appropriate default store mapping for the current Django request,
+    else 'default' which is the system default
+    """
+    store_name = 'default'
+
+    # see what request we are currently processing - if any at all - and get hostname for the request
+    hostname = get_current_request_hostname()
+
+    # get mapping information which is defined in configurations
+    mappings = getattr(settings, 'HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS', None)
+   
+    # compare hostname against the regex expressions set of mappings
+    # which will tell us which store name to use
+    if hostname and mappings:
+        for key in mappings.keys():
+            if re.match(key, hostname):
+                store_name = mappings[key]
+                return store_name
+
+    return store_name
+
+
+def modulestore(name=None):
     """
     This returns an instance of a modulestore of given name. This will wither return an existing
     modulestore or create a new one
     """
+
+    if not name:
+        # If caller did not specify name then we should
+        # determine what should be the default
+        name = get_default_store_name_for_current_request()
+
     if name not in _MODULESTORES:
         _MODULESTORES[name] = create_modulestore_instance(settings.MODULESTORE[name]['ENGINE'],
                                                           settings.MODULESTORE[name]['OPTIONS'])
diff --git a/common/lib/xmodule/xmodule/modulestore/mongo/base.py b/common/lib/xmodule/xmodule/modulestore/mongo/base.py
index 2843287055..c49b413638 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo/base.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo/base.py
@@ -21,7 +21,6 @@ from bson.son import SON
 from fs.osfs import OSFS
 from itertools import repeat
 from path import path
-from operator import attrgetter
 
 from importlib import import_module
 from xmodule.errortracker import null_error_tracker, exc_info_to_str
@@ -81,7 +80,7 @@ class MongoKeyValueStore(InheritanceKeyValueStore):
             else:
                 return self._data[key.field_name]
         else:
-            raise InvalidScopeError(key.scope)
+            raise InvalidScopeError(key)
 
     def set(self, key, value):
         if key.scope == Scope.children:
@@ -94,7 +93,7 @@ class MongoKeyValueStore(InheritanceKeyValueStore):
             else:
                 self._data[key.field_name] = value
         else:
-            raise InvalidScopeError(key.scope)
+            raise InvalidScopeError(key)
 
     def delete(self, key):
         if key.scope == Scope.children:
@@ -108,7 +107,7 @@ class MongoKeyValueStore(InheritanceKeyValueStore):
             else:
                 del self._data[key.field_name]
         else:
-            raise InvalidScopeError(key.scope)
+            raise InvalidScopeError(key)
 
     def has(self, key):
         if key.scope in (Scope.children, Scope.parent):
@@ -246,7 +245,9 @@ def location_to_query(location, wildcard=True):
     return query
 
 
-metadata_cache_key = attrgetter('org', 'course')
+def metadata_cache_key(location):
+    """Turn a `Location` into a useful cache key."""
+    return u"{0.org}/{0.course}".format(location)
 
 
 class MongoModuleStore(ModuleStoreBase):
diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py
index 02f5aad9f5..54007fda73 100644
--- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py
@@ -53,12 +53,12 @@ class SplitMongoKVS(InheritanceKeyValueStore):
 
             raise KeyError()
         else:
-            raise InvalidScopeError(key.scope)
+            raise InvalidScopeError(key)
 
     def set(self, key, value):
         # handle any special cases
         if key.scope not in [Scope.children, Scope.settings, Scope.content]:
-            raise InvalidScopeError(key.scope)
+            raise InvalidScopeError(key)
         if key.scope == Scope.content:
             self._load_definition()
 
@@ -75,7 +75,7 @@ class SplitMongoKVS(InheritanceKeyValueStore):
     def delete(self, key):
         # handle any special cases
         if key.scope not in [Scope.children, Scope.settings, Scope.content]:
-            raise InvalidScopeError(key.scope)
+            raise InvalidScopeError(key)
         if key.scope == Scope.content:
             self._load_definition()
 
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/factories.py b/common/lib/xmodule/xmodule/modulestore/tests/factories.py
index 5b7f9ec3d7..7d887bb81b 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/factories.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/factories.py
@@ -7,7 +7,6 @@ from pytz import UTC
 
 from xmodule.modulestore import Location
 from xmodule.x_module import XModuleDescriptor
-from xmodule.course_module import CourseDescriptor
 
 
 class Dummy(object):
@@ -124,16 +123,28 @@ class ItemFactory(XModuleFactory):
         :target_class: is ignored
         """
 
+        # All class attributes (from this class and base classes) are
+        # passed in via **kwargs. However, some of those aren't actual field values,
+        # so pop those off for use separately
+
         DETACHED_CATEGORIES = ['about', 'static_tab', 'course_info']
         # catch any old style users before they get into trouble
-        assert not 'template' in kwargs
-        data = kwargs.get('data')
-        category = kwargs.get('category')
-        display_name = kwargs.get('display_name')
-        metadata = kwargs.get('metadata', {})
-        location = kwargs.get('location')
-        if kwargs.get('boilerplate') is not None:
-            template_id = kwargs.get('boilerplate')
+        assert 'template' not in kwargs
+        parent_location = Location(kwargs.pop('parent_location', None))
+        data = kwargs.pop('data', None)
+        category = kwargs.pop('category', None)
+        display_name = kwargs.pop('display_name', None)
+        metadata = kwargs.pop('metadata', {})
+        location = kwargs.pop('location')
+        assert location != parent_location
+
+        store = kwargs.pop('modulestore')
+
+        # This code was based off that in cms/djangoapps/contentstore/views.py
+        parent = kwargs.pop('parent', None) or store.get_item(parent_location)
+
+        if 'boilerplate' in kwargs:
+            template_id = kwargs.pop('boilerplate')
             clz = XModuleDescriptor.load_class(category)
             template = clz.get_template(template_id)
             assert template is not None
@@ -141,21 +152,20 @@ class ItemFactory(XModuleFactory):
             if not isinstance(data, basestring):
                 data.update(template.get('data'))
 
-        store = kwargs.get('modulestore')
-
         # replace the display name with an optional parameter passed in from the caller
         if display_name is not None:
             metadata['display_name'] = display_name
-        store.create_and_save_xmodule(location, metadata=metadata, definition_data=data)
+        module = store.create_and_save_xmodule(location, metadata=metadata, definition_data=data)
+
+        module = store.get_item(location)
+
+        for attr, val in kwargs.items():
+            setattr(module, attr, val)
+        module.save()
+
+        store.save_xmodule(module)
 
         if location.category not in DETACHED_CATEGORIES:
-
-            parent_location = Location(kwargs.get('parent_location'))
-            assert location != parent_location
-
-            # This code was based off that in cms/djangoapps/contentstore/views.py
-            parent = kwargs.get('parent') or store.get_item(parent_location)
-
             parent.children.append(location.url())
             store.update_children(parent_location, parent.children)
 
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_publish.py b/common/lib/xmodule/xmodule/modulestore/tests/test_publish.py
index 3b535c6738..99d0e8dbd3 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_publish.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_publish.py
@@ -129,7 +129,7 @@ class TestPublish(unittest.TestCase):
         """
         Applies action depth-first down tree and to item last.
 
-        A copy of  cms.djangoapps.contentstore.views.requests._xmodule_recurse to reproduce its use and behavior
+        A copy of  cms.djangoapps.contentstore.views.helpers._xmodule_recurse to reproduce its use and behavior
         outside of django.
         """
         for child in item.get_children():
diff --git a/common/lib/xmodule/xmodule/modulestore/xml.py b/common/lib/xmodule/xmodule/modulestore/xml.py
index a8e9da03d7..1e7074a847 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml.py
@@ -204,7 +204,7 @@ class ImportSystem(XMLParsingSystem, MakoDescriptorSystem):
             descriptor.save()
             return descriptor
 
-        render_template = lambda: ''
+        render_template = lambda template, context: u''
         # TODO (vshnayder): we are somewhat architecturally confused in the loading code:
         # load_item should actually be get_instance, because it expects the course-specific
         # policy to be loaded.  For now, just add the course_id here...
diff --git a/common/lib/xmodule/xmodule/modulestore/xml_exporter.py b/common/lib/xmodule/xmodule/modulestore/xml_exporter.py
index a54d188b61..feb0a2ccfa 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml_exporter.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml_exporter.py
@@ -38,7 +38,7 @@ def export_to_xml(modulestore, contentstore, course_location, root_dir, course_d
     Export all modules from `modulestore` and content from `contentstore` as xml to `root_dir`.
 
     `modulestore`: A `ModuleStore` object that is the source of the modules to export
-    `contentstore`: A `ContentStore` object that is the source of the content to export
+    `contentstore`: A `ContentStore` object that is the source of the content to export, can be None
     `course_location`: The `Location` of the `CourseModuleDescriptor` to export
     `root_dir`: The directory to write the exported xml to
     `course_dir`: The name of the directory inside `root_dir` to write the course content to
@@ -46,7 +46,12 @@ def export_to_xml(modulestore, contentstore, course_location, root_dir, course_d
         alongside the public content in the course.
     """
 
-    course = modulestore.get_item(course_location)
+    # we use get_instance instead of get_item to support modulestores
+    # that can't guarantee that definitions are unique
+    course = modulestore.get_instance(
+        course_location.course_id,
+        course_location
+    )
 
     fs = OSFS(root_dir)
     export_fs = fs.makeopendir(course_dir)
@@ -55,13 +60,14 @@ def export_to_xml(modulestore, contentstore, course_location, root_dir, course_d
     with export_fs.open('course.xml', 'w') as course_xml:
         course_xml.write(xml)
 
-    policies_dir = export_fs.makeopendir('policies')
     # export the static assets
-    contentstore.export_all_for_course(
-        course_location,
-        root_dir + '/' + course_dir + '/static/',
-        root_dir + '/' + course_dir + '/policies/assets.json',
-    )
+    policies_dir = export_fs.makeopendir('policies')
+    if contentstore:
+        contentstore.export_all_for_course(
+            course_location,
+            root_dir + '/' + course_dir + '/static/',
+            root_dir + '/' + course_dir + '/policies/assets.json',
+        )
 
     # export the static tabs
     export_extra_content(export_fs, modulestore, course_location, 'static_tab', 'tabs', '.html')
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
index 45a5379683..8c3da6d5b2 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
@@ -819,10 +819,14 @@ class CombinedOpenEndedV1Module():
         Output: The status html to be rendered
         """
         status = []
+        current_task_human_name = ""
         for i in xrange(0, len(self.task_xml)):
             human_task_name = self.extract_human_name_from_task(self.task_xml[i])
 
-            task_data = {'task_number': i + 1, 'human_task' : human_task_name, 'current' : self.current_task_number==i}
+            # Extract the name of the current task for screen readers.
+            if self.current_task_number == i:
+                current_task_human_name = human_task_name
+            task_data = {'task_number': i + 1, 'human_task': human_task_name, 'current': self.current_task_number==i}
             status.append(task_data)
 
         context = {
@@ -830,6 +834,7 @@ class CombinedOpenEndedV1Module():
             'grader_type_image_dict': GRADER_TYPE_IMAGE_DICT,
             'legend_list': LEGEND_LIST,
             'render_via_ajax': render_via_ajax,
+            'current_task_human_name': current_task_human_name,
         }
         status_html = self.system.render_template("{0}/combined_open_ended_status.html".format(self.TEMPLATE_DIR),
                                                   context)
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
index 2d973aa9ed..8b88e676ae 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
@@ -696,6 +696,13 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             correct = ""
         previous_answer = self.get_display_answer()
 
+        # Use the module name as a unique id to pass to the template.
+        try:
+            module_id = self.system.location.name
+        except AttributeError:
+            # In cases where we don't have a system or a location, use a fallback.
+            module_id = "open_ended"
+
         context = {
             'prompt': self.child_prompt,
             'previous_answer': previous_answer,
@@ -703,7 +710,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             'allow_reset': self._allow_reset(),
             'rows': 30,
             'cols': 80,
-            'id': 'open_ended',
+            'module_id': module_id,
             'msg': post_assessment,
             'child_type': 'openended',
             'correct': correct,
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
index 6c0d1bbf08..d36aa7d62c 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
@@ -57,6 +57,13 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         # set context variables and render template
         previous_answer = self.get_display_answer()
 
+        # Use the module name as a unique id to pass to the template.
+        try:
+            module_id = self.system.location.name
+        except AttributeError:
+            # In cases where we don't have a system or a location, use a fallback.
+            module_id = "self_assessment"
+
         context = {
             'prompt': self.child_prompt,
             'previous_answer': previous_answer,
@@ -66,6 +73,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
             'allow_reset': self._allow_reset(),
             'child_type': 'selfassessment',
             'accept_file_upload': self.accept_file_upload,
+            'module_id': module_id,
         }
 
         html = system.render_template('{0}/self_assessment_prompt.html'.format(self.TEMPLATE_DIR), context)
diff --git a/common/lib/xmodule/xmodule/peer_grading_module.py b/common/lib/xmodule/xmodule/peer_grading_module.py
index c363d9a1f8..3bd101afcf 100644
--- a/common/lib/xmodule/xmodule/peer_grading_module.py
+++ b/common/lib/xmodule/xmodule/peer_grading_module.py
@@ -6,7 +6,7 @@ from lxml import etree
 from datetime import datetime
 from pkg_resources import resource_string
 from .capa_module import ComplexEncoder
-from .x_module import XModule
+from .x_module import XModule, module_attr
 from xmodule.raw_module import RawDescriptor
 from xmodule.modulestore.exceptions import ItemNotFoundError, NoPathToItem
 from .timeinfo import TimeInfo
@@ -106,7 +106,7 @@ class PeerGradingModule(PeerGradingFields, XModule):
 
         #We need to set the location here so the child modules can use it
         self.runtime.set('location', self.location)
-        if (self.system.open_ended_grading_interface):
+        if (self.runtime.open_ended_grading_interface):
             self.peer_gs = PeerGradingService(self.system.open_ended_grading_interface, self.system)
         else:
             self.peer_gs = MockPeerGradingService()
@@ -662,3 +662,19 @@ class PeerGradingDescriptor(PeerGradingFields, RawDescriptor):
             return [self.system.load_item(self.link_to_location)]
         else:
             return []
+
+    # Proxy to PeerGradingModule so that external callers don't have to know if they're working
+    # with a module or a descriptor
+    closed = module_attr('closed')
+    get_instance_state = module_attr('get_instance_state')
+    get_next_submission = module_attr('get_next_submission')
+    is_student_calibrated = module_attr('is_student_calibrated')
+    peer_grading = module_attr('peer_grading')
+    peer_grading_closed = module_attr('peer_grading_closed')
+    peer_grading_problem = module_attr('peer_grading_problem')
+    peer_gs = module_attr('peer_gs')
+    query_data_for_location = module_attr('query_data_for_location')
+    save_calibration_essay = module_attr('save_calibration_essay')
+    save_grade = module_attr('save_grade')
+    show_calibration_essay = module_attr('show_calibration_essay')
+    _find_corresponding_module_for_location = module_attr('_find_corresponding_module_for_location')
diff --git a/common/lib/xmodule/xmodule/randomize_module.py b/common/lib/xmodule/xmodule/randomize_module.py
index 0cc853fd90..00baf3f140 100644
--- a/common/lib/xmodule/xmodule/randomize_module.py
+++ b/common/lib/xmodule/xmodule/randomize_module.py
@@ -7,6 +7,7 @@ from xmodule.seq_module import SequenceDescriptor
 from lxml import etree
 
 from xblock.fields import Scope, Integer
+from xblock.fragment import Fragment
 
 log = logging.getLogger('mitx.' + __name__)
 
@@ -77,12 +78,12 @@ class RandomizeModule(RandomizeFields, XModule):
         return [self.child_descriptor]
 
 
-    def get_html(self):
+    def student_view(self, context):
         if self.child is None:
             # raise error instead?  In fact, could complain on descriptor load...
-            return u"<div>Nothing to randomize between</div>"
+            return Fragment(content=u"<div>Nothing to randomize between</div>")
 
-        return self.runtime.render_child(self.child, None, 'student_view').content
+        return self.child.render('student_view', context)
 
     def get_icon_class(self):
         return self.child.get_icon_class() if self.child else 'other'
diff --git a/common/lib/xmodule/xmodule/seq_module.py b/common/lib/xmodule/xmodule/seq_module.py
index 7890edd586..c0c9bfc1a0 100644
--- a/common/lib/xmodule/xmodule/seq_module.py
+++ b/common/lib/xmodule/xmodule/seq_module.py
@@ -9,6 +9,7 @@ from xmodule.x_module import XModule
 from xmodule.progress import Progress
 from xmodule.exceptions import NotFoundError
 from xblock.fields import Integer, Scope
+from xblock.fragment import Fragment
 from pkg_resources import resource_string
 
 log = logging.getLogger(__name__)
@@ -43,15 +44,6 @@ class SequenceModule(SequenceFields, XModule):
         if getattr(self.system, 'position', None) is not None:
             self.position = int(self.system.position)
 
-        self.rendered = False
-
-    def get_instance_state(self):
-        return json.dumps({'position': self.position})
-
-    def get_html(self):
-        self.render()
-        return self.content
-
     def get_progress(self):
         ''' Return the total progress, adding total done and total available.
         (assumes that each submodule uses the same "units" for progress.)
@@ -69,20 +61,24 @@ class SequenceModule(SequenceFields, XModule):
             return json.dumps({'success': True})
         raise NotFoundError('Unexpected dispatch type')
 
-    def render(self):
+    def student_view(self, context):
         # If we're rendering this sequence, but no position is set yet,
         # default the position to the first element
         if self.position is None:
             self.position = 1
 
-        if self.rendered:
-            return
         ## Returns a set of all types of all sub-children
         contents = []
+
+        fragment = Fragment()
+
         for child in self.get_display_items():
             progress = child.get_progress()
+            rendered_child = child.render('student_view', context)
+            fragment.add_frag_resources(rendered_child)
+
             childinfo = {
-                'content': self.runtime.render_child(child, None, 'student_view').content,
+                'content': rendered_child.content,
                 'title': "\n".join(
                     grand_child.display_name
                     for grand_child in child.get_children()
@@ -101,11 +97,12 @@ class SequenceModule(SequenceFields, XModule):
                   'element_id': self.location.html_id(),
                   'item_id': self.id,
                   'position': self.position,
-                  'tag': self.location.category
+                  'tag': self.location.category,
                   }
 
-        self.content = self.system.render_template('seq_module.html', params)
-        self.rendered = True
+        fragment.add_content(self.system.render_template('seq_module.html', params))
+
+        return fragment
 
     def get_icon_class(self):
         child_classes = set(child.get_icon_class()
diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py
index e4ce338458..2ea9040a1e 100644
--- a/common/lib/xmodule/xmodule/tests/__init__.py
+++ b/common/lib/xmodule/xmodule/tests/__init__.py
@@ -9,6 +9,7 @@ Run like this:
 
 import json
 import os
+import pprint
 import unittest
 
 from mock import Mock
@@ -18,6 +19,7 @@ from xblock.field_data import DictFieldData
 from xmodule.x_module import ModuleSystem, XModuleDescriptor, XModuleMixin
 from xmodule.modulestore.inheritance import InheritanceMixin
 from xmodule.mako_module import MakoDescriptorSystem
+from xmodule.error_module import ErrorDescriptor
 
 
 # Location of common test DATA directory
@@ -54,18 +56,18 @@ def get_test_system(course_id=''):
         ajax_url='courses/course_id/modx/a_location',
         track_function=Mock(),
         get_module=Mock(),
-        render_template=lambda template, context: repr(context),
-        replace_urls=lambda html: str(html),
+        render_template=mock_render_template,
+        replace_urls=str,
         user=Mock(is_staff=False),
         filestore=Mock(),
         debug=True,
         hostname="edx.org",
         xqueue={'interface': None, 'callback_url': '/', 'default_queuename': 'testqueue', 'waittime': 10, 'construct_callback' : Mock(side_effect="/")},
         node_path=os.environ.get("NODE_PATH", "/usr/local/lib/node_modules"),
-        xmodule_field_data=lambda descriptor: descriptor._field_data,
         anonymous_student_id='student',
         open_ended_grading_interface=open_ended_grading_interface,
         course_id=course_id,
+        error_descriptor_class=ErrorDescriptor,
     )
 
 
@@ -77,11 +79,21 @@ def get_test_descriptor_system():
         load_item=Mock(),
         resources_fs=Mock(),
         error_tracker=Mock(),
-        render_template=lambda template, context: repr(context),
+        render_template=mock_render_template,
         mixins=(InheritanceMixin, XModuleMixin),
     )
 
 
+def mock_render_template(*args, **kwargs):
+    """
+    Pretty-print the args and kwargs.
+
+    Allows us to not depend on any actual template rendering mechanism,
+    while still returning a unicode object
+    """
+    return pprint.pformat((args, kwargs)).decode()
+
+
 class ModelsTest(unittest.TestCase):
     def setUp(self):
         pass
diff --git a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py
index 2b454ff45b..ae65eb66d6 100644
--- a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py
@@ -52,7 +52,7 @@ class AnnotatableModuleTestCase(unittest.TestCase):
 
         actual_attr = self.annotatable._get_annotation_data_attr(0, el)
 
-        self.assertTrue(type(actual_attr) is dict)
+        self.assertIsInstance(actual_attr, dict)
         self.assertDictEqual(expected_attr, actual_attr)
 
     def test_annotation_class_attr_default(self):
@@ -62,7 +62,7 @@ class AnnotatableModuleTestCase(unittest.TestCase):
         expected_attr = { 'class': { 'value': 'annotatable-span highlight' } }
         actual_attr = self.annotatable._get_annotation_class_attr(0, el)
 
-        self.assertTrue(type(actual_attr) is dict)
+        self.assertIsInstance(actual_attr, dict)
         self.assertDictEqual(expected_attr, actual_attr)
 
     def test_annotation_class_attr_with_valid_highlight(self):
@@ -78,7 +78,7 @@ class AnnotatableModuleTestCase(unittest.TestCase):
             }
             actual_attr = self.annotatable._get_annotation_class_attr(0, el)
 
-            self.assertTrue(type(actual_attr) is dict)
+            self.assertIsInstance(actual_attr, dict)
             self.assertDictEqual(expected_attr, actual_attr)
 
     def test_annotation_class_attr_with_invalid_highlight(self):
@@ -92,7 +92,7 @@ class AnnotatableModuleTestCase(unittest.TestCase):
             }
             actual_attr = self.annotatable._get_annotation_class_attr(0, el)
 
-            self.assertTrue(type(actual_attr) is dict)
+            self.assertIsInstance(actual_attr, dict)
             self.assertDictEqual(expected_attr, actual_attr)
 
     def test_render_annotation(self):
diff --git a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
index 65fc2bb608..9aa5aeb5ce 100644
--- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
+++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
@@ -350,11 +350,11 @@ class OpenEndedModuleTest(unittest.TestCase):
         """
         Test storing answer with the open ended module.
         """
-        
+
         # Create a module with no state yet.  Important that this start off as a blank slate.
         test_module = OpenEndedModule(self.test_system, self.location,
                                                 self.definition, self.descriptor, self.static_data, self.metadata)
-        
+
         saved_response = "Saved response."
         submitted_response = "Submitted response."
 
@@ -519,7 +519,7 @@ class CombinedOpenEndedModuleTest(unittest.TestCase):
         """
         See if we can get the max score from the actual xmodule
         """
-        #The progress view requires that this function be exposed
+        # The progress view requires that this function be exposed
         max_score = self.combinedoe_container.max_score()
         self.assertEqual(max_score, None)
 
@@ -751,30 +751,38 @@ class OpenEndedModuleXmlTest(unittest.TestCase, DummyModulestore):
         assessment = [0, 1]
         module = self.get_module_from_location(self.problem_location, COURSE)
 
-        #Simulate a student saving an answer
+        # Simulate a student saving an answer
         html = module.handle_ajax("get_html", {})
+        module.save()
         module.handle_ajax("save_answer", {"student_answer": self.answer})
+        module.save()
         html = module.handle_ajax("get_html", {})
+        module.save()
 
-        #Mock a student submitting an assessment
+        # Mock a student submitting an assessment
         assessment_dict = MockQueryDict()
         assessment_dict.update({'assessment': sum(assessment), 'score_list[]': assessment})
         module.handle_ajax("save_assessment", assessment_dict)
+        module.save()
         task_one_json = json.loads(module.task_states[0])
         self.assertEqual(json.loads(task_one_json['child_history'][0]['post_assessment']), assessment)
         rubric = module.handle_ajax("get_combined_rubric", {})
+        module.save()
 
-        #Move to the next step in the problem
+        # Move to the next step in the problem
         module.handle_ajax("next_problem", {})
+        module.save()
         self.assertEqual(module.current_task_number, 0)
 
-        html = module.get_html()
-        self.assertTrue(isinstance(html, basestring))
+        html = module.render('student_view').content
+        self.assertIsInstance(html, basestring)
 
         rubric = module.handle_ajax("get_combined_rubric", {})
-        self.assertTrue(isinstance(rubric, basestring))
+        module.save()
+        self.assertIsInstance(rubric, basestring)
         self.assertEqual(module.state, "assessing")
         module.handle_ajax("reset", {})
+        module.save()
         self.assertEqual(module.current_task_number, 0)
 
     def test_open_ended_flow_correct(self):
@@ -784,38 +792,43 @@ class OpenEndedModuleXmlTest(unittest.TestCase, DummyModulestore):
         @return:
         """
         assessment = [1, 1]
-        #Load the module
+        # Load the module
         module = self.get_module_from_location(self.problem_location, COURSE)
 
-        #Simulate a student saving an answer
+        # Simulate a student saving an answer
         module.handle_ajax("save_answer", {"student_answer": self.answer})
+        module.save()
         status = module.handle_ajax("get_status", {})
-        self.assertTrue(isinstance(status, basestring))
+        module.save()
+        self.assertIsInstance(status, basestring)
 
-        #Mock a student submitting an assessment
+        # Mock a student submitting an assessment
         assessment_dict = MockQueryDict()
         assessment_dict.update({'assessment': sum(assessment), 'score_list[]': assessment})
         module.handle_ajax("save_assessment", assessment_dict)
+        module.save()
         task_one_json = json.loads(module.task_states[0])
         self.assertEqual(json.loads(task_one_json['child_history'][0]['post_assessment']), assessment)
 
-        #Move to the next step in the problem
+        # Move to the next step in the problem
         try:
             module.handle_ajax("next_problem", {})
+            module.save()
         except GradingServiceError:
-            #This error is okay.  We don't have a grading service to connect to!
+            # This error is okay.  We don't have a grading service to connect to!
             pass
         self.assertEqual(module.current_task_number, 1)
         try:
-            module.get_html()
+            module.render('student_view')
         except GradingServiceError:
-            #This error is okay.  We don't have a grading service to connect to!
+            # This error is okay.  We don't have a grading service to connect to!
             pass
 
-        #Try to get the rubric from the module
+        # Try to get the rubric from the module
         module.handle_ajax("get_combined_rubric", {})
+        module.save()
 
-        #Make a fake reply from the queue
+        # Make a fake reply from the queue
         queue_reply = {
             'queuekey': "",
             'xqueue_body': json.dumps({
@@ -832,22 +845,27 @@ class OpenEndedModuleXmlTest(unittest.TestCase, DummyModulestore):
         }
 
         module.handle_ajax("check_for_score", {})
+        module.save()
 
-        #Update the module with the fake queue reply
+        # Update the module with the fake queue reply
         module.handle_ajax("score_update", queue_reply)
+        module.save()
         self.assertFalse(module.ready_to_reset)
         self.assertEqual(module.current_task_number, 1)
 
-        #Get html and other data client will request
-        module.get_html()
+        # Get html and other data client will request
+        module.render('student_view')
 
         module.handle_ajax("skip_post_assessment", {})
+        module.save()
 
-        #Get all results
+        # Get all results
         module.handle_ajax("get_combined_rubric", {})
+        module.save()
 
-        #reset the problem
+        # reset the problem
         module.handle_ajax("reset", {})
+        module.save()
         self.assertEqual(module.state, "initial")
 
 
@@ -876,31 +894,37 @@ class OpenEndedModuleXmlAttemptTest(unittest.TestCase, DummyModulestore):
        """
         assessment = [0, 1]
         module = self.get_module_from_location(self.problem_location, COURSE)
+        module.save()
 
-        #Simulate a student saving an answer
+        # Simulate a student saving an answer
         module.handle_ajax("save_answer", {"student_answer": self.answer})
+        module.save()
 
-        #Mock a student submitting an assessment
+        # Mock a student submitting an assessment
         assessment_dict = MockQueryDict()
         assessment_dict.update({'assessment': sum(assessment), 'score_list[]': assessment})
         module.handle_ajax("save_assessment", assessment_dict)
+        module.save()
         task_one_json = json.loads(module.task_states[0])
         self.assertEqual(json.loads(task_one_json['child_history'][0]['post_assessment']), assessment)
 
-        #Move to the next step in the problem
+        # Move to the next step in the problem
         module.handle_ajax("next_problem", {})
+        module.save()
         self.assertEqual(module.current_task_number, 0)
 
-        html = module.get_html()
-        self.assertTrue(isinstance(html, basestring))
+        html = module.render('student_view').content
+        self.assertIsInstance(html, basestring)
 
-        #Module should now be done
+        # Module should now be done
         rubric = module.handle_ajax("get_combined_rubric", {})
-        self.assertTrue(isinstance(rubric, basestring))
+        module.save()
+        self.assertIsInstance(rubric, basestring)
         self.assertEqual(module.state, "done")
 
-        #Try to reset, should fail because only 1 attempt is allowed
+        # Try to reset, should fail because only 1 attempt is allowed
         reset_data = json.loads(module.handle_ajax("reset", {}))
+        module.save()
         self.assertEqual(reset_data['success'], False)
 
 class OpenEndedModuleXmlImageUploadTest(unittest.TestCase, DummyModulestore):
@@ -929,7 +953,7 @@ class OpenEndedModuleXmlImageUploadTest(unittest.TestCase, DummyModulestore):
         """
         module = self.get_module_from_location(self.problem_location, COURSE)
 
-        #Simulate a student saving an answer
+        # Simulate a student saving an answer
         response = module.handle_ajax("save_answer", {"student_answer": self.answer_text})
         response = json.loads(response)
         self.assertFalse(response['success'])
@@ -949,7 +973,7 @@ class OpenEndedModuleXmlImageUploadTest(unittest.TestCase, DummyModulestore):
         """
         module = self.get_module_from_location(self.problem_location, COURSE)
 
-        #Simulate a student saving an answer with a file
+        # Simulate a student saving an answer with a file
         response = module.handle_ajax("save_answer", {
             "student_answer": self.answer_text,
             "valid_files_attached": True,
diff --git a/common/lib/xmodule/xmodule/tests/test_conditional.py b/common/lib/xmodule/xmodule/tests/test_conditional.py
index b665ef02f7..8771af3db7 100644
--- a/common/lib/xmodule/xmodule/tests/test_conditional.py
+++ b/common/lib/xmodule/xmodule/tests/test_conditional.py
@@ -1,4 +1,3 @@
-
 from ast import literal_eval
 import json
 import unittest
@@ -8,12 +7,11 @@ from mock import Mock, patch
 
 from xblock.field_data import DictFieldData
 from xblock.fields import ScopeIds
-from xblock.fragment import Fragment
 from xmodule.error_module import NonStaffErrorDescriptor
 from xmodule.modulestore import Location
 from xmodule.modulestore.xml import ImportSystem, XMLModuleStore
-from xmodule.conditional_module import ConditionalModule
-from xmodule.tests import DATA_DIR, get_test_system
+from xmodule.conditional_module import ConditionalDescriptor
+from xmodule.tests import DATA_DIR, get_test_system, get_test_descriptor_system
 
 
 ORG = 'test_org'
@@ -26,20 +24,15 @@ class DummySystem(ImportSystem):
     def __init__(self, load_error_modules):
 
         xmlstore = XMLModuleStore("data_dir", course_dirs=[], load_error_modules=load_error_modules)
-        course_id = "/".join([ORG, COURSE, 'test_run'])
-        course_dir = "test_dir"
-        policy = {}
-        error_tracker = Mock()
-        parent_tracker = Mock()
 
         super(DummySystem, self).__init__(
-            xmlstore,
-            course_id,
-            course_dir,
-            policy,
-            error_tracker,
-            parent_tracker,
+            xmlstore=xmlstore,
+            course_id='/'.join([ORG, COURSE, 'test_run']),
+            course_dir='test_dir',
+            error_tracker=Mock(),
+            parent_tracker=Mock(),
             load_error_modules=load_error_modules,
+            policy={},
         )
 
     def render_template(self, template, context):
@@ -59,52 +52,58 @@ class ConditionalFactory(object):
 
         if the source_is_error_module flag is set, create a real ErrorModule for the source.
         """
+        descriptor_system = get_test_descriptor_system()
+
         # construct source descriptor and module:
         source_location = Location(["i4x", "edX", "conditional_test", "problem", "SampleProblem"])
         if source_is_error_module:
             # Make an error descriptor and module
-            source_descriptor = NonStaffErrorDescriptor.from_xml('some random xml data',
-                                                                 system,
-                                                                 org=source_location.org,
-                                                                 course=source_location.course,
-                                                                 error_msg='random error message')
-            source_module = source_descriptor.xmodule(system)
+            source_descriptor = NonStaffErrorDescriptor.from_xml(
+                'some random xml data',
+                system,
+                org=source_location.org,
+                course=source_location.course,
+                error_msg='random error message'
+            )
         else:
             source_descriptor = Mock()
             source_descriptor.location = source_location
-            source_module = Mock()
+
+        source_descriptor.runtime = descriptor_system
+        source_descriptor.render = lambda view, context=None: descriptor_system.render(source_descriptor, view, context)
 
         # construct other descriptors:
         child_descriptor = Mock()
-        cond_descriptor = Mock()
-        cond_descriptor.runtime = system
-        cond_descriptor.get_required_module_descriptors = lambda: [source_descriptor, ]
-        cond_descriptor.get_children = lambda: [child_descriptor, ]
-        cond_descriptor.xml_attributes = {"attempted": "true"}
+        child_descriptor._xmodule.student_view.return_value.content = u'<p>This is a secret</p>'
+        child_descriptor.student_view = child_descriptor._xmodule.student_view
+        child_descriptor.displayable_items.return_value = [child_descriptor]
+        child_descriptor.runtime = descriptor_system
+        child_descriptor.xmodule_runtime = get_test_system()
+        child_descriptor.render = lambda view, context=None: descriptor_system.render(child_descriptor, view, context)
 
-        # create child module:
-        child_module = Mock()
-        child_module.runtime = system
-        child_module.get_html.return_value = u'<p>This is a secret</p>'
-        child_module.student_view.return_value = Fragment(child_module.get_html.return_value)
-        child_module.displayable_items = lambda: [child_module]
-        module_map = {source_descriptor: source_module, child_descriptor: child_module}
-        system.get_module = lambda descriptor: module_map[descriptor]
+        descriptor_system.load_item = {'child': child_descriptor, 'source': source_descriptor}.get
 
         # construct conditional module:
         cond_location = Location(["i4x", "edX", "conditional_test", "conditional", "SampleConditional"])
-        field_data = DictFieldData({'data': '<conditional/>', 'location': cond_location})
-        cond_module = ConditionalModule(
-            cond_descriptor,
-            system,
+        field_data = DictFieldData({
+            'data': '<conditional/>',
+            'xml_attributes': {'attempted': 'true'},
+            'children': ['child'],
+        })
+
+        cond_descriptor = ConditionalDescriptor(
+            descriptor_system,
             field_data,
             ScopeIds(None, None, cond_location, cond_location)
         )
+        cond_descriptor.xmodule_runtime = system
+        system.get_module = lambda desc: desc
+        cond_descriptor.get_required_module_descriptors = Mock(return_value=[source_descriptor])
 
         # return dict:
-        return {'cond_module': cond_module,
-                'source_module': source_module,
-                'child_module': child_module}
+        return {'cond_module': cond_descriptor,
+                'source_module': source_descriptor,
+                'child_module': child_descriptor}
 
 
 class ConditionalModuleBasicTest(unittest.TestCase):
@@ -129,16 +128,20 @@ class ConditionalModuleBasicTest(unittest.TestCase):
         modules = ConditionalFactory.create(self.test_system)
         # because get_test_system returns the repr of the context dict passed to render_template,
         # we reverse it here
-        html = modules['cond_module'].get_html()
-        html_dict = literal_eval(html)
-        self.assertEqual(html_dict['element_id'], 'i4x-edX-conditional_test-conditional-SampleConditional')
-        self.assertEqual(html_dict['id'], 'i4x://edX/conditional_test/conditional/SampleConditional')
-        self.assertEqual(html_dict['depends'], 'i4x-edX-conditional_test-problem-SampleProblem')
+        html = modules['cond_module'].render('student_view').content
+        expected = modules['cond_module'].xmodule_runtime.render_template('conditional_ajax.html', {
+            'ajax_url': modules['cond_module'].xmodule_runtime.ajax_url,
+            'element_id': 'i4x-edX-conditional_test-conditional-SampleConditional',
+            'id': 'i4x://edX/conditional_test/conditional/SampleConditional',
+            'depends': 'i4x-edX-conditional_test-problem-SampleProblem',
+        })
+        self.assertEquals(expected, html)
 
     def test_handle_ajax(self):
         modules = ConditionalFactory.create(self.test_system)
         modules['source_module'].is_attempted = "false"
         ajax = json.loads(modules['cond_module'].handle_ajax('', ''))
+        modules['cond_module'].save()
         print "ajax: ", ajax
         html = ajax['html']
         self.assertFalse(any(['This is a secret' in item for item in html]))
@@ -146,6 +149,7 @@ class ConditionalModuleBasicTest(unittest.TestCase):
         # now change state of the capa problem to make it completed
         modules['source_module'].is_attempted = "true"
         ajax = json.loads(modules['cond_module'].handle_ajax('', ''))
+        modules['cond_module'].save()
         print "post-attempt ajax: ", ajax
         html = ajax['html']
         self.assertTrue(any(['This is a secret' in item for item in html]))
@@ -157,6 +161,7 @@ class ConditionalModuleBasicTest(unittest.TestCase):
         '''
         modules = ConditionalFactory.create(self.test_system, source_is_error_module=True)
         ajax = json.loads(modules['cond_module'].handle_ajax('', ''))
+        modules['cond_module'].save()
         html = ajax['html']
         self.assertFalse(any(['This is a secret' in item for item in html]))
 
@@ -196,7 +201,9 @@ class ConditionalModuleXmlTest(unittest.TestCase):
             if isinstance(descriptor, Location):
                 location = descriptor
                 descriptor = self.modulestore.get_instance(course.id, location, depth=None)
-            return descriptor.xmodule(self.test_system)
+            descriptor.xmodule_runtime = get_test_system()
+            descriptor.xmodule_runtime.get_module = inner_get_module
+            return descriptor
 
         # edx - HarvardX
         # cond_test - ER22x
@@ -209,20 +216,28 @@ class ConditionalModuleXmlTest(unittest.TestCase):
 
         module = inner_get_module(location)
         print "module: ", module
-        print "module.conditions_map: ", module.conditions_map
         print "module children: ", module.get_children()
         print "module display items (children): ", module.get_display_items()
 
-        html = module.get_html()
+        html = module.render('student_view').content
         print "html type: ", type(html)
         print "html: ", html
-        html_expect = "{'ajax_url': 'courses/course_id/modx/a_location', 'element_id': 'i4x-HarvardX-ER22x-conditional-condone', 'id': 'i4x://HarvardX/ER22x/conditional/condone', 'depends': 'i4x-HarvardX-ER22x-problem-choiceprob'}"
+        html_expect = module.xmodule_runtime.render_template(
+            'conditional_ajax.html',
+            {
+                'ajax_url': 'courses/course_id/modx/a_location',
+                'element_id': 'i4x-HarvardX-ER22x-conditional-condone',
+                'id': 'i4x://HarvardX/ER22x/conditional/condone',
+                'depends': 'i4x-HarvardX-ER22x-problem-choiceprob'
+            }
+        )
         self.assertEqual(html, html_expect)
 
         gdi = module.get_display_items()
         print "gdi=", gdi
 
         ajax = json.loads(module.handle_ajax('', ''))
+        module.save()
         print "ajax: ", ajax
         html = ajax['html']
         self.assertFalse(any(['This is a secret' in item for item in html]))
@@ -234,6 +249,7 @@ class ConditionalModuleXmlTest(unittest.TestCase):
         inner_module.save()
 
         ajax = json.loads(module.handle_ajax('', ''))
+        module.save()
         print "post-attempt ajax: ", ajax
         html = ajax['html']
         self.assertTrue(any(['This is a secret' in item for item in html]))
diff --git a/common/lib/xmodule/xmodule/tests/test_crowdsource_hinter.py b/common/lib/xmodule/xmodule/tests/test_crowdsource_hinter.py
index 8ddb074d11..33fc264ff9 100644
--- a/common/lib/xmodule/xmodule/tests/test_crowdsource_hinter.py
+++ b/common/lib/xmodule/xmodule/tests/test_crowdsource_hinter.py
@@ -10,6 +10,7 @@ from xmodule.crowdsource_hinter import CrowdsourceHinterModule
 from xmodule.vertical_module import VerticalModule, VerticalDescriptor
 from xblock.field_data import DictFieldData
 from xblock.fragment import Fragment
+from xblock.core import XBlock
 
 from . import get_test_system
 
@@ -62,7 +63,8 @@ class CHModuleFactory(object):
         """
         A factory method for making CHM's
         """
-        field_data = {'data': CHModuleFactory.sample_problem_xml}
+        # Should have a single child, but it doesn't matter what that child is
+        field_data = {'data': CHModuleFactory.sample_problem_xml, 'children': [None]}
 
         if hints is not None:
             field_data['hints'] = hints
@@ -106,7 +108,8 @@ class CHModuleFactory(object):
         # Make the descriptor have a capa problem child.
         capa_descriptor = MagicMock()
         capa_descriptor.name = 'capa'
-        descriptor.get_children = lambda: [capa_descriptor]
+        capa_descriptor.displayable_items.return_value = [capa_descriptor]
+        descriptor.get_children.return_value = [capa_descriptor]
 
         # Make a fake capa module.
         capa_module = MagicMock()
@@ -128,7 +131,7 @@ class CHModuleFactory(object):
         responder.compare_answer = compare_answer
 
         capa_module.lcp.responders = {'responder0': responder}
-        capa_module.displayable_items = lambda: [capa_module]
+        capa_module.displayable_items.return_value = [capa_module]
 
         system = get_test_system()
         # Make the system have a marginally-functional get_module
@@ -137,8 +140,7 @@ class CHModuleFactory(object):
             """
             A fake module-maker.
             """
-            if descriptor.name == 'capa':
-                return capa_module
+            return capa_module
         system.get_module = fake_get_module
         module = CrowdsourceHinterModule(descriptor, system, DictFieldData(field_data), Mock())
 
@@ -205,15 +207,15 @@ class VerticalWithModulesFactory(object):
         return module
 
 
-class FakeChild(object):
+class FakeChild(XBlock):
     """
     A fake Xmodule.
     """
     def __init__(self):
         self.runtime = get_test_system()
-        self.runtime.ajax_url = 'this/is/a/fake/ajax/url'
         self.student_view = Mock(return_value=Fragment(self.get_html()))
         self.save = Mock()
+        self.id = 'i4x://this/is/a/fake/id'
 
     def get_html(self):
         """
@@ -241,9 +243,9 @@ class CrowdsourceHinterTest(unittest.TestCase):
             """
             return [FakeChild()]
         mock_module.get_display_items = fake_get_display_items
-        out_html = mock_module.runtime.render(mock_module, None, 'student_view').content
+        out_html = mock_module.render('student_view').content
         self.assertTrue('This is supposed to be test html.' in out_html)
-        self.assertTrue('this/is/a/fake/ajax/url' in out_html)
+        self.assertTrue('i4x://this/is/a/fake/id' in out_html)
 
     def test_gethtml_nochild(self):
         """
@@ -258,7 +260,7 @@ class CrowdsourceHinterTest(unittest.TestCase):
             """
             return []
         mock_module.get_display_items = fake_get_display_items
-        out_html = mock_module.runtime.render(mock_module, None, 'student_view').content
+        out_html = mock_module.render('student_view').content
         self.assertTrue('Error in loading crowdsourced hinter' in out_html)
 
     @unittest.skip("Needs to be finished.")
@@ -269,7 +271,7 @@ class CrowdsourceHinterTest(unittest.TestCase):
         NOT WORKING RIGHT NOW
         """
         mock_module = VerticalWithModulesFactory.create()
-        out_html = mock_module.runtime.render(mock_module, None, 'student_view').content
+        out_html = mock_module.render('student_view').content
         self.assertTrue('Test numerical problem.' in out_html)
         self.assertTrue('Another test numerical problem.' in out_html)
 
diff --git a/common/lib/xmodule/xmodule/tests/test_error_module.py b/common/lib/xmodule/xmodule/tests/test_error_module.py
index 5a47091045..ce2f68754c 100644
--- a/common/lib/xmodule/xmodule/tests/test_error_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_error_module.py
@@ -29,9 +29,9 @@ class TestErrorModule(unittest.TestCase, SetupTestErrorModules):
     def test_error_module_xml_rendering(self):
         descriptor = error_module.ErrorDescriptor.from_xml(
             self.valid_xml, self.system, self.org, self.course, self.error_msg)
-        self.assertTrue(isinstance(descriptor, error_module.ErrorDescriptor))
-        module = descriptor.xmodule(self.system)
-        context_repr = module.get_html()
+        self.assertIsInstance(descriptor, error_module.ErrorDescriptor)
+        descriptor.xmodule_runtime = self.system
+        context_repr = self.system.render(descriptor, 'student_view').content
         self.assertIn(self.error_msg, context_repr)
         self.assertIn(repr(self.valid_xml), context_repr)
 
@@ -43,9 +43,9 @@ class TestErrorModule(unittest.TestCase, SetupTestErrorModules):
 
         error_descriptor = error_module.ErrorDescriptor.from_descriptor(
             descriptor, self.error_msg)
-        self.assertTrue(isinstance(error_descriptor, error_module.ErrorDescriptor))
-        module = error_descriptor.xmodule(self.system)
-        context_repr = module.get_html()
+        self.assertIsInstance(error_descriptor, error_module.ErrorDescriptor)
+        error_descriptor.xmodule_runtime = self.system
+        context_repr = self.system.render(error_descriptor, 'student_view').content
         self.assertIn(self.error_msg, context_repr)
         self.assertIn(repr(descriptor), context_repr)
 
@@ -60,13 +60,13 @@ class TestNonStaffErrorModule(unittest.TestCase, SetupTestErrorModules):
     def test_non_staff_error_module_create(self):
         descriptor = error_module.NonStaffErrorDescriptor.from_xml(
             self.valid_xml, self.system, self.org, self.course)
-        self.assertTrue(isinstance(descriptor, error_module.NonStaffErrorDescriptor))
+        self.assertIsInstance(descriptor, error_module.NonStaffErrorDescriptor)
 
     def test_from_xml_render(self):
         descriptor = error_module.NonStaffErrorDescriptor.from_xml(
             self.valid_xml, self.system, self.org, self.course)
-        module = descriptor.xmodule(self.system)
-        context_repr = module.get_html()
+        descriptor.xmodule_runtime = self.system
+        context_repr = self.system.render(descriptor, 'student_view').content
         self.assertNotIn(self.error_msg, context_repr)
         self.assertNotIn(repr(self.valid_xml), context_repr)
 
@@ -78,8 +78,8 @@ class TestNonStaffErrorModule(unittest.TestCase, SetupTestErrorModules):
 
         error_descriptor = error_module.NonStaffErrorDescriptor.from_descriptor(
             descriptor, self.error_msg)
-        self.assertTrue(isinstance(error_descriptor, error_module.ErrorDescriptor))
-        module = error_descriptor.xmodule(self.system)
-        context_repr = module.get_html()
+        self.assertIsInstance(error_descriptor, error_module.ErrorDescriptor)
+        error_descriptor.xmodule_runtime = self.system
+        context_repr = self.system.render(error_descriptor, 'student_view').content
         self.assertNotIn(self.error_msg, context_repr)
         self.assertNotIn(str(descriptor), context_repr)
diff --git a/common/lib/xmodule/xmodule/tests/test_peer_grading.py b/common/lib/xmodule/xmodule/tests/test_peer_grading.py
index 0b07a676d3..53333ea17d 100644
--- a/common/lib/xmodule/xmodule/tests/test_peer_grading.py
+++ b/common/lib/xmodule/xmodule/tests/test_peer_grading.py
@@ -199,6 +199,7 @@ class PeerGradingModuleScoredTest(unittest.TestCase, DummyModulestore):
         html = peer_grading.peer_grading()
         self.assertIn("Peer-Graded", html)
 
+
 class PeerGradingModuleLinkedTest(unittest.TestCase, DummyModulestore):
     """
     Test peer grading that is linked to an open ended module.
diff --git a/common/lib/xmodule/xmodule/tests/test_progress.py b/common/lib/xmodule/xmodule/tests/test_progress.py
index 053768a007..33d129663e 100644
--- a/common/lib/xmodule/xmodule/tests/test_progress.py
+++ b/common/lib/xmodule/xmodule/tests/test_progress.py
@@ -137,6 +137,6 @@ class ModuleProgressTest(unittest.TestCase):
     '''
     def test_xmodule_default(self):
         '''Make sure default get_progress exists, returns None'''
-        xm = x_module.XModule(None, get_test_system(), DictFieldData({'location': 'a://b/c/d/e'}), Mock())
+        xm = x_module.XModule(Mock(), get_test_system(), DictFieldData({'location': 'a://b/c/d/e'}), Mock())
         p = xm.get_progress()
         self.assertEqual(p, None)
diff --git a/common/lib/xmodule/xmodule/tests/test_util_open_ended.py b/common/lib/xmodule/xmodule/tests/test_util_open_ended.py
index a7b8a88337..93d81e392b 100644
--- a/common/lib/xmodule/xmodule/tests/test_util_open_ended.py
+++ b/common/lib/xmodule/xmodule/tests/test_util_open_ended.py
@@ -103,7 +103,8 @@ class DummyModulestore(object):
         if not isinstance(location, Location):
             location = Location(location)
         descriptor = self.modulestore.get_instance(course.id, location, depth=None)
-        return descriptor.xmodule(self.test_system)
+        descriptor.xmodule_runtime = self.test_system
+        return descriptor
 
 # Task state for a module with self assessment then instructor assessment.
 TEST_STATE_SA_IN = ["{\"child_created\": false, \"child_attempts\": 2, \"version\": 1, \"child_history\": [{\"answer\": \"However venture pursuit he am mr cordial. Forming musical am hearing studied be luckily. Ourselves for determine attending how led gentleman sincerity. Valley afford uneasy joy she thrown though bed set. In me forming general prudent on country carried. Behaved an or suppose justice. Seemed whence how son rather easily and change missed. Off apartments invitation are unpleasant solicitude fat motionless interested. Hardly suffer wisdom wishes valley as an. As friendship advantages resolution it alteration stimulated he or increasing. \\r<br><br>Now led tedious shy lasting females off. Dashwood marianne in of entrance be on wondered possible building. Wondered sociable he carriage in speedily margaret. Up devonshire of he thoroughly insensible alteration. An mr settling occasion insisted distance ladyship so. Not attention say frankness intention out dashwoods now curiosity. Stronger ecstatic as no judgment daughter speedily thoughts. Worse downs nor might she court did nay forth these. \", \"post_assessment\": \"[3, 3, 2, 2, 2]\", \"score\": 12}, {\"answer\": \"Delightful remarkably mr on announcing themselves entreaties favourable. About to in so terms voice at. Equal an would is found seems of. The particular friendship one sufficient terminated frequently themselves. It more shed went up is roof if loud case. Delay music in lived noise an. Beyond genius really enough passed is up. \\r<br><br>John draw real poor on call my from. May she mrs furnished discourse extremely. Ask doubt noisy shade guest did built her him. Ignorant repeated hastened it do. Consider bachelor he yourself expenses no. Her itself active giving for expect vulgar months. Discovery commanded fat mrs remaining son she principle middleton neglected. Be miss he in post sons held. No tried is defer do money scale rooms. \", \"post_assessment\": \"[3, 3, 2, 2, 2]\", \"score\": 12}], \"max_score\": 12, \"child_state\": \"done\"}", "{\"child_created\": false, \"child_attempts\": 0, \"version\": 1, \"child_history\": [{\"answer\": \"However venture pursuit he am mr cordial. Forming musical am hearing studied be luckily. Ourselves for determine attending how led gentleman sincerity. Valley afford uneasy joy she thrown though bed set. In me forming general prudent on country carried. Behaved an or suppose justice. Seemed whence how son rather easily and change missed. Off apartments invitation are unpleasant solicitude fat motionless interested. Hardly suffer wisdom wishes valley as an. As friendship advantages resolution it alteration stimulated he or increasing. \\r<br><br>Now led tedious shy lasting females off. Dashwood marianne in of entrance be on wondered possible building. Wondered sociable he carriage in speedily margaret. Up devonshire of he thoroughly insensible alteration. An mr settling occasion insisted distance ladyship so. Not attention say frankness intention out dashwoods now curiosity. Stronger ecstatic as no judgment daughter speedily thoughts. Worse downs nor might she court did nay forth these. \", \"post_assessment\": \"{\\\"submission_id\\\": 1460, \\\"score\\\": 12, \\\"feedback\\\": \\\"{\\\\\\\"feedback\\\\\\\": \\\\\\\"\\\\\\\"}\\\", \\\"success\\\": true, \\\"grader_id\\\": 5413, \\\"grader_type\\\": \\\"IN\\\", \\\"rubric_scores_complete\\\": true, \\\"rubric_xml\\\": \\\"<rubric><category><description>\\\\nIdeas\\\\n</description><score>3</score><option points='0'>\\\\nDifficult for the reader to discern the main idea.  Too brief or too repetitive to establish or maintain a focus.\\\\n</option><option points='1'>\\\\nAttempts a main idea.  Sometimes loses focus or ineffectively displays focus.\\\\n</option><option points='2'>\\\\nPresents a unifying theme or main idea, but may include minor tangents.  Stays somewhat focused on topic and task.\\\\n</option><option points='3'>\\\\nPresents a unifying theme or main idea without going off on tangents.  Stays completely focused on topic and task.\\\\n</option></category><category><description>\\\\nContent\\\\n</description><score>3</score><option points='0'>\\\\nIncludes little information with few or no details or unrelated details.  Unsuccessful in attempts to explore any facets of the topic.\\\\n</option><option points='1'>\\\\nIncludes little information and few or no details.  Explores only one or two facets of the topic.\\\\n</option><option points='2'>\\\\nIncludes sufficient information and supporting details. (Details may not be fully developed; ideas may be listed.)  Explores some facets of the topic.\\\\n</option><option points='3'>\\\\nIncludes in-depth information and exceptional supporting details that are fully developed.  Explores all facets of the topic.\\\\n</option></category><category><description>\\\\nOrganization\\\\n</description><score>2</score><option points='0'>\\\\nIdeas organized illogically, transitions weak, and response difficult to follow.\\\\n</option><option points='1'>\\\\nAttempts to logically organize ideas.  Attempts to progress in an order that enhances meaning, and demonstrates use of transitions.\\\\n</option><option points='2'>\\\\nIdeas organized logically.  Progresses in an order that enhances meaning.  Includes smooth transitions.\\\\n</option></category><category><description>\\\\nStyle\\\\n</description><score>2</score><option points='0'>\\\\nContains limited vocabulary, with many words used incorrectly.  Demonstrates problems with sentence patterns.\\\\n</option><option points='1'>\\\\nContains basic vocabulary, with words that are predictable and common.  Contains mostly simple sentences (although there may be an attempt at more varied sentence patterns).\\\\n</option><option points='2'>\\\\nIncludes vocabulary to make explanations detailed and precise.  Includes varied sentence patterns, including complex sentences.\\\\n</option></category><category><description>\\\\nVoice\\\\n</description><score>2</score><option points='0'>\\\\nDemonstrates language and tone that may be inappropriate to task and reader.\\\\n</option><option points='1'>\\\\nDemonstrates an attempt to adjust language and tone to task and reader.\\\\n</option><option points='2'>\\\\nDemonstrates effective adjustment of language and tone to task and reader.\\\\n</option></category></rubric>\\\"}\", \"score\": 12}, {\"answer\": \"Delightful remarkably mr on announcing themselves entreaties favourable. About to in so terms voice at. Equal an would is found seems of. The particular friendship one sufficient terminated frequently themselves. It more shed went up is roof if loud case. Delay music in lived noise an. Beyond genius really enough passed is up. \\r<br><br>John draw real poor on call my from. May she mrs furnished discourse extremely. Ask doubt noisy shade guest did built her him. Ignorant repeated hastened it do. Consider bachelor he yourself expenses no. Her itself active giving for expect vulgar months. Discovery commanded fat mrs remaining son she principle middleton neglected. Be miss he in post sons held. No tried is defer do money scale rooms. \", \"post_assessment\": \"{\\\"submission_id\\\": 1462, \\\"score\\\": 12, \\\"feedback\\\": \\\"{\\\\\\\"feedback\\\\\\\": \\\\\\\"\\\\\\\"}\\\", \\\"success\\\": true, \\\"grader_id\\\": 5418, \\\"grader_type\\\": \\\"IN\\\", \\\"rubric_scores_complete\\\": true, \\\"rubric_xml\\\": \\\"<rubric><category><description>\\\\nIdeas\\\\n</description><score>3</score><option points='0'>\\\\nDifficult for the reader to discern the main idea.  Too brief or too repetitive to establish or maintain a focus.\\\\n</option><option points='1'>\\\\nAttempts a main idea.  Sometimes loses focus or ineffectively displays focus.\\\\n</option><option points='2'>\\\\nPresents a unifying theme or main idea, but may include minor tangents.  Stays somewhat focused on topic and task.\\\\n</option><option points='3'>\\\\nPresents a unifying theme or main idea without going off on tangents.  Stays completely focused on topic and task.\\\\n</option></category><category><description>\\\\nContent\\\\n</description><score>3</score><option points='0'>\\\\nIncludes little information with few or no details or unrelated details.  Unsuccessful in attempts to explore any facets of the topic.\\\\n</option><option points='1'>\\\\nIncludes little information and few or no details.  Explores only one or two facets of the topic.\\\\n</option><option points='2'>\\\\nIncludes sufficient information and supporting details. (Details may not be fully developed; ideas may be listed.)  Explores some facets of the topic.\\\\n</option><option points='3'>\\\\nIncludes in-depth information and exceptional supporting details that are fully developed.  Explores all facets of the topic.\\\\n</option></category><category><description>\\\\nOrganization\\\\n</description><score>2</score><option points='0'>\\\\nIdeas organized illogically, transitions weak, and response difficult to follow.\\\\n</option><option points='1'>\\\\nAttempts to logically organize ideas.  Attempts to progress in an order that enhances meaning, and demonstrates use of transitions.\\\\n</option><option points='2'>\\\\nIdeas organized logically.  Progresses in an order that enhances meaning.  Includes smooth transitions.\\\\n</option></category><category><description>\\\\nStyle\\\\n</description><score>2</score><option points='0'>\\\\nContains limited vocabulary, with many words used incorrectly.  Demonstrates problems with sentence patterns.\\\\n</option><option points='1'>\\\\nContains basic vocabulary, with words that are predictable and common.  Contains mostly simple sentences (although there may be an attempt at more varied sentence patterns).\\\\n</option><option points='2'>\\\\nIncludes vocabulary to make explanations detailed and precise.  Includes varied sentence patterns, including complex sentences.\\\\n</option></category><category><description>\\\\nVoice\\\\n</description><score>2</score><option points='0'>\\\\nDemonstrates language and tone that may be inappropriate to task and reader.\\\\n</option><option points='1'>\\\\nDemonstrates an attempt to adjust language and tone to task and reader.\\\\n</option><option points='2'>\\\\nDemonstrates effective adjustment of language and tone to task and reader.\\\\n</option></category></rubric>\\\"}\", \"score\": 12}], \"max_score\": 12, \"child_state\": \"post_assessment\"}"]
diff --git a/common/lib/xmodule/xmodule/tests/test_utils_django.py b/common/lib/xmodule/xmodule/tests/test_utils_django.py
new file mode 100644
index 0000000000..1d5bf9d83e
--- /dev/null
+++ b/common/lib/xmodule/xmodule/tests/test_utils_django.py
@@ -0,0 +1,20 @@
+"""Tests for methods defined in util/django.py"""
+from xmodule.util.django import get_current_request, get_current_request_hostname
+from nose.tools import assert_is_none
+from unittest import TestCase
+
+class UtilDjangoTests(TestCase):
+	"""
+	Tests for methods exposed in util/django
+	"""
+	def test_get_current_request(self):
+		"""
+		Since we are running outside of Django assert that get_current_request returns None
+		"""
+		assert_is_none(get_current_request())
+
+	def test_get_current_request_hostname(self):
+		"""
+		Since we are running outside of Django assert that get_current_request_hostname returns None
+		"""
+		assert_is_none(get_current_request_hostname())
diff --git a/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py b/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py
index ea0cea800b..6959b63673 100644
--- a/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py
+++ b/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py
@@ -2,6 +2,8 @@
 Tests for the wrapping layer that provides the XBlock API using XModule/Descriptor
 functionality
 """
+# For tests, ignore access to protected members
+# pylint: disable=protected-access
 
 from nose.tools import assert_equal  # pylint: disable=E0611
 from unittest.case import SkipTest
@@ -10,13 +12,14 @@ from mock import Mock
 from xblock.field_data import DictFieldData
 from xblock.fields import ScopeIds
 
-from xmodule.x_module import ModuleSystem
+from xmodule.x_module import ModuleSystem, XModule, XModuleDescriptor
 from xmodule.mako_module import MakoDescriptorSystem
 from xmodule.annotatable_module import AnnotatableDescriptor
 from xmodule.capa_module import CapaDescriptor
 from xmodule.course_module import CourseDescriptor
 from xmodule.combined_open_ended_module import CombinedOpenEndedDescriptor
 from xmodule.discussion_module import DiscussionDescriptor
+from xmodule.error_module import ErrorDescriptor
 from xmodule.gst_module import GraphicalSliderToolDescriptor
 from xmodule.html_module import HtmlDescriptor
 from xmodule.peer_grading_module import PeerGradingDescriptor
@@ -29,7 +32,7 @@ from xmodule.conditional_module import ConditionalDescriptor
 from xmodule.randomize_module import RandomizeDescriptor
 from xmodule.vertical_module import VerticalDescriptor
 from xmodule.wrapper_module import WrapperDescriptor
-from xmodule.tests import get_test_descriptor_system
+from xmodule.tests import get_test_descriptor_system, mock_render_template
 
 LEAF_XMODULES = (
     AnnotatableDescriptor,
@@ -40,21 +43,20 @@ LEAF_XMODULES = (
     HtmlDescriptor,
     PeerGradingDescriptor,
     PollDescriptor,
+    WordCloudDescriptor,
     # This is being excluded because it has dependencies on django
     #VideoDescriptor,
-    WordCloudDescriptor,
 )
 
 
 CONTAINER_XMODULES = (
-    CrowdsourceHinterDescriptor,
-    CourseDescriptor,
-    SequenceDescriptor,
     ConditionalDescriptor,
+    CourseDescriptor,
+    CrowdsourceHinterDescriptor,
     RandomizeDescriptor,
+    SequenceDescriptor,
     VerticalDescriptor,
     WrapperDescriptor,
-    CourseDescriptor,
 )
 
 # These modules are editable in studio yet
@@ -66,26 +68,24 @@ NOT_STUDIO_EDITABLE = (
 
 
 class TestXBlockWrapper(object):
-
     @property
     def leaf_module_runtime(self):
         runtime = ModuleSystem(
-            render_template=lambda *args, **kwargs: u'{!r}, {!r}'.format(args, kwargs),
+            render_template=mock_render_template,
             anonymous_student_id='dummy_anonymous_student_id',
             open_ended_grading_interface={},
             static_url='/static',
             ajax_url='dummy_ajax_url',
-            xmodule_field_data=lambda d: d._field_data,
             get_module=Mock(),
             replace_urls=Mock(),
             track_function=Mock(),
+            error_descriptor_class=ErrorDescriptor,
         )
         return runtime
 
     def leaf_descriptor(self, descriptor_cls):
         location = 'i4x://org/course/category/name'
         runtime = get_test_descriptor_system()
-        runtime.render_template = lambda *args, **kwargs: u'{!r}, {!r}'.format(args, kwargs)
         return runtime.construct_xblock_from_class(
             descriptor_cls,
             ScopeIds(None, descriptor_cls.__name__, location, location),
@@ -93,7 +93,10 @@ class TestXBlockWrapper(object):
         )
 
     def leaf_module(self, descriptor_cls):
-        return self.leaf_descriptor(descriptor_cls).xmodule(self.leaf_module_runtime)
+        """Returns a descriptor that is ready to proxy as an xmodule"""
+        descriptor = self.leaf_descriptor(descriptor_cls)
+        descriptor.xmodule_runtime = self.leaf_module_runtime
+        return descriptor
 
     def container_module_runtime(self, depth):
         runtime = self.leaf_module_runtime
@@ -104,10 +107,16 @@ class TestXBlockWrapper(object):
         runtime.position = 2
         return runtime
 
-    def container_descriptor(self, descriptor_cls):
+    def container_descriptor(self, descriptor_cls, depth):
+        """Return an instance of `descriptor_cls` with `depth` levels of children"""
         location = 'i4x://org/course/category/name'
         runtime = get_test_descriptor_system()
-        runtime.render_template = lambda *args, **kwargs: u'{!r}, {!r}'.format(args, kwargs)
+
+        if depth == 0:
+            runtime.load_item.side_effect = lambda x: self.leaf_module(HtmlDescriptor)
+        else:
+            runtime.load_item.side_effect = lambda x: self.container_module(VerticalDescriptor, depth - 1)
+
         return runtime.construct_xblock_from_class(
             descriptor_cls,
             ScopeIds(None, descriptor_cls.__name__, location, location),
@@ -117,7 +126,10 @@ class TestXBlockWrapper(object):
         )
 
     def container_module(self, descriptor_cls, depth):
-        return self.container_descriptor(descriptor_cls).xmodule(self.container_module_runtime(depth))
+        """Returns a descriptor that is ready to proxy as an xmodule"""
+        descriptor = self.container_descriptor(descriptor_cls, depth)
+        descriptor.xmodule_runtime = self.container_module_runtime(depth)
+        return descriptor
 
 class TestStudentView(TestXBlockWrapper):
 
@@ -131,9 +143,15 @@ class TestStudentView(TestXBlockWrapper):
     # Check that when an xmodule is instantiated from descriptor_cls
     # it generates the same thing from student_view that it does from get_html
     def check_student_view_leaf_node(self, descriptor_cls):
-        xmodule = self.leaf_module(descriptor_cls)
-        assert_equal(xmodule.get_html(), xmodule.runtime.render(xmodule, None, 'student_view').content)
 
+        if descriptor_cls.module_class.student_view != XModule.student_view:
+            raise SkipTest(descriptor_cls.__name__ + " implements student_view")
+
+        descriptor = self.leaf_module(descriptor_cls)
+        assert_equal(
+            descriptor._xmodule.get_html(),
+            descriptor.render('student_view').content
+        )
 
     # Test that for all container XModule Descriptors,
     # their corresponding XModule renders the same thing using student_view
@@ -147,13 +165,19 @@ class TestStudentView(TestXBlockWrapper):
             yield self.check_student_view_container_node_mixed, descriptor_cls
             yield self.check_student_view_container_node_xblocks_only, descriptor_cls
 
-
     # Check that when an xmodule is generated from descriptor_cls
     # with only xmodule children, it generates the same html from student_view
     # as it does using get_html
     def check_student_view_container_node_xmodules_only(self, descriptor_cls):
-        xmodule = self.container_module(descriptor_cls, 2)
-        assert_equal(xmodule.get_html(), xmodule.runtime.render(xmodule, None, 'student_view').content)
+
+        if descriptor_cls.module_class.student_view != XModule.student_view:
+            raise SkipTest(descriptor_cls.__name__ + " implements student_view")
+
+        descriptor = self.container_module(descriptor_cls, 2)
+        assert_equal(
+            descriptor._xmodule.get_html(),
+            descriptor.render('student_view').content
+        )
 
     # Check that when an xmodule is generated from descriptor_cls
     # with mixed xmodule and xblock children, it generates the same html from student_view
@@ -181,10 +205,13 @@ class TestStudioView(TestXBlockWrapper):
     # it generates the same thing from studio_view that it does from get_html
     def check_studio_view_leaf_node(self, descriptor_cls):
         if descriptor_cls in NOT_STUDIO_EDITABLE:
-            raise SkipTest(descriptor_cls.__name__ + "is not editable in studio")
+            raise SkipTest(descriptor_cls.__name__ + " is not editable in studio")
+
+        if descriptor_cls.studio_view != XModuleDescriptor.studio_view:
+            raise SkipTest(descriptor_cls.__name__ + " implements studio_view")
 
         descriptor = self.leaf_descriptor(descriptor_cls)
-        assert_equal(descriptor.get_html(), descriptor.runtime.render(descriptor, None, 'studio_view').content)
+        assert_equal(descriptor.get_html(), descriptor.render('studio_view').content)
 
 
     # Test that for all of the Descriptors listed in CONTAINER_XMODULES
@@ -206,8 +233,11 @@ class TestStudioView(TestXBlockWrapper):
         if descriptor_cls in NOT_STUDIO_EDITABLE:
             raise SkipTest(descriptor_cls.__name__ + "is not editable in studio")
 
-        descriptor = self.container_descriptor(descriptor_cls)
-        assert_equal(descriptor.get_html(), descriptor.runtime.render(descriptor, None, 'studio_view').content)
+        if descriptor_cls.studio_view != XModuleDescriptor.studio_view:
+            raise SkipTest(descriptor_cls.__name__ + " implements studio_view")
+
+        descriptor = self.container_descriptor(descriptor_cls, 2)
+        assert_equal(descriptor.get_html(), descriptor.render('studio_view').content)
 
     # Check that when a descriptor is generated from descriptor_cls
     # with mixed xmodule and xblock children, it generates the same html from studio_view
diff --git a/common/lib/xmodule/xmodule/timelimit_module.py b/common/lib/xmodule/xmodule/timelimit_module.py
index 70d3d9dba9..e1c4042dc0 100644
--- a/common/lib/xmodule/xmodule/timelimit_module.py
+++ b/common/lib/xmodule/xmodule/timelimit_module.py
@@ -9,6 +9,7 @@ from xmodule.x_module import XModule
 from xmodule.progress import Progress
 from xmodule.exceptions import NotFoundError
 from xblock.fields import Float, String, Boolean, Scope
+from xblock.fragment import Fragment
 
 
 log = logging.getLogger(__name__)
@@ -84,14 +85,14 @@ class TimeLimitModule(TimeLimitFields, XModule):
     def get_remaining_time_in_ms(self):
         return int((self.ending_at - time()) * 1000)
 
-    def get_html(self):
+    def student_view(self, context):
         # assumes there is one and only one child, so it only renders the first child
         children = self.get_display_items()
         if children:
             child = children[0]
-            return self.runtime.render_child(child, None, 'student_view').content
+            return child.render('student_view', context)
         else:
-            return u""
+            return Fragment()
 
     def get_progress(self):
         ''' Return the total progress, adding total done and total available.
diff --git a/common/lib/xmodule/xmodule/util/django.py b/common/lib/xmodule/xmodule/util/django.py
new file mode 100644
index 0000000000..20a7c3fa79
--- /dev/null
+++ b/common/lib/xmodule/xmodule/util/django.py
@@ -0,0 +1,20 @@
+"""
+Exposes Django utilities for consumption in the xmodule library
+NOTE: This file should only be imported into 'django-safe' code, i.e. known that this code runs int the Django 
+runtime environment with the djangoapps in common configured to load
+"""
+
+# NOTE: we are importing this method so that any module that imports us has access to get_current_request
+from crum import get_current_request
+
+
+def get_current_request_hostname():
+	"""
+	This method will return the hostname that was used in the current Django request
+	"""
+	hostname = None
+	request = get_current_request()
+	if request:
+		hostname = request.META.get('HTTP_HOST')
+
+	return hostname
diff --git a/common/lib/xmodule/xmodule/vertical_module.py b/common/lib/xmodule/xmodule/vertical_module.py
index 2d6bfaa633..0879e3bba3 100644
--- a/common/lib/xmodule/xmodule/vertical_module.py
+++ b/common/lib/xmodule/xmodule/vertical_module.py
@@ -1,3 +1,4 @@
+from xblock.fragment import Fragment
 from xmodule.x_module import XModule
 from xmodule.seq_module import SequenceDescriptor
 from xmodule.progress import Progress
@@ -17,18 +18,24 @@ class VerticalModule(VerticalFields, XModule):
 
     def __init__(self, *args, **kwargs):
         XModule.__init__(self, *args, **kwargs)
-        self.contents = None
 
-    def get_html(self):
-        if self.contents is None:
-            self.contents = [{
+    def student_view(self, context):
+        fragment = Fragment()
+        contents = []
+
+        for child in self.get_display_items():
+            rendered_child = child.render('student_view', context)
+            fragment.add_frag_resources(rendered_child)
+
+            contents.append({
                 'id': child.id,
-                'content': self.runtime.render_child(child, None, 'student_view').content
-            } for child in self.get_display_items()]
+                'content': rendered_child.content
+            })
 
-        return self.system.render_template('vert_module.html', {
-            'items': self.contents
-        })
+        fragment.add_content(self.system.render_template('vert_module.html', {
+            'items': contents
+        }))
+        return fragment
 
     def get_progress(self):
         # TODO: Cache progress or children array?
diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py
index 96d0a09498..71860a1864 100644
--- a/common/lib/xmodule/xmodule/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module.py
@@ -157,10 +157,6 @@ class VideoModule(VideoFields, XModule):
         log.debug(u"DISPATCH {0}".format(dispatch))
         raise Http404()
 
-    def get_instance_state(self):
-        """Return information about state (position)."""
-        return json.dumps({'position': self.position})
-
     def get_html(self):
         caption_asset_path = "/static/subs/"
 
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index 34a4b53d2e..1c8bd4ed14 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -1,7 +1,9 @@
 import logging
 import yaml
 import os
+import sys
 
+from functools import partial
 from lxml import etree
 from collections import namedtuple
 from pkg_resources import resource_listdir, resource_string, resource_isdir
@@ -13,6 +15,7 @@ from xblock.core import XBlock
 from xblock.fields import Scope, Integer, Float, List, XBlockMixin, String
 from xblock.fragment import Fragment
 from xblock.runtime import Runtime
+from xmodule.errortracker import exc_info_to_str
 from xmodule.modulestore.locator import BlockUsageLocator
 
 log = logging.getLogger(__name__)
@@ -214,78 +217,6 @@ class XModuleMixin(XBlockMixin):
                 return child
         return None
 
-
-class XModule(XModuleMixin, HTMLSnippet, XBlock):  # pylint: disable=abstract-method
-    """ Implements a generic learning module.
-
-        Subclasses must at a minimum provide a definition for get_html in order
-        to be displayed to users.
-
-        See the HTML module for a simple example.
-    """
-
-    # The default implementation of get_icon_class returns the icon_class
-    # attribute of the class
-    #
-    # This attribute can be overridden by subclasses, and
-    # the function can also be overridden if the icon class depends on the data
-    # in the module
-    icon_class = 'other'
-
-    def __init__(self, descriptor, *args, **kwargs):
-        """
-        Construct a new xmodule
-
-        runtime: An XBlock runtime allowing access to external resources
-
-        descriptor: the XModuleDescriptor that this module is an instance of.
-
-        field_data: A dictionary-like object that maps field names to values
-            for those fields.
-        """
-        super(XModule, self).__init__(*args, **kwargs)
-        self.system = self.runtime
-        self.descriptor = descriptor
-        self._loaded_children = None
-
-    def get_children(self):
-        """
-        Return module instances for all the children of this module.
-        """
-        if self._loaded_children is None:
-            child_descriptors = self.get_child_descriptors()
-
-            # This deliberately uses system.get_module, rather than runtime.get_block,
-            # because we're looking at XModule children, rather than XModuleDescriptor children.
-            # That means it can use the deprecated XModule apis, rather than future XBlock apis
-
-            # TODO: Once we're in a system where this returns a mix of XModuleDescriptors
-            # and XBlocks, we're likely to have to change this more
-            children = [self.system.get_module(descriptor) for descriptor in child_descriptors]
-            # get_module returns None if the current user doesn't have access
-            # to the location.
-            self._loaded_children = [c for c in children if c is not None]
-
-        return self._loaded_children
-
-    def __unicode__(self):
-        return '<x_module(id={0})>'.format(self.id)
-
-    def get_child_descriptors(self):
-        """
-        Returns the descriptors of the child modules
-
-        Overriding this changes the behavior of get_children and
-        anything that uses get_children, such as get_display_items.
-
-        This method will not instantiate the modules of the children
-        unless absolutely necessary, so it is cheaper to call than get_children
-
-        These children will be the same children returned by the
-        descriptor unless descriptor.has_dynamic_children() is true.
-        """
-        return self.descriptor.get_children()
-
     def get_icon_class(self):
         """
         Return a css class identifying this module in the context of an icon
@@ -333,11 +264,156 @@ class XModule(XModuleMixin, HTMLSnippet, XBlock):  # pylint: disable=abstract-me
         """
         return None
 
+    def bind_for_student(self, xmodule_runtime, field_data):
+        """
+        Set up this XBlock to act as an XModule instead of an XModuleDescriptor.
+
+        :param xmodule_runtime: the runtime to use when accessing student facing methods
+        :type xmodule_runtime: :class:`ModuleSystem`
+        :param field_data: The :class:`FieldData` to use for all subsequent data access
+        :type field_data: :class:`FieldData`
+        """
+        # pylint: disable=attribute-defined-outside-init
+        self.xmodule_runtime = xmodule_runtime
+        self._field_data = field_data
+
+
+class ProxyAttribute(object):
+    """
+    A (python) descriptor that proxies attribute access.
+
+    For example:
+
+    class Foo(object):
+        def __init__(self, value):
+            self.foo_attr = value
+
+    class Bar(object):
+        foo = Foo('x')
+        foo_attr = ProxyAttribute('foo', 'foo_attr')
+
+    bar = Bar()
+
+    assert bar.foo_attr == 'x'
+    bar.foo_attr = 'y'
+    assert bar.foo.foo_attr == 'y'
+    del bar.foo_attr
+    assert not hasattr(bar.foo, 'foo_attr')
+    """
+    def __init__(self, source, name):
+        """
+        :param source: The name of the attribute to proxy to
+        :param name: The name of the attribute to proxy
+        """
+        self._source = source
+        self._name = name
+
+    def __get__(self, instance, owner):
+        if instance is None:
+            return self
+
+        return getattr(getattr(instance, self._source), self._name)
+
+    def __set__(self, instance, value):
+        setattr(getattr(instance, self._source), self._name, value)
+
+    def __delete__(self, instance):
+        delattr(getattr(instance, self._source), self._name)
+
+
+module_attr = partial(ProxyAttribute, '_xmodule')  # pylint: disable=invalid-name
+descriptor_attr = partial(ProxyAttribute, 'descriptor')  # pylint: disable=invalid-name
+module_runtime_attr = partial(ProxyAttribute, 'xmodule_runtime')  # pylint: disable=invalid-name
+
+
+class XModule(XModuleMixin, HTMLSnippet, XBlock):  # pylint: disable=abstract-method
+    """ Implements a generic learning module.
+
+        Subclasses must at a minimum provide a definition for get_html in order
+        to be displayed to users.
+
+        See the HTML module for a simple example.
+    """
+
+    # The default implementation of get_icon_class returns the icon_class
+    # attribute of the class
+    #
+    # This attribute can be overridden by subclasses, and
+    # the function can also be overridden if the icon class depends on the data
+    # in the module
+    icon_class = 'other'
+
+    has_score = descriptor_attr('has_score')
+    _field_data_cache = descriptor_attr('_field_data_cache')
+    _field_data = descriptor_attr('_field_data')
+    _dirty_fields = descriptor_attr('_dirty_fields')
+
+    def __init__(self, descriptor, *args, **kwargs):
+        """
+        Construct a new xmodule
+
+        runtime: An XBlock runtime allowing access to external resources
+
+        descriptor: the XModuleDescriptor that this module is an instance of.
+
+        field_data: A dictionary-like object that maps field names to values
+            for those fields.
+        """
+        # Set the descriptor first so that we can proxy to it
+        self.descriptor = descriptor
+        super(XModule, self).__init__(*args, **kwargs)
+        self._loaded_children = None
+        self.system = self.runtime
+
+    def __unicode__(self):
+        return u'<x_module(id={0})>'.format(self.id)
+
     def handle_ajax(self, _dispatch, _data):
         """ dispatch is last part of the URL.
             data is a dictionary-like object with the content of the request"""
-        return ""
+        return u""
 
+    def get_children(self):
+        """
+        Return module instances for all the children of this module.
+        """
+        if self._loaded_children is None:
+            child_descriptors = self.get_child_descriptors()
+
+            # This deliberately uses system.get_module, rather than runtime.get_block,
+            # because we're looking at XModule children, rather than XModuleDescriptor children.
+            # That means it can use the deprecated XModule apis, rather than future XBlock apis
+
+            # TODO: Once we're in a system where this returns a mix of XModuleDescriptors
+            # and XBlocks, we're likely to have to change this more
+            children = [self.system.get_module(descriptor) for descriptor in child_descriptors]
+            # get_module returns None if the current user doesn't have access
+            # to the location.
+            self._loaded_children = [c for c in children if c is not None]
+
+        return self._loaded_children
+
+    def get_child_descriptors(self):
+        """
+        Returns the descriptors of the child modules
+
+        Overriding this changes the behavior of get_children and
+        anything that uses get_children, such as get_display_items.
+
+        This method will not instantiate the modules of the children
+        unless absolutely necessary, so it is cheaper to call than get_children
+
+        These children will be the same children returned by the
+        descriptor unless descriptor.has_dynamic_children() is true.
+        """
+        return self.descriptor.get_children()
+
+    def displayable_items(self):
+        """
+        Returns list of displayable modules contained by this module. If this
+        module is visible, should return [self].
+        """
+        return [self.descriptor]
 
     # ~~~~~~~~~~~~~~~ XBlock API Wrappers ~~~~~~~~~~~~~~~~
     def student_view(self, context):
@@ -489,24 +565,7 @@ class XModuleDescriptor(XModuleMixin, HTMLSnippet, ResourceTemplates, XBlock):
         # by following previous until None
         # definition_locator is only used by mongostores which separate definitions from blocks
         self.edited_by = self.edited_on = self.previous_version = self.update_version = self.definition_locator = None
-        self._child_instances = None
-
-
-    def xmodule(self, system):
-        """
-        Returns an XModule.
-
-        system: Module system
-        """
-        # save any field changes
-        module = system.construct_xblock_from_class(
-            self.module_class,
-            descriptor=self,
-            scope_ids=self.scope_ids,
-            field_data=system.xmodule_field_data(self),
-        )
-        module.save()
-        return module
+        self.xmodule_runtime = None
 
     def has_dynamic_children(self):
         """
@@ -644,6 +703,42 @@ class XModuleDescriptor(XModuleMixin, HTMLSnippet, ResourceTemplates, XBlock):
 
         return metadata_fields
 
+    # ~~~~~~~~~~~~~~~ XModule Indirection ~~~~~~~~~~~~~~~~
+    @property
+    def _xmodule(self):
+        """
+        Returns the XModule corresponding to this descriptor. Expects that the system
+        already supports all of the attributes needed by xmodules
+        """
+        assert self.xmodule_runtime is not None
+        assert self.xmodule_runtime.error_descriptor_class is not None
+        if self.xmodule_runtime.xmodule_instance is None:
+            try:
+                self.xmodule_runtime.xmodule_instance = self.xmodule_runtime.construct_xblock_from_class(
+                    self.module_class,
+                    descriptor=self,
+                    scope_ids=self.scope_ids,
+                    field_data=self._field_data,
+                )
+                self.xmodule_runtime.xmodule_instance.save()
+            except Exception:  # pylint: disable=broad-except
+                log.exception('Error creating xmodule')
+                descriptor = self.xmodule_runtime.error_descriptor_class.from_descriptor(
+                    self,
+                    error_msg=exc_info_to_str(sys.exc_info())
+                )
+                self.xmodule_runtime.xmodule_instance = descriptor._xmodule  # pylint: disable=protected-access
+        return self.xmodule_runtime.xmodule_instance
+
+    displayable_items = module_attr('displayable_items')
+    get_display_items = module_attr('get_display_items')
+    get_icon_class = module_attr('get_icon_class')
+    get_progress = module_attr('get_progress')
+    get_score = module_attr('get_score')
+    handle_ajax = module_attr('handle_ajax')
+    max_score = module_attr('max_score')
+    student_view = module_attr('student_view')
+
     # ~~~~~~~~~~~~~~~ XBlock API Wrappers ~~~~~~~~~~~~~~~~
     def studio_view(self, _context):
         """
@@ -766,6 +861,13 @@ class DescriptorSystem(ConfigurableFragmentWrapper, Runtime):  # pylint: disable
             result['default_value'] = field.to_json(field.default)
         return result
 
+    def render(self, block, view_name, context=None):
+        if isinstance(block, (XModule, XModuleDescriptor)) and view_name == 'student_view':
+            assert block.xmodule_runtime is not None
+            return block.xmodule_runtime.render(block._xmodule, view_name, context)
+        else:
+            return super(DescriptorSystem, self).render(block, view_name, context)
+
 
 class XMLParsingSystem(DescriptorSystem):
     def __init__(self, process_xml, policy, **kwargs):
@@ -795,12 +897,12 @@ class ModuleSystem(ConfigurableFragmentWrapper, Runtime):  # pylint: disable=abs
     """
     def __init__(
             self, static_url, ajax_url, track_function, get_module, render_template,
-            replace_urls, xmodule_field_data, user=None, filestore=None,
+            replace_urls, user=None, filestore=None,
             debug=False, hostname="", xqueue=None, publish=None, node_path="",
             anonymous_student_id='', course_id=None,
             open_ended_grading_interface=None, s3_interface=None,
             cache=None, can_execute_unsafe_code=None, replace_course_urls=None,
-            replace_jump_to_id_urls=None, **kwargs):
+            replace_jump_to_id_urls=None, error_descriptor_class=None, **kwargs):
         """
         Create a closure around the system environment.
 
@@ -842,9 +944,6 @@ class ModuleSystem(ConfigurableFragmentWrapper, Runtime):  # pylint: disable=abs
 
         publish(event) - A function that allows XModules to publish events (such as grade changes)
 
-        xmodule_field_data - A function that constructs a field_data for an xblock from its
-            corresponding descriptor
-
         cache - A cache object with two methods:
             .get(key) returns an object from the cache or None.
             .set(key, value, timeout_secs=None) stores a value in the cache with a timeout.
@@ -852,6 +951,8 @@ class ModuleSystem(ConfigurableFragmentWrapper, Runtime):  # pylint: disable=abs
         can_execute_unsafe_code - A function returning a boolean, whether or
             not to allow the execution of unsafe, unsandboxed code.
 
+        error_descriptor_class - The class to use to render XModules with errors
+
         """
 
         # Right now, usage_store is unused, and field_data is always supplanted
@@ -873,7 +974,6 @@ class ModuleSystem(ConfigurableFragmentWrapper, Runtime):  # pylint: disable=abs
         self.anonymous_student_id = anonymous_student_id
         self.course_id = course_id
         self.user_is_staff = user is not None and user.is_staff
-        self.xmodule_field_data = xmodule_field_data
 
         if publish is None:
             publish = lambda e: None
@@ -887,6 +987,8 @@ class ModuleSystem(ConfigurableFragmentWrapper, Runtime):  # pylint: disable=abs
         self.can_execute_unsafe_code = can_execute_unsafe_code or (lambda: False)
         self.replace_course_urls = replace_course_urls
         self.replace_jump_to_id_urls = replace_jump_to_id_urls
+        self.error_descriptor_class = error_descriptor_class
+        self.xmodule_instance = None
 
     def get(self, attr):
         """	provide uniform access to attributes (like etree)."""
diff --git a/common/static/coffee/src/discussion/utils.coffee b/common/static/coffee/src/discussion/utils.coffee
index e2ca220a8d..dd7caeb033 100644
--- a/common/static/coffee/src/discussion/utils.coffee
+++ b/common/static/coffee/src/discussion/utils.coffee
@@ -3,7 +3,7 @@ $ ->
     window.$$contents = {}
   $.fn.extend
     loading: ->
-      @$_loading = $("<div class='loading-animation'></div>")
+      @$_loading = $("<div class='loading-animation'><span class='sr'>Loading content</span></div>")
       $(this).after(@$_loading)
     loaded: ->
       @$_loading.remove()
diff --git a/common/static/coffee/src/discussion/views/discussion_content_view.coffee b/common/static/coffee/src/discussion/views/discussion_content_view.coffee
index 9b2de1b198..001dc887cd 100644
--- a/common/static/coffee/src/discussion/views/discussion_content_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_content_view.coffee
@@ -4,7 +4,7 @@ if Backbone?
   
     events:
       "click .discussion-flag-abuse": "toggleFlagAbuse"
-  
+      "keypress .discussion-flag-abuse": "toggleFlagAbuseKeypress"
   
     attrRenderer:
       endorsed: (endorsed) ->
@@ -106,6 +106,10 @@ if Backbone?
       @model.bind('change', @renderPartialAttrs, @)
       
      
+    toggleFlagAbuseKeypress: (event) ->
+      # Activate on spacebar or enter
+      if event.which == 32 or event.which == 13
+        @toggleFlagAbuse(event)
      
     toggleFlagAbuse: (event) ->
       event.preventDefault()
diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
index 8259004893..5a1e3fa9ae 100644
--- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
@@ -124,7 +124,7 @@ if Backbone?
     loadMorePages: (event) ->
       if event
         event.preventDefault()
-      @$(".more-pages").html('<div class="loading-animation"></div>')
+      @$(".more-pages").html('<div class="loading-animation"><span class="sr">Loading more threads</span></div>')
       @$(".more-pages").addClass("loading")
       options = {}
       switch @mode
@@ -405,7 +405,7 @@ if Backbone?
         type: "GET"
         $loading: $
         loadingCallback: =>
-          @$(".post-list").html('<li class="loading"><div class="loading-animation"></div></li>')
+          @$(".post-list").html('<li class="loading"><div class="loading-animation"><span class="sr">Loading thread list</span></div></li>')
         loadedCallback: =>
           if callback
             callback.apply @, [value]
diff --git a/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
index ef873d961c..54436ec481 100644
--- a/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
@@ -4,6 +4,7 @@ if Backbone?
     events:
       "click .discussion-vote": "toggleVote"
       "click .discussion-flag-abuse": "toggleFlagAbuse"
+      "keypress .discussion-flag-abuse": "toggleFlagAbuseKeypress"
       "click .admin-pin": "togglePin"
       "click .action-follow": "toggleFollowing"
       "click .action-edit": "edit"
@@ -51,10 +52,12 @@ if Backbone?
       if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isFlagModerator and @model.get("abuse_flaggers").length > 0)
         @$("[data-role=thread-flag]").addClass("flagged")  
         @$("[data-role=thread-flag]").removeClass("notflagged")
+        @$(".discussion-flag-abuse").attr("aria-pressed", "true")
         @$(".discussion-flag-abuse .flag-label").html("Misuse Reported")
       else
         @$("[data-role=thread-flag]").removeClass("flagged")  
         @$("[data-role=thread-flag]").addClass("notflagged")      
+        @$(".discussion-flag-abuse").attr("aria-pressed", "false")
         @$(".discussion-flag-abuse .flag-label").html("Report Misuse")
 
     renderPinned: =>
diff --git a/common/static/coffee/src/discussion/views/response_comment_show_view.coffee b/common/static/coffee/src/discussion/views/response_comment_show_view.coffee
index 6023964c75..0e51d6a11a 100644
--- a/common/static/coffee/src/discussion/views/response_comment_show_view.coffee
+++ b/common/static/coffee/src/discussion/views/response_comment_show_view.coffee
@@ -1,9 +1,6 @@
 if Backbone?
   class @ResponseCommentShowView extends DiscussionContentView
 
-    events:
-      "click .discussion-flag-abuse": "toggleFlagAbuse"
-
     tagName: "li"
 
     initialize: ->
@@ -48,9 +45,15 @@ if Backbone?
       if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isFlagModerator and @model.get("abuse_flaggers").length > 0)
         @$("[data-role=thread-flag]").addClass("flagged")
         @$("[data-role=thread-flag]").removeClass("notflagged")
+        @$(".discussion-flag-abuse").attr("aria-pressed", "true")
+        @$(".discussion-flag-abuse").attr("data-tooltip", "Misuse Reported")
+        @$(".discussion-flag-abuse .flag-label").html("Misuse Reported")
       else
         @$("[data-role=thread-flag]").removeClass("flagged")
         @$("[data-role=thread-flag]").addClass("notflagged")
+        @$(".discussion-flag-abuse").attr("aria-pressed", "false")
+        @$(".discussion-flag-abuse").attr("data-tooltip", "Report Misuse")
+        @$(".discussion-flag-abuse .flag-label").html("Report Misuse")
 
     updateModelDetails: =>
       @renderFlagged()
diff --git a/common/static/coffee/src/discussion/views/thread_response_show_view.coffee b/common/static/coffee/src/discussion/views/thread_response_show_view.coffee
index 43b2d3055e..aaff4a4a39 100644
--- a/common/static/coffee/src/discussion/views/thread_response_show_view.coffee
+++ b/common/static/coffee/src/discussion/views/thread_response_show_view.coffee
@@ -6,6 +6,7 @@ if Backbone?
         "click .action-delete": "_delete"
         "click .action-edit": "edit"
         "click .discussion-flag-abuse": "toggleFlagAbuse"
+        "keypress .discussion-flag-abuse": "toggleFlagAbuseKeypress"
 
     $: (selector) ->
         @$el.find(selector)
@@ -104,10 +105,12 @@ if Backbone?
       if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isFlagModerator and @model.get("abuse_flaggers").length > 0)
         @$("[data-role=thread-flag]").addClass("flagged")  
         @$("[data-role=thread-flag]").removeClass("notflagged")
+        @$(".discussion-flag-abuse").attr("aria-pressed", "true")
         @$(".discussion-flag-abuse .flag-label").html("Misuse Reported")
       else
         @$("[data-role=thread-flag]").removeClass("flagged")  
         @$("[data-role=thread-flag]").addClass("notflagged")      
+        @$(".discussion-flag-abuse").attr("aria-pressed", "false")
         @$(".discussion-flag-abuse .flag-label").html("Report Misuse")   
         
     updateModelDetails: =>
diff --git a/common/static/js/capa/drag_and_drop.js b/common/static/js/capa/drag_and_drop.js
index 2a9c2e4011..a23138235a 100644
--- a/common/static/js/capa/drag_and_drop.js
+++ b/common/static/js/capa/drag_and_drop.js
@@ -4,9 +4,10 @@
 // See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
 
-requirejs.config({
-    'baseUrl': '/static/js/capa/drag_and_drop/'
-});
+// HACK: this should be removed when it is safe to do so
+if(window.baseUrl) {
+    requirejs.config({baseUrl: baseUrl});
+}
 
 // The current JS file will be loaded and run each time. It will require a
 // single dependency which will be loaded and stored by RequireJS. On
@@ -14,7 +15,7 @@ requirejs.config({
 // than loading it again from the server. For that reason, it is a good idea to
 // keep the current JS file as small as possible, and move everything else into
 // RequireJS module dependencies.
-requirejs(['main'], function (Main) {
+require(['js/capa/drag_and_drop/main'], function (Main) {
     Main();
 });
 
diff --git a/common/static/js/capa/drag_and_drop/base_image.js b/common/static/js/capa/drag_and_drop/base_image.js
index ad3da20e94..fa7266f2aa 100644
--- a/common/static/js/capa/drag_and_drop/base_image.js
+++ b/common/static/js/capa/drag_and_drop/base_image.js
@@ -1,5 +1,5 @@
 (function (requirejs, require, define) {
-define(['logme'], function (logme) {
+define(['js/capa/drag_and_drop/logme'], function (logme) {
     return BaseImage;
 
     function BaseImage(state) {
diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index d84a8da913..3fb82e91bf 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -1,5 +1,5 @@
 (function (requirejs, require, define) {
-define(['logme'], function (logme) {
+define(['js/capa/drag_and_drop/logme'], function (logme) {
     return configParser;
 
     function configParser(state, config) {
diff --git a/common/static/js/capa/drag_and_drop/container.js b/common/static/js/capa/drag_and_drop/container.js
index 0c627f12d3..8f550dc475 100644
--- a/common/static/js/capa/drag_and_drop/container.js
+++ b/common/static/js/capa/drag_and_drop/container.js
@@ -1,5 +1,5 @@
 (function (requirejs, require, define) {
-define(['logme'], function (logme) {
+define(['js/capa/drag_and_drop/logme'], function (logme) {
     return Container;
 
     function Container(state) {
diff --git a/common/static/js/capa/drag_and_drop/draggable_events.js b/common/static/js/capa/drag_and_drop/draggable_events.js
index 73d03b3cfd..0fc74bc3fc 100644
--- a/common/static/js/capa/drag_and_drop/draggable_events.js
+++ b/common/static/js/capa/drag_and_drop/draggable_events.js
@@ -1,5 +1,5 @@
 (function (requirejs, require, define) {
-define(['logme'], function (logme) {
+define(['js/capa/drag_and_drop/logme'], function (logme) {
 return {
     'attachMouseEventsTo': function (element) {
         var self;
diff --git a/common/static/js/capa/drag_and_drop/draggable_logic.js b/common/static/js/capa/drag_and_drop/draggable_logic.js
index e64dc70baa..25ccc1a587 100644
--- a/common/static/js/capa/drag_and_drop/draggable_logic.js
+++ b/common/static/js/capa/drag_and_drop/draggable_logic.js
@@ -1,5 +1,5 @@
 (function (requirejs, require, define) {
-define(['logme', 'update_input', 'targets'], function (logme, updateInput, Targets) {
+define(['js/capa/drag_and_drop/logme', 'js/capa/drag_and_drop/update_input', 'js/capa/drag_and_drop/targets'], function (logme, updateInput, Targets) {
 return {
     'moveDraggableTo': function (moveType, target, funcCallback) {
         var self, offset;
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 67ade195b0..f26ebd3cdf 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -1,5 +1,5 @@
 (function (requirejs, require, define) {
-define(['logme', 'draggable_events', 'draggable_logic'], function (logme, draggableEvents, draggableLogic) {
+define(['js/capa/drag_and_drop/logme', 'js/capa/drag_and_drop/draggable_events', 'js/capa/drag_and_drop/draggable_logic'], function (logme, draggableEvents, draggableLogic) {
     return {
         'init': init
     };
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 92c71e008b..9ad7f1bef9 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -1,6 +1,10 @@
 (function (requirejs, require, define) {
 define(
-    ['logme', 'state', 'config_parser', 'container', 'base_image', 'scroller', 'draggables', 'targets', 'update_input'],
+    ['js/capa/drag_and_drop/logme', 'js/capa/drag_and_drop/state',
+     'js/capa/drag_and_drop/config_parser', 'js/capa/drag_and_drop/container',
+     'js/capa/drag_and_drop/base_image', 'js/capa/drag_and_drop/scroller',
+     'js/capa/drag_and_drop/draggables', 'js/capa/drag_and_drop/targets',
+     'js/capa/drag_and_drop/update_input'],
     function (logme, State, configParser, Container, BaseImage, Scroller, Draggables, Targets, updateInput) {
     return Main;
 
diff --git a/common/static/js/capa/drag_and_drop/scroller.js b/common/static/js/capa/drag_and_drop/scroller.js
index 7aa1ff4108..88cba9d429 100644
--- a/common/static/js/capa/drag_and_drop/scroller.js
+++ b/common/static/js/capa/drag_and_drop/scroller.js
@@ -1,5 +1,5 @@
 (function (requirejs, require, define) {
-define(['logme'], function (logme) {
+define(['js/capa/drag_and_drop/logme'], function (logme) {
     return Scroller;
 
     function Scroller(state) {
@@ -40,7 +40,7 @@ define(['logme'], function (logme) {
                         '-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.7) inset; ' +
                         'box-shadow: 0 1px 0 rgba(255, 255, 255, 0.7) inset; ' +
 
-                        'background-image: url(\'/static/images/arrow-left.png\'); ' +
+                        "background-image: url('"+baseUrl+"images/arrow-left.png'); " +
                         'background-position: center center; ' +
                         'background-repeat: no-repeat; ' +
                     '" ' +
@@ -136,7 +136,7 @@ define(['logme'], function (logme) {
                         '-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.7) inset; ' +
                         'box-shadow: 0 1px 0 rgba(255, 255, 255, 0.7) inset; ' +
 
-                        'background-image: url(\'/static/images/arrow-right.png\'); ' +
+                        "background-image: url('"+baseUrl+"images/arrow-right.png'); " +
                         'background-position: center center; ' +
                         'background-repeat: no-repeat; ' +
                     '" ' +
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
index 3a8e2c4b2d..6262aa20ff 100644
--- a/common/static/js/capa/drag_and_drop/targets.js
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -1,5 +1,5 @@
 (function (requirejs, require, define) {
-define(['logme'], function (logme) {
+define(['js/capa/drag_and_drop/logme'], function (logme) {
     return {
         'initializeBaseTargets': initializeBaseTargets,
         'initializeTargetField': initializeTargetField,
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 804b0bed97..05992f59e9 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -1,5 +1,5 @@
 (function (requirejs, require, define) {
-define(['logme'], function (logme) {
+define(['js/capa/drag_and_drop/logme'], function (logme) {
     return {
         'check': check,
         'update': update
diff --git a/common/static/js/load_youtube.js b/common/static/js/load_youtube.js
deleted file mode 100644
index 98f296d06a..0000000000
--- a/common/static/js/load_youtube.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define(["jquery"], function($) {
-    var url = "//www.youtube.com/player_api";
-    $("head").append($("<script/>", {src: url}));
-    return window.YT;
-});
diff --git a/common/static/js/vendor/draggabilly.pkgd.js b/common/static/js/vendor/draggabilly.pkgd.js
new file mode 100644
index 0000000000..75337fd1a3
--- /dev/null
+++ b/common/static/js/vendor/draggabilly.pkgd.js
@@ -0,0 +1,1376 @@
+/*!
+ * Draggabilly PACKAGED v1.0.5
+ * Make that shiz draggable
+ * http://draggabilly.desandro.com
+ */
+
+/*!
+ * classie - class helper functions
+ * from bonzo https://github.com/ded/bonzo
+ * 
+ * classie.has( elem, 'my-class' ) -> true/false
+ * classie.add( elem, 'my-new-class' )
+ * classie.remove( elem, 'my-unwanted-class' )
+ * classie.toggle( elem, 'my-class' )
+ */
+
+/*jshint browser: true, strict: true, undef: true */
+/*global define: false */
+
+( function( window ) {
+
+    'use strict';
+
+// class helper functions from bonzo https://github.com/ded/bonzo
+
+    function classReg( className ) {
+        return new RegExp("(^|\\s+)" + className + "(\\s+|$)");
+    }
+
+// classList support for class management
+// altho to be fair, the api sucks because it won't accept multiple classes at once
+    var hasClass, addClass, removeClass;
+
+    if ( 'classList' in document.documentElement ) {
+        hasClass = function( elem, c ) {
+            return elem.classList.contains( c );
+        };
+        addClass = function( elem, c ) {
+            elem.classList.add( c );
+        };
+        removeClass = function( elem, c ) {
+            elem.classList.remove( c );
+        };
+    }
+    else {
+        hasClass = function( elem, c ) {
+            return classReg( c ).test( elem.className );
+        };
+        addClass = function( elem, c ) {
+            if ( !hasClass( elem, c ) ) {
+                elem.className = elem.className + ' ' + c;
+            }
+        };
+        removeClass = function( elem, c ) {
+            elem.className = elem.className.replace( classReg( c ), ' ' );
+        };
+    }
+
+    function toggleClass( elem, c ) {
+        var fn = hasClass( elem, c ) ? removeClass : addClass;
+        fn( elem, c );
+    }
+
+    var classie = {
+        // full names
+        hasClass: hasClass,
+        addClass: addClass,
+        removeClass: removeClass,
+        toggleClass: toggleClass,
+        // short names
+        has: hasClass,
+        add: addClass,
+        remove: removeClass,
+        toggle: toggleClass
+    };
+
+// transport
+    if ( typeof define === 'function' && define.amd ) {
+        // AMD
+        define("classie", classie);
+    } else {
+        // browser global
+        window.classie = classie;
+    }
+
+})( window );
+
+/*!
+ * eventie v1.0.3
+ * event binding helper
+ *   eventie.bind( elem, 'click', myFn )
+ *   eventie.unbind( elem, 'click', myFn )
+ */
+
+/*jshint browser: true, undef: true, unused: true */
+/*global define: false */
+
+( function( window ) {
+
+    'use strict';
+
+    var docElem = document.documentElement;
+
+    var bind = function() {};
+
+    if ( docElem.addEventListener ) {
+        bind = function( obj, type, fn ) {
+            obj.addEventListener( type, fn, false );
+        };
+    } else if ( docElem.attachEvent ) {
+        bind = function( obj, type, fn ) {
+            obj[ type + fn ] = fn.handleEvent ?
+                function() {
+                    var event = window.event;
+                    // add event.target
+                    event.target = event.target || event.srcElement;
+                    fn.handleEvent.call( fn, event );
+                } :
+                function() {
+                    var event = window.event;
+                    // add event.target
+                    event.target = event.target || event.srcElement;
+                    fn.call( obj, event );
+                };
+            obj.attachEvent( "on" + type, obj[ type + fn ] );
+        };
+    }
+
+    var unbind = function() {};
+
+    if ( docElem.removeEventListener ) {
+        unbind = function( obj, type, fn ) {
+            obj.removeEventListener( type, fn, false );
+        };
+    } else if ( docElem.detachEvent ) {
+        unbind = function( obj, type, fn ) {
+            obj.detachEvent( "on" + type, obj[ type + fn ] );
+            try {
+                delete obj[ type + fn ];
+            } catch ( err ) {
+                // can't delete window object properties
+                obj[ type + fn ] = undefined;
+            }
+        };
+    }
+
+    var eventie = {
+        bind: bind,
+        unbind: unbind
+    };
+
+// transport
+    if ( typeof define === 'function' && define.amd ) {
+        // AMD
+        define("eventie", eventie);
+    } else {
+        // browser global
+        window.eventie = eventie;
+    }
+
+})( this );
+
+/*!
+ * EventEmitter v4.2.4 - git.io/ee
+ * Oliver Caldwell
+ * MIT license
+ * @preserve
+ */
+
+(function () {
+    'use strict';
+
+    /**
+     * Class for managing events.
+     * Can be extended to provide event functionality in other classes.
+     *
+     * @class EventEmitter Manages event registering and emitting.
+     */
+    function EventEmitter() {}
+
+    // Shortcuts to improve speed and size
+
+    // Easy access to the prototype
+    var proto = EventEmitter.prototype;
+
+    /**
+     * Finds the index of the listener for the event in it's storage array.
+     *
+     * @param {Function[]} listeners Array of listeners to search through.
+     * @param {Function} listener Method to look for.
+     * @return {Number} Index of the specified listener, -1 if not found
+     * @api private
+     */
+    function indexOfListener(listeners, listener) {
+        var i = listeners.length;
+        while (i--) {
+            if (listeners[i].listener === listener) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    /**
+     * Alias a method while keeping the context correct, to allow for overwriting of target method.
+     *
+     * @param {String} name The name of the target method.
+     * @return {Function} The aliased method
+     * @api private
+     */
+    function alias(name) {
+        return function aliasClosure() {
+            return this[name].apply(this, arguments);
+        };
+    }
+
+    /**
+     * Returns the listener array for the specified event.
+     * Will initialise the event object and listener arrays if required.
+     * Will return an object if you use a regex search. The object contains keys for each matched event. So /ba[rz]/ might return an object containing bar and baz. But only if you have either defined them with defineEvent or added some listeners to them.
+     * Each property in the object response is an array of listener functions.
+     *
+     * @param {String|RegExp} evt Name of the event to return the listeners from.
+     * @return {Function[]|Object} All listener functions for the event.
+     */
+    proto.getListeners = function getListeners(evt) {
+        var events = this._getEvents();
+        var response;
+        var key;
+
+        // Return a concatenated array of all matching events if
+        // the selector is a regular expression.
+        if (typeof evt === 'object') {
+            response = {};
+            for (key in events) {
+                if (events.hasOwnProperty(key) && evt.test(key)) {
+                    response[key] = events[key];
+                }
+            }
+        }
+        else {
+            response = events[evt] || (events[evt] = []);
+        }
+
+        return response;
+    };
+
+    /**
+     * Takes a list of listener objects and flattens it into a list of listener functions.
+     *
+     * @param {Object[]} listeners Raw listener objects.
+     * @return {Function[]} Just the listener functions.
+     */
+    proto.flattenListeners = function flattenListeners(listeners) {
+        var flatListeners = [];
+        var i;
+
+        for (i = 0; i < listeners.length; i += 1) {
+            flatListeners.push(listeners[i].listener);
+        }
+
+        return flatListeners;
+    };
+
+    /**
+     * Fetches the requested listeners via getListeners but will always return the results inside an object. This is mainly for internal use but others may find it useful.
+     *
+     * @param {String|RegExp} evt Name of the event to return the listeners from.
+     * @return {Object} All listener functions for an event in an object.
+     */
+    proto.getListenersAsObject = function getListenersAsObject(evt) {
+        var listeners = this.getListeners(evt);
+        var response;
+
+        if (listeners instanceof Array) {
+            response = {};
+            response[evt] = listeners;
+        }
+
+        return response || listeners;
+    };
+
+    /**
+     * Adds a listener function to the specified event.
+     * The listener will not be added if it is a duplicate.
+     * If the listener returns true then it will be removed after it is called.
+     * If you pass a regular expression as the event name then the listener will be added to all events that match it.
+     *
+     * @param {String|RegExp} evt Name of the event to attach the listener to.
+     * @param {Function} listener Method to be called when the event is emitted. If the function returns true then it will be removed after calling.
+     * @return {Object} Current instance of EventEmitter for chaining.
+     */
+    proto.addListener = function addListener(evt, listener) {
+        var listeners = this.getListenersAsObject(evt);
+        var listenerIsWrapped = typeof listener === 'object';
+        var key;
+
+        for (key in listeners) {
+            if (listeners.hasOwnProperty(key) && indexOfListener(listeners[key], listener) === -1) {
+                listeners[key].push(listenerIsWrapped ? listener : {
+                    listener: listener,
+                    once: false
+                });
+            }
+        }
+
+        return this;
+    };
+
+    /**
+     * Alias of addListener
+     */
+    proto.on = alias('addListener');
+
+    /**
+     * Semi-alias of addListener. It will add a listener that will be
+     * automatically removed after it's first execution.
+     *
+     * @param {String|RegExp} evt Name of the event to attach the listener to.
+     * @param {Function} listener Method to be called when the event is emitted. If the function returns true then it will be removed after calling.
+     * @return {Object} Current instance of EventEmitter for chaining.
+     */
+    proto.addOnceListener = function addOnceListener(evt, listener) {
+        return this.addListener(evt, {
+            listener: listener,
+            once: true
+        });
+    };
+
+    /**
+     * Alias of addOnceListener.
+     */
+    proto.once = alias('addOnceListener');
+
+    /**
+     * Defines an event name. This is required if you want to use a regex to add a listener to multiple events at once. If you don't do this then how do you expect it to know what event to add to? Should it just add to every possible match for a regex? No. That is scary and bad.
+     * You need to tell it what event names should be matched by a regex.
+     *
+     * @param {String} evt Name of the event to create.
+     * @return {Object} Current instance of EventEmitter for chaining.
+     */
+    proto.defineEvent = function defineEvent(evt) {
+        this.getListeners(evt);
+        return this;
+    };
+
+    /**
+     * Uses defineEvent to define multiple events.
+     *
+     * @param {String[]} evts An array of event names to define.
+     * @return {Object} Current instance of EventEmitter for chaining.
+     */
+    proto.defineEvents = function defineEvents(evts) {
+        for (var i = 0; i < evts.length; i += 1) {
+            this.defineEvent(evts[i]);
+        }
+        return this;
+    };
+
+    /**
+     * Removes a listener function from the specified event.
+     * When passed a regular expression as the event name, it will remove the listener from all events that match it.
+     *
+     * @param {String|RegExp} evt Name of the event to remove the listener from.
+     * @param {Function} listener Method to remove from the event.
+     * @return {Object} Current instance of EventEmitter for chaining.
+     */
+    proto.removeListener = function removeListener(evt, listener) {
+        var listeners = this.getListenersAsObject(evt);
+        var index;
+        var key;
+
+        for (key in listeners) {
+            if (listeners.hasOwnProperty(key)) {
+                index = indexOfListener(listeners[key], listener);
+
+                if (index !== -1) {
+                    listeners[key].splice(index, 1);
+                }
+            }
+        }
+
+        return this;
+    };
+
+    /**
+     * Alias of removeListener
+     */
+    proto.off = alias('removeListener');
+
+    /**
+     * Adds listeners in bulk using the manipulateListeners method.
+     * If you pass an object as the second argument you can add to multiple events at once. The object should contain key value pairs of events and listeners or listener arrays. You can also pass it an event name and an array of listeners to be added.
+     * You can also pass it a regular expression to add the array of listeners to all events that match it.
+     * Yeah, this function does quite a bit. That's probably a bad thing.
+     *
+     * @param {String|Object|RegExp} evt An event name if you will pass an array of listeners next. An object if you wish to add to multiple events at once.
+     * @param {Function[]} [listeners] An optional array of listener functions to add.
+     * @return {Object} Current instance of EventEmitter for chaining.
+     */
+    proto.addListeners = function addListeners(evt, listeners) {
+        // Pass through to manipulateListeners
+        return this.manipulateListeners(false, evt, listeners);
+    };
+
+    /**
+     * Removes listeners in bulk using the manipulateListeners method.
+     * If you pass an object as the second argument you can remove from multiple events at once. The object should contain key value pairs of events and listeners or listener arrays.
+     * You can also pass it an event name and an array of listeners to be removed.
+     * You can also pass it a regular expression to remove the listeners from all events that match it.
+     *
+     * @param {String|Object|RegExp} evt An event name if you will pass an array of listeners next. An object if you wish to remove from multiple events at once.
+     * @param {Function[]} [listeners] An optional array of listener functions to remove.
+     * @return {Object} Current instance of EventEmitter for chaining.
+     */
+    proto.removeListeners = function removeListeners(evt, listeners) {
+        // Pass through to manipulateListeners
+        return this.manipulateListeners(true, evt, listeners);
+    };
+
+    /**
+     * Edits listeners in bulk. The addListeners and removeListeners methods both use this to do their job. You should really use those instead, this is a little lower level.
+     * The first argument will determine if the listeners are removed (true) or added (false).
+     * If you pass an object as the second argument you can add/remove from multiple events at once. The object should contain key value pairs of events and listeners or listener arrays.
+     * You can also pass it an event name and an array of listeners to be added/removed.
+     * You can also pass it a regular expression to manipulate the listeners of all events that match it.
+     *
+     * @param {Boolean} remove True if you want to remove listeners, false if you want to add.
+     * @param {String|Object|RegExp} evt An event name if you will pass an array of listeners next. An object if you wish to add/remove from multiple events at once.
+     * @param {Function[]} [listeners] An optional array of listener functions to add/remove.
+     * @return {Object} Current instance of EventEmitter for chaining.
+     */
+    proto.manipulateListeners = function manipulateListeners(remove, evt, listeners) {
+        var i;
+        var value;
+        var single = remove ? this.removeListener : this.addListener;
+        var multiple = remove ? this.removeListeners : this.addListeners;
+
+        // If evt is an object then pass each of it's properties to this method
+        if (typeof evt === 'object' && !(evt instanceof RegExp)) {
+            for (i in evt) {
+                if (evt.hasOwnProperty(i) && (value = evt[i])) {
+                    // Pass the single listener straight through to the singular method
+                    if (typeof value === 'function') {
+                        single.call(this, i, value);
+                    }
+                    else {
+                        // Otherwise pass back to the multiple function
+                        multiple.call(this, i, value);
+                    }
+                }
+            }
+        }
+        else {
+            // So evt must be a string
+            // And listeners must be an array of listeners
+            // Loop over it and pass each one to the multiple method
+            i = listeners.length;
+            while (i--) {
+                single.call(this, evt, listeners[i]);
+            }
+        }
+
+        return this;
+    };
+
+    /**
+     * Removes all listeners from a specified event.
+     * If you do not specify an event then all listeners will be removed.
+     * That means every event will be emptied.
+     * You can also pass a regex to remove all events that match it.
+     *
+     * @param {String|RegExp} [evt] Optional name of the event to remove all listeners for. Will remove from every event if not passed.
+     * @return {Object} Current instance of EventEmitter for chaining.
+     */
+    proto.removeEvent = function removeEvent(evt) {
+        var type = typeof evt;
+        var events = this._getEvents();
+        var key;
+
+        // Remove different things depending on the state of evt
+        if (type === 'string') {
+            // Remove all listeners for the specified event
+            delete events[evt];
+        }
+        else if (type === 'object') {
+            // Remove all events matching the regex.
+            for (key in events) {
+                if (events.hasOwnProperty(key) && evt.test(key)) {
+                    delete events[key];
+                }
+            }
+        }
+        else {
+            // Remove all listeners in all events
+            delete this._events;
+        }
+
+        return this;
+    };
+
+    /**
+     * Alias of removeEvent.
+     *
+     * Added to mirror the node API.
+     */
+    proto.removeAllListeners = alias('removeEvent');
+
+    /**
+     * Emits an event of your choice.
+     * When emitted, every listener attached to that event will be executed.
+     * If you pass the optional argument array then those arguments will be passed to every listener upon execution.
+     * Because it uses `apply`, your array of arguments will be passed as if you wrote them out separately.
+     * So they will not arrive within the array on the other side, they will be separate.
+     * You can also pass a regular expression to emit to all events that match it.
+     *
+     * @param {String|RegExp} evt Name of the event to emit and execute listeners for.
+     * @param {Array} [args] Optional array of arguments to be passed to each listener.
+     * @return {Object} Current instance of EventEmitter for chaining.
+     */
+    proto.emitEvent = function emitEvent(evt, args) {
+        var listeners = this.getListenersAsObject(evt);
+        var listener;
+        var i;
+        var key;
+        var response;
+
+        for (key in listeners) {
+            if (listeners.hasOwnProperty(key)) {
+                i = listeners[key].length;
+
+                while (i--) {
+                    // If the listener returns true then it shall be removed from the event
+                    // The function is executed either with a basic call or an apply if there is an args array
+                    listener = listeners[key][i];
+
+                    if (listener.once === true) {
+                        this.removeListener(evt, listener.listener);
+                    }
+
+                    response = listener.listener.apply(this, args || []);
+
+                    if (response === this._getOnceReturnValue()) {
+                        this.removeListener(evt, listener.listener);
+                    }
+                }
+            }
+        }
+
+        return this;
+    };
+
+    /**
+     * Alias of emitEvent
+     */
+    proto.trigger = alias('emitEvent');
+
+    /**
+     * Subtly different from emitEvent in that it will pass its arguments on to the listeners, as opposed to taking a single array of arguments to pass on.
+     * As with emitEvent, you can pass a regex in place of the event name to emit to all events that match it.
+     *
+     * @param {String|RegExp} evt Name of the event to emit and execute listeners for.
+     * @param {...*} Optional additional arguments to be passed to each listener.
+     * @return {Object} Current instance of EventEmitter for chaining.
+     */
+    proto.emit = function emit(evt) {
+        var args = Array.prototype.slice.call(arguments, 1);
+        return this.emitEvent(evt, args);
+    };
+
+    /**
+     * Sets the current value to check against when executing listeners. If a
+     * listeners return value matches the one set here then it will be removed
+     * after execution. This value defaults to true.
+     *
+     * @param {*} value The new value to check for when executing listeners.
+     * @return {Object} Current instance of EventEmitter for chaining.
+     */
+    proto.setOnceReturnValue = function setOnceReturnValue(value) {
+        this._onceReturnValue = value;
+        return this;
+    };
+
+    /**
+     * Fetches the current value to check against when executing listeners. If
+     * the listeners return value matches this one then it should be removed
+     * automatically. It will return true by default.
+     *
+     * @return {*|Boolean} The current value to check for or the default, true.
+     * @api private
+     */
+    proto._getOnceReturnValue = function _getOnceReturnValue() {
+        if (this.hasOwnProperty('_onceReturnValue')) {
+            return this._onceReturnValue;
+        }
+        else {
+            return true;
+        }
+    };
+
+    /**
+     * Fetches the events object and creates one if required.
+     *
+     * @return {Object} The events storage object.
+     * @api private
+     */
+    proto._getEvents = function _getEvents() {
+        return this._events || (this._events = {});
+    };
+
+    // Expose the class either via AMD, CommonJS or the global object
+    if (typeof define === 'function' && define.amd) {
+        define("EventEmitter", function () {
+            return EventEmitter;
+        });
+    }
+    else if (typeof module === 'object' && module.exports){
+        module.exports = EventEmitter;
+    }
+    else {
+        this.EventEmitter = EventEmitter;
+    }
+}.call(this));
+
+/*!
+ * getStyleProperty by kangax
+ * http://perfectionkills.com/feature-testing-css-properties/
+ */
+
+/*jshint browser: true, strict: true, undef: true */
+/*globals define: false */
+
+( function( window ) {
+
+    'use strict';
+
+    var prefixes = 'Webkit Moz ms Ms O'.split(' ');
+    var docElemStyle = document.documentElement.style;
+
+    function getStyleProperty( propName ) {
+        if ( !propName ) {
+            return;
+        }
+
+        // test standard property first
+        if ( typeof docElemStyle[ propName ] === 'string' ) {
+            return propName;
+        }
+
+        // capitalize
+        propName = propName.charAt(0).toUpperCase() + propName.slice(1);
+
+        // test vendor specific properties
+        var prefixed;
+        for ( var i=0, len = prefixes.length; i < len; i++ ) {
+            prefixed = prefixes[i] + propName;
+            if ( typeof docElemStyle[ prefixed ] === 'string' ) {
+                return prefixed;
+            }
+        }
+    }
+
+// transport
+    if ( typeof define === 'function' && define.amd ) {
+        // AMD
+        define("getStyleProperty", function() {
+            return getStyleProperty;
+        });
+    } else {
+        // browser global
+        window.getStyleProperty = getStyleProperty;
+    }
+
+})( window );
+
+/**
+ * getSize v1.1.4
+ * measure size of elements
+ */
+
+/*jshint browser: true, strict: true, undef: true, unused: true */
+/*global define: false */
+
+( function( window, undefined ) {
+
+    'use strict';
+
+// -------------------------- helpers -------------------------- //
+
+    var defView = document.defaultView;
+
+    var getStyle = defView && defView.getComputedStyle ?
+        function( elem ) {
+            return defView.getComputedStyle( elem, null );
+        } :
+        function( elem ) {
+            return elem.currentStyle;
+        };
+
+// get a number from a string, not a percentage
+    function getStyleSize( value ) {
+        var num = parseFloat( value );
+        // not a percent like '100%', and a number
+        var isValid = value.indexOf('%') === -1 && !isNaN( num );
+        return isValid && num;
+    }
+
+// -------------------------- measurements -------------------------- //
+
+    var measurements = [
+        'paddingLeft',
+        'paddingRight',
+        'paddingTop',
+        'paddingBottom',
+        'marginLeft',
+        'marginRight',
+        'marginTop',
+        'marginBottom',
+        'borderLeftWidth',
+        'borderRightWidth',
+        'borderTopWidth',
+        'borderBottomWidth'
+    ];
+
+    function getZeroSize() {
+        var size = {
+            width: 0,
+            height: 0,
+            innerWidth: 0,
+            innerHeight: 0,
+            outerWidth: 0,
+            outerHeight: 0
+        };
+        for ( var i=0, len = measurements.length; i < len; i++ ) {
+            var measurement = measurements[i];
+            size[ measurement ] = 0;
+        }
+        return size;
+    }
+
+
+
+    function defineGetSize( getStyleProperty ) {
+
+// -------------------------- box sizing -------------------------- //
+
+        var boxSizingProp = getStyleProperty('boxSizing');
+        var isBoxSizeOuter;
+
+        /**
+         * WebKit measures the outer-width on style.width on border-box elems
+         * IE & Firefox measures the inner-width
+         */
+        ( function() {
+            if ( !boxSizingProp ) {
+                return;
+            }
+
+            var div = document.createElement('div');
+            div.style.width = '200px';
+            div.style.padding = '1px 2px 3px 4px';
+            div.style.borderStyle = 'solid';
+            div.style.borderWidth = '1px 2px 3px 4px';
+            div.style[ boxSizingProp ] = 'border-box';
+
+            var body = document.body || document.documentElement;
+            body.appendChild( div );
+            var style = getStyle( div );
+
+            isBoxSizeOuter = getStyleSize( style.width ) === 200;
+            body.removeChild( div );
+        })();
+
+
+// -------------------------- getSize -------------------------- //
+
+        function getSize( elem ) {
+            // use querySeletor if elem is string
+            if ( typeof elem === 'string' ) {
+                elem = document.querySelector( elem );
+            }
+
+            // do not proceed on non-objects
+            if ( !elem || typeof elem !== 'object' || !elem.nodeType ) {
+                return;
+            }
+
+            var style = getStyle( elem );
+
+            // if hidden, everything is 0
+            if ( style.display === 'none' ) {
+                return getZeroSize();
+            }
+
+            var size = {};
+            size.width = elem.offsetWidth;
+            size.height = elem.offsetHeight;
+
+            var isBorderBox = size.isBorderBox = !!( boxSizingProp &&
+                style[ boxSizingProp ] && style[ boxSizingProp ] === 'border-box' );
+
+            // get all measurements
+            for ( var i=0, len = measurements.length; i < len; i++ ) {
+                var measurement = measurements[i];
+                var value = style[ measurement ];
+                var num = parseFloat( value );
+                // any 'auto', 'medium' value will be 0
+                size[ measurement ] = !isNaN( num ) ? num : 0;
+            }
+
+            var paddingWidth = size.paddingLeft + size.paddingRight;
+            var paddingHeight = size.paddingTop + size.paddingBottom;
+            var marginWidth = size.marginLeft + size.marginRight;
+            var marginHeight = size.marginTop + size.marginBottom;
+            var borderWidth = size.borderLeftWidth + size.borderRightWidth;
+            var borderHeight = size.borderTopWidth + size.borderBottomWidth;
+
+            var isBorderBoxSizeOuter = isBorderBox && isBoxSizeOuter;
+
+            // overwrite width and height if we can get it from style
+            var styleWidth = getStyleSize( style.width );
+            if ( styleWidth !== false ) {
+                size.width = styleWidth +
+                    // add padding and border unless it's already including it
+                    ( isBorderBoxSizeOuter ? 0 : paddingWidth + borderWidth );
+            }
+
+            var styleHeight = getStyleSize( style.height );
+            if ( styleHeight !== false ) {
+                size.height = styleHeight +
+                    // add padding and border unless it's already including it
+                    ( isBorderBoxSizeOuter ? 0 : paddingHeight + borderHeight );
+            }
+
+            size.innerWidth = size.width - ( paddingWidth + borderWidth );
+            size.innerHeight = size.height - ( paddingHeight + borderHeight );
+
+            size.outerWidth = size.width + marginWidth;
+            size.outerHeight = size.height + marginHeight;
+
+            return size;
+        }
+
+        return getSize;
+
+    }
+
+// transport
+    if ( typeof define === 'function' && define.amd ) {
+        // AMD
+        define("getSize", [ 'getStyleProperty' ], defineGetSize );
+    } else {
+        // browser global
+        window.getSize = defineGetSize( window.getStyleProperty );
+    }
+
+})( window );
+
+/*!
+ * Draggabilly v1.0.5
+ * Make that shiz draggable
+ * http://draggabilly.desandro.com
+ */
+
+( function( window ) {
+
+    'use strict';
+
+// vars
+    var document = window.document;
+
+// -------------------------- helpers -------------------------- //
+
+// extend objects
+    function extend( a, b ) {
+        for ( var prop in b ) {
+            a[ prop ] = b[ prop ];
+        }
+        return a;
+    }
+
+    function noop() {}
+
+// ----- get style ----- //
+
+    var defView = document.defaultView;
+
+    var getStyle = defView && defView.getComputedStyle ?
+        function( elem ) {
+            return defView.getComputedStyle( elem, null );
+        } :
+        function( elem ) {
+            return elem.currentStyle;
+        };
+
+
+// http://stackoverflow.com/a/384380/182183
+    var isElement = ( typeof HTMLElement === 'object' ) ?
+        function isElementDOM2( obj ) {
+            return obj instanceof HTMLElement;
+        } :
+        function isElementQuirky( obj ) {
+            return obj && typeof obj === 'object' &&
+                obj.nodeType === 1 && typeof obj.nodeName === 'string';
+        };
+
+// -------------------------- requestAnimationFrame -------------------------- //
+
+// https://gist.github.com/1866474
+
+    var lastTime = 0;
+    var prefixes = 'webkit moz ms o'.split(' ');
+// get unprefixed rAF and cAF, if present
+    var requestAnimationFrame = window.requestAnimationFrame;
+    var cancelAnimationFrame = window.cancelAnimationFrame;
+// loop through vendor prefixes and get prefixed rAF and cAF
+    var prefix;
+    for( var i = 0; i < prefixes.length; i++ ) {
+        if ( requestAnimationFrame && cancelAnimationFrame ) {
+            break;
+        }
+        prefix = prefixes[i];
+        requestAnimationFrame = requestAnimationFrame || window[ prefix + 'RequestAnimationFrame' ];
+        cancelAnimationFrame  = cancelAnimationFrame  || window[ prefix + 'CancelAnimationFrame' ] ||
+            window[ prefix + 'CancelRequestAnimationFrame' ];
+    }
+
+// fallback to setTimeout and clearTimeout if either request/cancel is not supported
+    if ( !requestAnimationFrame || !cancelAnimationFrame )  {
+        requestAnimationFrame = function( callback ) {
+            var currTime = new Date().getTime();
+            var timeToCall = Math.max( 0, 16 - ( currTime - lastTime ) );
+            var id = window.setTimeout( function() {
+                callback( currTime + timeToCall );
+            }, timeToCall );
+            lastTime = currTime + timeToCall;
+            return id;
+        };
+
+        cancelAnimationFrame = function( id ) {
+            window.clearTimeout( id );
+        };
+    }
+
+// -------------------------- definition -------------------------- //
+
+    function draggabillyDefinition( classie, EventEmitter, eventie, getStyleProperty, getSize ) {
+
+// -------------------------- support -------------------------- //
+
+        var transformProperty = getStyleProperty('transform');
+// TODO fix quick & dirty check for 3D support
+        var is3d = !!getStyleProperty('perspective');
+
+// --------------------------  -------------------------- //
+
+        function Draggabilly( element, options ) {
+            this.element = element;
+
+            this.options = extend( {}, this.options );
+            extend( this.options, options );
+
+            this._create();
+
+        }
+
+// inherit EventEmitter methods
+        extend( Draggabilly.prototype, EventEmitter.prototype );
+
+        Draggabilly.prototype.options = {
+        };
+
+        Draggabilly.prototype._create = function() {
+
+            // properties
+            this.position = {};
+            this._getPosition();
+
+            this.startPoint = { x: 0, y: 0 };
+            this.dragPoint = { x: 0, y: 0 };
+
+            this.startPosition = extend( {}, this.position );
+
+            // set relative positioning
+            var style = getStyle( this.element );
+            if ( style.position !== 'relative' && style.position !== 'absolute' ) {
+                this.element.style.position = 'relative';
+            }
+
+            this.enable();
+            this.setHandles();
+
+        };
+
+        /**
+         * set this.handles and bind start events to 'em
+         */
+        Draggabilly.prototype.setHandles = function() {
+            this.handles = this.options.handle ?
+                this.element.querySelectorAll( this.options.handle ) : [ this.element ];
+
+            for ( var i=0, len = this.handles.length; i < len; i++ ) {
+                var handle = this.handles[i];
+                // bind pointer start event
+                // listen for both, for devices like Chrome Pixel
+                //   which has touch and mouse events
+                eventie.bind( handle, 'mousedown', this );
+                eventie.bind( handle, 'touchstart', this );
+                disableImgOndragstart( handle );
+            }
+        };
+
+// remove default dragging interaction on all images in IE8
+// IE8 does its own drag thing on images, which messes stuff up
+
+        function noDragStart() {
+            return false;
+        }
+
+// TODO replace this with a IE8 test
+        var isIE8 = 'attachEvent' in document.documentElement;
+
+// IE8 only
+        var disableImgOndragstart = !isIE8 ? noop : function( handle ) {
+
+            if ( handle.nodeName === 'IMG' ) {
+                handle.ondragstart = noDragStart;
+            }
+
+            var images = handle.querySelectorAll('img');
+            for ( var i=0, len = images.length; i < len; i++ ) {
+                var img = images[i];
+                img.ondragstart = noDragStart;
+            }
+        };
+
+
+// get left/top position from style
+        Draggabilly.prototype._getPosition = function() {
+            // properties
+            var style = getStyle( this.element );
+
+            var x = parseInt( style.left, 10 );
+            var y = parseInt( style.top, 10 );
+
+            // clean up 'auto' or other non-integer values
+            this.position.x = isNaN( x ) ? 0 : x;
+            this.position.y = isNaN( y ) ? 0 : y;
+
+            this._addTransformPosition( style );
+        };
+
+// add transform: translate( x, y ) to position
+        Draggabilly.prototype._addTransformPosition = function( style ) {
+            if ( !transformProperty ) {
+                return;
+            }
+            var transform = style[ transformProperty ];
+            // bail out if value is 'none'
+            if ( transform.indexOf('matrix') !== 0 ) {
+                return;
+            }
+            // split matrix(1, 0, 0, 1, x, y)
+            var matrixValues = transform.split(',');
+            // translate X value is in 12th or 4th position
+            var xIndex = transform.indexOf('matrix3d') === 0 ? 12 : 4;
+            var translateX = parseInt( matrixValues[ xIndex ], 10 );
+            // translate Y value is in 13th or 5th position
+            var translateY = parseInt( matrixValues[ xIndex + 1 ], 10 );
+            this.position.x += translateX;
+            this.position.y += translateY;
+        };
+
+// -------------------------- events -------------------------- //
+
+// trigger handler methods for events
+        Draggabilly.prototype.handleEvent = function( event ) {
+            var method = 'on' + event.type;
+            if ( this[ method ] ) {
+                this[ method ]( event );
+            }
+        };
+
+// returns the touch that we're keeping track of
+        Draggabilly.prototype.getTouch = function( touches ) {
+            for ( var i=0, len = touches.length; i < len; i++ ) {
+                var touch = touches[i];
+                if ( touch.identifier === this.pointerIdentifier ) {
+                    return touch;
+                }
+            }
+        };
+
+// ----- start event ----- //
+
+        Draggabilly.prototype.onmousedown = function( event ) {
+            this.dragStart( event, event );
+        };
+
+        Draggabilly.prototype.ontouchstart = function( event ) {
+            // disregard additional touches
+            if ( this.isDragging ) {
+                return;
+            }
+
+            this.dragStart( event, event.changedTouches[0] );
+        };
+
+        function setPointerPoint( point, pointer ) {
+            point.x = pointer.pageX !== undefined ? pointer.pageX : pointer.clientX;
+            point.y = pointer.pageY !== undefined ? pointer.pageY : pointer.clientY;
+        }
+
+        /**
+         * drag start
+         * @param {Event} event
+         * @param {Event or Touch} pointer
+         */
+        Draggabilly.prototype.dragStart = function( event, pointer ) {
+            if ( !this.isEnabled ) {
+                return;
+            }
+
+            if ( event.preventDefault ) {
+                event.preventDefault();
+            } else {
+                event.returnValue = false;
+            }
+
+            var isTouch = event.type === 'touchstart';
+
+            // save pointer identifier to match up touch events
+            this.pointerIdentifier = pointer.identifier;
+
+            this._getPosition();
+
+            this.measureContainment();
+
+            // point where drag began
+            setPointerPoint( this.startPoint, pointer );
+            // position _when_ drag began
+            this.startPosition.x = this.position.x;
+            this.startPosition.y = this.position.y;
+
+            // reset left/top style
+            this.setLeftTop();
+
+            this.dragPoint.x = 0;
+            this.dragPoint.y = 0;
+
+            // bind move and end events
+            this._bindEvents({
+                events: isTouch ? [ 'touchmove', 'touchend', 'touchcancel' ] :
+                    [ 'mousemove', 'mouseup' ],
+                // IE8 needs to be bound to document
+                node: event.preventDefault ? window : document
+            });
+
+            classie.add( this.element, 'is-dragging' );
+
+            // reset isDragging flag
+            this.isDragging = true;
+
+            this.emitEvent( 'dragStart', [ this, event, pointer ] );
+
+            // start animation
+            this.animate();
+        };
+
+        Draggabilly.prototype._bindEvents = function( args ) {
+            for ( var i=0, len = args.events.length; i < len; i++ ) {
+                var event = args.events[i];
+                eventie.bind( args.node, event, this );
+            }
+            // save these arguments
+            this._boundEvents = args;
+        };
+
+        Draggabilly.prototype._unbindEvents = function() {
+            var args = this._boundEvents;
+            for ( var i=0, len = args.events.length; i < len; i++ ) {
+                var event = args.events[i];
+                eventie.unbind( args.node, event, this );
+            }
+            delete this._boundEvents;
+        };
+
+        Draggabilly.prototype.measureContainment = function() {
+            var containment = this.options.containment;
+            if ( !containment ) {
+                return;
+            }
+
+            this.size = getSize( this.element );
+            var elemRect = this.element.getBoundingClientRect();
+
+            // use element if element
+            var container = isElement( containment ) ? containment :
+                // fallback to querySelector if string
+                typeof containment === 'string' ? document.querySelector( containment ) :
+                    // otherwise just `true`, use the parent
+                    this.element.parentNode;
+
+            this.containerSize = getSize( container );
+            var containerRect = container.getBoundingClientRect();
+
+            this.relativeStartPosition = {
+                x: elemRect.left - containerRect.left,
+                y: elemRect.top  - containerRect.top
+            };
+        };
+
+// ----- move event ----- //
+
+        Draggabilly.prototype.onmousemove = function( event ) {
+            this.dragMove( event, event );
+        };
+
+        Draggabilly.prototype.ontouchmove = function( event ) {
+            var touch = this.getTouch( event.changedTouches );
+            if ( touch ) {
+                this.dragMove( event, touch );
+            }
+        };
+
+        /**
+         * drag move
+         * @param {Event} event
+         * @param {Event or Touch} pointer
+         */
+        Draggabilly.prototype.dragMove = function( event, pointer ) {
+
+            setPointerPoint( this.dragPoint, pointer );
+            this.dragPoint.x -= this.startPoint.x;
+            this.dragPoint.y -= this.startPoint.y;
+
+            if ( this.options.containment ) {
+                var relX = this.relativeStartPosition.x;
+                var relY = this.relativeStartPosition.y;
+                this.dragPoint.x = Math.max( this.dragPoint.x, -relX );
+                this.dragPoint.y = Math.max( this.dragPoint.y, -relY );
+                this.dragPoint.x = Math.min( this.dragPoint.x, this.containerSize.width - relX - this.size.width );
+                this.dragPoint.y = Math.min( this.dragPoint.y, this.containerSize.height - relY - this.size.height );
+            }
+
+            this.position.x = this.startPosition.x + this.dragPoint.x;
+            this.position.y = this.startPosition.y + this.dragPoint.y;
+
+            this.emitEvent( 'dragMove', [ this, event, pointer ] );
+        };
+
+
+// ----- end event ----- //
+
+        Draggabilly.prototype.onmouseup = function( event ) {
+            this.dragEnd( event, event );
+        };
+
+        Draggabilly.prototype.ontouchend = function( event ) {
+            var touch = this.getTouch( event.changedTouches );
+            if ( touch ) {
+                this.dragEnd( event, touch );
+            }
+        };
+
+        /**
+         * drag end
+         * @param {Event} event
+         * @param {Event or Touch} pointer
+         */
+        Draggabilly.prototype.dragEnd = function( event, pointer ) {
+            this.isDragging = false;
+
+            delete this.pointerIdentifier;
+
+            // use top left position when complete
+            if ( transformProperty ) {
+                this.element.style[ transformProperty ] = '';
+                this.setLeftTop();
+            }
+
+            // remove events
+            this._unbindEvents();
+
+            classie.remove( this.element, 'is-dragging' );
+
+            this.emitEvent( 'dragEnd', [ this, event, pointer ] );
+
+        };
+
+// ----- cancel event ----- //
+
+// coerce to end event
+        Draggabilly.prototype.ontouchcancel = function( event ) {
+            var touch = this.getTouch( event.changedTouches );
+            this.dragEnd( event, touch );
+        };
+
+// -------------------------- animation -------------------------- //
+
+        Draggabilly.prototype.animate = function() {
+            // only render and animate if dragging
+            if ( !this.isDragging ) {
+                return;
+            }
+
+            this.positionDrag();
+
+            var _this = this;
+            requestAnimationFrame( function animateFrame() {
+                _this.animate();
+            });
+
+        };
+
+// transform translate function
+        var translate = is3d ?
+            function( x, y ) {
+                return 'translate3d( ' + x + 'px, ' + y + 'px, 0)';
+            } :
+            function( x, y ) {
+                return 'translate( ' + x + 'px, ' + y + 'px)';
+            };
+
+// left/top positioning
+        Draggabilly.prototype.setLeftTop = function() {
+            this.element.style.left = this.position.x + 'px';
+            this.element.style.top  = this.position.y + 'px';
+        };
+
+        Draggabilly.prototype.positionDrag = transformProperty ?
+            function() {
+                // position with transform
+                this.element.style[ transformProperty ] = translate( this.dragPoint.x, this.dragPoint.y );
+            } : Draggabilly.prototype.setLeftTop;
+
+        Draggabilly.prototype.enable = function() {
+            this.isEnabled = true;
+        };
+
+        Draggabilly.prototype.disable = function() {
+            this.isEnabled = false;
+            if ( this.isDragging ) {
+                this.dragEnd();
+            }
+        };
+
+        return Draggabilly;
+
+    } // end definition
+
+// -------------------------- transport -------------------------- //
+
+    if ( typeof define === 'function' && define.amd ) {
+        // AMD
+        define('draggabilly', [
+            'classie',
+            'EventEmitter',
+            'eventie',
+            'getStyleProperty',
+            'getSize'
+        ],
+            draggabillyDefinition );
+    } else {
+        // browser global
+        window.Draggabilly = draggabillyDefinition(
+            window.classie,
+            window.EventEmitter,
+            window.eventie,
+            window.getStyleProperty,
+            window.getSize
+        );
+    }
+
+})( window );
\ No newline at end of file
diff --git a/common/static/sass/_mixins-inherited.scss b/common/static/sass/_mixins-inherited.scss
index 5a834fa256..7a3cb1633d 100644
--- a/common/static/sass/_mixins-inherited.scss
+++ b/common/static/sass/_mixins-inherited.scss
@@ -281,7 +281,7 @@
   }
 }
 
-@mixin gray-button {
+.gray-button {
   @include button;
   @include linear-gradient(top, $white-t1, rgba(255, 255, 255, 0));
   box-shadow: 0 1px 0 $white-t1 inset;
@@ -358,11 +358,7 @@
   background: $lightGrey;
 
   .branch {
-    margin-bottom: 10px;
-
-    &.collapsed {
-      margin-bottom: 0;
-    }
+    margin-bottom: 0;
   }
 
   .branch > .section-item {
@@ -370,6 +366,7 @@
   }
 
   .section-item {
+    @include transition(background $tmg-avg ease-in-out 0);
     position: relative;
     display: block;
     padding: 6px 8px 8px 16px;
@@ -377,7 +374,7 @@
     font-size: 13px;
 
     &:hover {
-      background: #fffcf1;
+      background: $orange-l4;
 
       .item-actions {
         display: block;
@@ -385,7 +382,7 @@
     }
 
     &.editing {
-      background: #fffcf1;
+      background: $orange-l4;
     }
 
     .draft-item:after,
diff --git a/common/test/data/due_date/about/overview.html b/common/test/data/due_date/about/overview.html
deleted file mode 100644
index 961786b8f4..0000000000
--- a/common/test/data/due_date/about/overview.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<section class="about">
-  <h2>About This Course</h2>
-  <p>Include your long course description here. The long course description should contain 150-400 words.</p>
-
-  <p>This is paragraph 2 of the long course description. Add more paragraphs as needed. Make sure to enclose them in paragraph tags.</p>
-</section>
-
-<section class="prerequisites">
-  <h2>Prerequisites</h2>
-  <p>Add information about course prerequisites here.</p>
-</section>
-
-<section class="course-staff">
-  <h2>Course Staff</h2>
-  <article class="teacher">
-    <div class="teacher-image">
-      <img src="/static/images/pl-faculty.png" align="left" style="margin:0 20 px 0">
-    </div>
-
-    <h3>Staff Member #1</h3>
-    <p>Biography of instructor/staff member #1</p>
-  </article>
-
-  <article class="teacher">
-    <div class="teacher-image">
-      <img src="/static/images/pl-faculty.png" align="left" style="margin:0 20 px 0">
-    </div>
-
-    <h3>Staff Member #2</h3>
-    <p>Biography of instructor/staff member #2</p>
-  </article>
-</section>
-
-<section class="faq">
-  <section class="responses">
-    <h2>Frequently Asked Questions</h2>
-    <article class="response">
-      <h3>Do I need to buy a textbook?</h3>
-      <p>No, a free online version of Chemistry: Principles, Patterns, and Applications, First Edition by Bruce Averill and Patricia Eldredge will be available, though you can purchase a printed version (published by FlatWorld Knowledge) if you’d like.</p>
-    </article>
-
-    <article class="response">
-      <h3>Question #2</h3>
-      <p>Your answer would be displayed here.</p>
-    </article>
-  </section>
-</section>
diff --git a/common/test/data/due_date/chapter/c8ee0db7e5a84c85bac80b7013cf6512.xml b/common/test/data/due_date/chapter/c8ee0db7e5a84c85bac80b7013cf6512.xml
deleted file mode 100644
index cdc5d294f8..0000000000
--- a/common/test/data/due_date/chapter/c8ee0db7e5a84c85bac80b7013cf6512.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<chapter display_name="Section">
-  <sequential url_name="c804fa32227142a1bd9d5bc183d4a20d"/>
-</chapter>
diff --git a/common/test/data/due_date/course.xml b/common/test/data/due_date/course.xml
deleted file mode 100644
index e355f924b4..0000000000
--- a/common/test/data/due_date/course.xml
+++ /dev/null
@@ -1 +0,0 @@
-<course url_name="2013_fall" org="edX" course="due_date"/>
diff --git a/common/test/data/due_date/course/2013_fall.xml b/common/test/data/due_date/course/2013_fall.xml
deleted file mode 100644
index 97ad3760ae..0000000000
--- a/common/test/data/due_date/course/2013_fall.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<course display_name="due_date">
-  <chapter url_name="c8ee0db7e5a84c85bac80b7013cf6512"/>
-</course>
diff --git a/common/test/data/due_date/policies/2013_fall/grading_policy.json b/common/test/data/due_date/policies/2013_fall/grading_policy.json
deleted file mode 100644
index 272cb4fec6..0000000000
--- a/common/test/data/due_date/policies/2013_fall/grading_policy.json
+++ /dev/null
@@ -1 +0,0 @@
-{"GRADER": [{"short_label": "HW", "min_count": 12, "type": "Homework", "drop_count": 2, "weight": 0.15}, {"min_count": 12, "type": "Lab", "drop_count": 2, "weight": 0.15}, {"short_label": "Midterm", "min_count": 1, "type": "Midterm Exam", "drop_count": 0, "weight": 0.3}, {"short_label": "Final", "min_count": 1, "type": "Final Exam", "drop_count": 0, "weight": 0.4}], "GRADE_CUTOFFS": {"Pass": 0.5}}
\ No newline at end of file
diff --git a/common/test/data/due_date/policies/2013_fall/policy.json b/common/test/data/due_date/policies/2013_fall/policy.json
deleted file mode 100644
index 42ba75ae29..0000000000
--- a/common/test/data/due_date/policies/2013_fall/policy.json
+++ /dev/null
@@ -1 +0,0 @@
-{"course/2013_fall": {"tabs": [{"type": "courseware"}, {"type": "course_info", "name": "Course Info"}, {"type": "textbooks"}, {"type": "discussion", "name": "Discussion"}, {"type": "wiki", "name": "Wiki"}, {"type": "progress", "name": "Progress"}], "display_name": "due_date", "discussion_topics": {"General": {"id": "i4x-edX-due_date-course-2013_fall"}}, "show_timezone": "false"}}
\ No newline at end of file
diff --git a/common/test/data/due_date/problem/d392c80f5c044e45a4a5f2d62f94efc5.xml b/common/test/data/due_date/problem/d392c80f5c044e45a4a5f2d62f94efc5.xml
deleted file mode 100644
index 4e50ac396b..0000000000
--- a/common/test/data/due_date/problem/d392c80f5c044e45a4a5f2d62f94efc5.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<problem display_name="Multiple Choice" markdown="A multiple choice problem presents radio buttons for student input. Students can only select a single &#10;option presented. Multiple Choice questions have been the subject of many areas of research due to the early &#10;invention and adoption of bubble sheets.&#10;&#10;One of the main elements that goes into a good multiple choice question is the existence of good distractors. &#10;That is, each of the alternate responses presented to the student should be the result of a plausible mistake &#10;that a student might make.&#10;&#10;What Apple device competed with the portable CD player?&#10;     ( ) The iPad&#10;     ( ) Napster&#10;     (x) The iPod&#10;     ( ) The vegetable peeler&#10;     &#10;[explanation]&#10;The release of the iPod allowed consumers to carry their entire music library with them in a &#10;format that did not rely on fragile and energy-intensive spinning disks.&#10;[explanation]&#10;">
-<p>
-A multiple choice problem presents radio buttons for student
-input. Students can only select a single option presented. Multiple Choice questions have been the subject of many areas of research due to the early invention and adoption of bubble sheets.</p>
-<p> One of the main elements that goes into a good multiple choice question is the existence of good distractors. That is, each of the alternate responses presented to the student should be the result of a plausible mistake that a student might make. 
-</p>
-
-<p>What Apple device competed with the portable CD player?</p>
-    <multiplechoiceresponse>
-     <choicegroup type="MultipleChoice">
-        <choice correct="false" name="ipad">The iPad</choice>
-        <choice correct="false" name="beatles">Napster</choice>
-        <choice correct="true" name="ipod">The iPod</choice>
-        <choice correct="false" name="peeler">The vegetable peeler</choice>
-     </choicegroup>
-    </multiplechoiceresponse>
-    <solution>
-        <div class="detailed-solution">
-            <p>Explanation</p>
-            <p>The release of the iPod allowed consumers to carry their entire music library with them in a format that did not rely on fragile and energy-intensive spinning disks. </p>
-        </div>
-    </solution>
-</problem>
diff --git a/common/test/data/due_date/sequential/c804fa32227142a1bd9d5bc183d4a20d.xml b/common/test/data/due_date/sequential/c804fa32227142a1bd9d5bc183d4a20d.xml
deleted file mode 100644
index a26ed3789f..0000000000
--- a/common/test/data/due_date/sequential/c804fa32227142a1bd9d5bc183d4a20d.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<sequential display_name="Subsection" due="2013-09-18T11:30:00Z" start="1970-01-01T00:00:00Z">
-  <vertical url_name="45640305a210424ebcc6f8e045fad0be"/>
-</sequential>
diff --git a/common/test/data/due_date/vertical/45640305a210424ebcc6f8e045fad0be.xml b/common/test/data/due_date/vertical/45640305a210424ebcc6f8e045fad0be.xml
deleted file mode 100644
index 66b6fc546b..0000000000
--- a/common/test/data/due_date/vertical/45640305a210424ebcc6f8e045fad0be.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vertical display_name="New Unit">
-  <problem url_name="d392c80f5c044e45a4a5f2d62f94efc5"/>
-</vertical>
diff --git a/common/test/data/imports/get_html_exception_test.tar.gz b/common/test/data/imports/get_html_exception_test.tar.gz
new file mode 100644
index 0000000000..bcd0b8df8c
Binary files /dev/null and b/common/test/data/imports/get_html_exception_test.tar.gz differ
diff --git a/common/test/data/test_import_course/vertical/vertical_test.xml b/common/test/data/test_import_course/vertical/vertical_test.xml
index 68c5745f37..3dd75a08c8 100644
--- a/common/test/data/test_import_course/vertical/vertical_test.xml
+++ b/common/test/data/test_import_course/vertical/vertical_test.xml
@@ -1,7 +1,7 @@
 <sequential>
-        <video display_name="default" youtube_id_0_75="JMD_ifUUfsU" youtube_id_1_0="OEoXaMPEzfM" youtube_id_1_25="AKqURZnYqpk" youtube_id_1_5="DYpADpL7jAY" name="sample_video"/>
-        <video url_name="separate_file_video"/>
-        <poll_question name="T1_changemind_poll_foo_2" display_name="Change your answer" reset="false">
+    <video display_name="default" youtube_id_0_75="JMD_ifUUfsU" youtube_id_1_0="OEoXaMPEzfM" youtube_id_1_25="AKqURZnYqpk" youtube_id_1_5="DYpADpL7jAY" name="sample_video"/>
+    <video url_name="separate_file_video"/>
+    <poll_question name="T1_changemind_poll_foo_2" display_name="Change your answer" reset="false">
         <p>Have you changed your mind?</p>
         <answer id="yes">Yes</answer>
         <answer id="no">No</answer>
diff --git a/docs/data/source/internal_data_formats/tracking_logs.rst b/docs/data/source/internal_data_formats/tracking_logs.rst
index 7af67cbc82..ce279546ee 100644
--- a/docs/data/source/internal_data_formats/tracking_logs.rst
+++ b/docs/data/source/internal_data_formats/tracking_logs.rst
@@ -2,9 +2,9 @@
  Tracking Logs
 ===============
 
-The following is an inventory of all LMS event types. 
+The following is an inventory of all LMS event types.
 
-This inventory is comprised of a table of Common Fields that appear in all events, a table of Student Event Types which lists all interaction with the LMS outside of the Instructor Dashboard, 
+This inventory is comprised of a table of Common Fields that appear in all events, a table of Student Event Types which lists all interaction with the LMS outside of the Instructor Dashboard,
 and a table of Instructor Event Types of all interaction with the Instructor Dashboard in the LMS.
 
 Common Fields
@@ -38,16 +38,16 @@ This section contains a table of fields common to all events.
 |                           | string is empty for anonymous events (i.e., user not logged |             |                                    |
 |                           | in).                                                        |             |                                    |
 +---------------------------+-------------------------------------------------------------+-------------+------------------------------------+
-       
+
 
 Event Types
 ===========
 
 There are two tables of event types -- one for student events, and one for instructor events.
 Table columns describe what each event type represents, which component it originates from, what scripting language was used to fire the event, and what ``event`` fields are associated with it.
-The ``event_source`` field from the "Common Fields" table above distinguishes between events that originated in the browser (in javascript) and events that originated on the server (during the processing of a request). 
+The ``event_source`` field from the "Common Fields" table above distinguishes between events that originated in the browser (in javascript) and events that originated on the server (during the processing of a request).
 
-Event types with several different historical names are enumerated by forward slashes. 
+Event types with several different historical names are enumerated by forward slashes.
 Rows identical after the second column have been combined, with the corresponding event types enumerated by commas.
 
 
@@ -59,72 +59,59 @@ The Student Event Type table lists the event types logged for interaction with t
 
 
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| Event Type                        | Description                   | Component           | Language        | ``event`` Fields    | Type          | Details                                                             |
+| Event Type                        | Description                   | Component           | Event Source    | ``event`` Fields    | Type          | Details                                                             |
 +===================================+===============================+=====================+=================+=====================+===============+=====================================================================+
-| ``seq_goto``                      | Fired when a user jumps       | Sequence            | CoffeeScript/JS | ``old``             | integer       | Index of the unit being jumped from.                                |
+| ``seq_goto``                      | Fired when a user jumps       | Sequence            | Browser         | ``old``             | integer       | Index of the unit being jumped from.                                |
 |                                   | between units in              |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   | a sequence.                   |                     |                 | ``new``             | integer       | Index of the unit being jumped to.                                  |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``id``              | integer       | edX ID of the sequence.                                             |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``seq_next``                      | Fired when a user navigates   | Sequence            | CoffeeScript/JS | ``old``             | integer       | Index of the unit being navigated                                   |
+| ``seq_next``                      | Fired when a user navigates   | Sequence            | Browser         | ``old``             | integer       | Index of the unit being navigated                                   |
 |                                   | to the next unit in a         |                     |                 |                     |               | away from.                                                          |
 |                                   | sequence.                     |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``new``             | integer       | Index of the unit being navigated to.                               |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``id``              | integer       | edX ID of the sequence.                                             |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``seq_prev``                      | Fired when a user navigates   | Sequence            | CoffeeScript/JS | ``old``             | integer       | Index of the unit being navigated away                              |
+| ``seq_prev``                      | Fired when a user navigates   | Sequence            | Browser         | ``old``             | integer       | Index of the unit being navigated away                              |
 |                                   | to the previous unit in a     |                     |                 |                     |               | from.                                                               |
 |                                   | sequence.                     |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``new``             | integer       | Index of the unit being navigated to.                               |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``id``              | integer       | edX ID of the sequence.                                             |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``problem_check``                 | Fired when a user wants to    | Capa                | CoffeeScript/JS |                     |               | The ``event`` field contains the                                    |
-|                                   | check a problem.              |                     |                 |                     |               | values of all input fields from the problem                         |
-|                                   |                               |                     |                 |                     |               | being checked, styled as GET parameters.                            |
-+-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``problem_reset``                 | Fired when a problem is       | Capa                | CoffeeScript/JS |                     |               |                                                                     |
-|                                   | reset.                        |                     |                 |                     |               |                                                                     |
-+-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``problem_show``                  | Fired when a problem is       | Capa                | CoffeeScript/JS | ``problem``         | string        | ID of the problem being shown (e.g.,                                |
-|                                   | shown.                        |                     |                 |                     |               | i4x://MITx/6.00x/problem/L15:L15_Problem_2).                        |
-+-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``problem_save``                  | Fired when a problem is       | Capa                | CoffeeScript/JS |                     |               |                                                                     |
-|                                   | saved.                        |                     |                 |                     |               |                                                                     |
-+-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``oe_hide_question`` /            |                               | Combined Open-Ended | CoffeeScript/JS | ``location``        | string        | The location of the question whose prompt is                        |
+| ``oe_hide_question`` /            |                               | Combined Open-Ended | Browser         | ``location``        | string        | The location of the question whose prompt is                        |
 | ``oe_hide_problem``               |                               |                     |                 |                     |               | being hidden.                                                       |
 | ``peer_grading_hide_question`` /  |                               | Peer Grading        |                 |                     |               |                                                                     |
 | ``peer_grading_hide_problem``     |                               |                     |                 |                     |               |                                                                     |
 | ``staff_grading_hide_question`` / |                               | Staff Grading       |                 |                     |               |                                                                     |
 | ``staff_grading_hide_problem``    |                               |                     |                 |                     |               |                                                                     |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``oe_show_question`` /            |                               | Combined Open-Ended | CoffeeScript/JS | ``location``        | string        | The location of the question whose prompt is                        |
+| ``oe_show_question`` /            |                               | Combined Open-Ended | Browser         | ``location``        | string        | The location of the question whose prompt is                        |
 | ``oe_show_problem``               |                               |                     |                 |                     |               | being shown.                                                        |
 | ``peer_grading_show_question`` /  |                               | Peer Grading        |                 |                     |               |                                                                     |
 | ``peer_grading_show_problem``     |                               |                     |                 |                     |               |                                                                     |
 | ``staff_grading_show_question`` / |                               | Staff Grading       |                 |                     |               |                                                                     |
 | ``staff_grading_show_problem``    |                               |                     |                 |                     |               |                                                                     |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``rubric_select``                 |                               | Combined Open-Ended | CoffeeScript/JS | ``location``        | string        | The location of the question whose rubric is                        |
+| ``rubric_select``                 |                               | Combined Open-Ended | Browser         | ``location``        | string        | The location of the question whose rubric is                        |
 |                                   |                               |                     |                 |                     |               | being selected.                                                     |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``selection``       | integer       | Value selected on rubric.                                           |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``category``        | integer       | Rubric category selected.                                           |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``oe_show_full_feedback``         |                               | Combined Open-Ended | CoffeeScript/JS |                     |               |                                                                     |
+| ``oe_show_full_feedback``         |                               | Combined Open-Ended | Browser         |                     |               |                                                                     |
 | ``oe_show_respond_to_feedback``   |                               |                     |                 |                     |               |                                                                     |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``oe_feedback_response_selected`` |                               | Combined Open-Ended | CoffeeScript/JS | ``value``           | integer       | Value selected in the feedback response form.                       |
+| ``oe_feedback_response_selected`` |                               | Combined Open-Ended | Browser         | ``value``           | integer       | Value selected in the feedback response form.                       |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``page_close``                    | This event type originates    | Logger              | CoffeeScript/JS |                     |               |                                                                     |
+| ``page_close``                    | This event type originates    | Logger              | Browser         |                     |               |                                                                     |
 |                                   | from within the Logger        |                     |                 |                     |               |                                                                     |
 |                                   | itself.                       |                     |                 |                     |               |                                                                     |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``play_video``                    | Fired on video play.          | Video               | CoffeeScript/JS | ``id``              | string        | EdX ID of the video being watched (e.g.,                            |
+| ``play_video``                    | Fired on video play.          | Video               | Browser         | ``id``              | string        | EdX ID of the video being watched (e.g.,                            |
 |                                   |                               |                     |                 |                     |               | i4x-HarvardX-PH207x-video-Simple_Random_Sample).                    |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``code``            | string        | YouTube ID of the video being watched (e.g.,                        |
@@ -134,26 +121,18 @@ The Student Event Type table lists the event types logged for interaction with t
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``speed``           | string        | Video speed in use (i.e., 0.75, 1.0, 1.25, 1.50).                   |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``book``                          | Fired when a user is reading  | PDF Viewer          |  JS             | ``type``            | string        | `'gotopage'`, `'prevpage'`, `'nextpage'`                            |
+| ``book``                          | Fired when a user is reading  | PDF Viewer          | Browser         | ``type``            | string        | `'gotopage'`, `'prevpage'`, `'nextpage'`                            |
 |                                   | a PDF book.                   |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``old``             | integer       | Original page number.                                               |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``new``             | integer       | Destination page number.                                            |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``showanswer`` /                  | Server-side event which       | Capa Module         | Python          | ``problem_id``      | string        | EdX ID of the problem being shown.                                  |
-| ``show_answer``                   | displays the answer to a      |                     |                 |                     |               |                                                                     |
-|                                   | problem.                      |                     |                 |                     |               |                                                                     |
+| ``problem_check``                 | Fired when a user wants to    | Capa Module         | Browser         |                     |               | The ``event`` field contains the                                    |
+|                                   | check a problem.              |                     |                 |                     |               | values of all input fields from the problem                         |
+|                                   |                               |                     |                 |                     |               | being checked, styled as GET parameters.                            |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``problem_check_fail``            |                               | Capa Module         | Python          | ``state``           | string / JSON | Current problem state.                                              |
-|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
-|                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being checked.                                    |
-|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
-|                                   |                               |                     |                 | ``answers``         | dict          |                                                                     |
-|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
-|                                   |                               |                     |                 | ``failure``         | string        | `'closed'`, `'unreset'`                                             |
-+-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``problem_check`` /               |                               | Capa Module         | Python          | ``state``           | string / JSON | Current problem state.                                              |
-| ``save_problem_check``            |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+| ``problem_check`` /               | Fired when a problem has been | Capa Module         | Server          | ``state``           | string / JSON | Current problem state.                                              |
+| ``save_problem_check``            | checked successfully.         |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being checked.                                    |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``answers``         | dict          |                                                                     |
@@ -162,17 +141,27 @@ The Student Event Type table lists the event types logged for interaction with t
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``attempts``        | integer       |                                                                     |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``grade``           | integer       | Current grade value                                                 |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``max_grade``       | integer       | Maximum possible grade value                                        |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``correct_map``     | string / JSON | **See the table in**                                                |
 |                                   |                               |                     |                 |                     |               | **Addendum:** ``correct_map`` **Fields and Values below**           |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``problem_rescore_fail``          |                               | Capa Module         | Python          | ``state``           | string / JSON | Current problem state.                                              |
+| ``problem_check_fail``            | Fired when a problem cannot be| Capa Module         | Server          | ``state``           | string / JSON | Current problem state.                                              |
+|                                   | checked successfully.         |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being checked.                                    |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
-|                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being rescored.                                   |
+|                                   |                               |                     |                 | ``answers``         | dict          |                                                                     |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
-|                                   |                               |                     |                 | ``failure``         | string        | `'unsupported'`, `'unanswered'`, `'input_error'`, `'unexpected'`    |
+|                                   |                               |                     |                 | ``failure``         | string        | `'closed'`, `'unreset'`                                             |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``problem_rescore``               |                               | Capa Module         | Python          | ``state``           | string / JSON | Current problem state.                                              |
-|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+| ``problem_reset``                 | Fired when a user resets a    | Capa Module         | Browser         |                     |               |                                                                     |
+|                                   | problem.                      |                     |                 |                     |               |                                                                     |
+|                                   |                               |                     |                 |                     |               |                                                                     |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``problem_rescore``               | Fired when a problem is       | Capa Module         | Server          | ``state``           | string / JSON | Current problem state.                                              |
+|                                   | rescored sucessfully.         |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being rescored.                                   |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``orig_score``      | integer       |                                                                     |
@@ -189,32 +178,48 @@ The Student Event Type table lists the event types logged for interaction with t
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``attempts``        | integer       |                                                                     |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``save_problem_fail``             |                               | Capa Module         | Python          | ``state``           | string / JSON | Current problem state.                                              |
+| ``problem_rescore_fail``          | Fired when a problem cannot be| Capa Module         | Server          | ``state``           | string / JSON | Current problem state.                                              |
+|                                   | rescored successfully.        |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being rescored.                                   |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``failure``         | string        | `'unsupported'`, `'unanswered'`, `'input_error'`, `'unexpected'`    |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``problem_show``                  | Fired when a problem is       | Capa Module         | Browser         | ``problem``         | string        | ID of the problem being shown (e.g.,                                |
+|                                   | shown.                        |                     |                 |                     |               | i4x://MITx/6.00x/problem/L15:L15_Problem_2).                        |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``problem_save``                  | Fired when a problem is       | Capa Module         | Browser         |                     |               |                                                                     |
+|                                   | saved.                        |                     |                 |                     |               |                                                                     |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``reset_problem``                 | Fired when a problem has been | Capa Module         | Server          | ``old_state``       | string / JSON | Current problem state.                                              |
+|                                   | reset successfully.           |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being reset.                                      |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``new_state``       | string / JSON | New problem state.                                                  |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``reset_problem_fail``            | Fired when a problem cannot be| Capa Module         | Server          | ``old_state``       | string / JSON | Current problem state.                                              |
+|                                   | reset successfuly.            |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``problem_id``      | string        |  ID of the problem being reset.                                     |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``failure``         | string        | `'closed'`, `'not_done'`                                            |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``showanswer`` /                  | Server-side event which       | Capa Module         | Server          | ``problem_id``      | string        | EdX ID of the problem being shown.                                  |
+| ``show_answer``                   | displays the answer to a      |                     |                 |                     |               |                                                                     |
+|                                   | problem.                      |                     |                 |                     |               |                                                                     |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``save_problem_fail``             | Fired when a problem cannot be| Capa Module         | Server          | ``state``           | string / JSON | Current problem state.                                              |
+|                                   | saved successfully.           |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being saved.                                      |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``failure``         | string        | `'closed'`, `'done'`                                                |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``answers``         | dict          |                                                                     |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``save_problem_success``          |                               | Capa Module         | Python          | ``state``           | string / JSON | Current problem state.                                              |
-|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+| ``save_problem_success``          | Fired when a problem has been | Capa Module         | Server          | ``state``           | string / JSON | Current problem state.                                              |
+|                                   | successfully saved.           |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being saved.                                      |
 |                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                   |                               |                     |                 | ``answers``         | dict          |                                                                     |
 +-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``reset_problem_fail``            |                               | Capa Module         | Python          | ``old_state``       | string / JSON | Current problem state.                                              |
-|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
-|                                   |                               |                     |                 | ``problem_id``      | string        |  ID of the problem being reset.                                     |
-|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
-|                                   |                               |                     |                 | ``failure``         | string        | `'closed'`, `'not_done'`                                            |
-+-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``reset_problem``                 |                               | Capa Module         | Python          | ``old_state``       | string / JSON | Current problem state.                                              |
-|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
-|                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being reset.                                      |
-|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
-|                                   |                               |                     |                 | ``new_state``       | string / JSON | New problem state.                                                  |
-+-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
 
 *Addendum:* ``correct_map`` *Fields and Values*
 -----------------------------------------------
@@ -241,7 +246,7 @@ Table of ``correct_map`` field types and values for the ``problem_check`` studen
 |                                                  |                                                  | string dump of a DateTime object of the form     |                                                  |
 |                                                  |                                                  | `'%Y%m%d%H%M%S'`.                                |                                                  |
 +--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+
- 
+
 
 Instructor Event Types
 ----------------------
@@ -251,9 +256,9 @@ The Instructor Event Type table lists the event types logged for course team int
 
 
 +----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| Event Type                             | Description                   | Component            | Language        | ``event`` Fields    | Type          | Details                                                             |
+| Event Type                             | Description                   | Component            | Event Source    | ``event`` Fields    | Type          | Details                                                             |
 +----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``list-students``,                     |                               | Instructor Dashboard | Python          |                     |               |                                                                     |
+| ``list-students``,                     |                               | Instructor Dashboard | Server          |                     |               |                                                                     |
 | ``dump-grades``,                       |                               |                      |                 |                     |               |                                                                     |
 | ``dump-grades-raw``,                   |                               |                      |                 |                     |               |                                                                     |
 | ``dump-grades-csv``,                   |                               |                      |                 |                     |               |                                                                     |
@@ -261,17 +266,17 @@ The Instructor Event Type table lists the event types logged for course team int
 | ``dump-answer-dist-csv``,              |                               |                      |                 |                     |               |                                                                     |
 | ``dump-graded-assignments-config``     |                               |                      |                 |                     |               |                                                                     |
 +----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``rescore-all-submissions``,           |                               | Instructor Dashboard | Python          | ``problem``         | string        |                                                                     |
+| ``rescore-all-submissions``,           |                               | Instructor Dashboard | Server          | ``problem``         | string        |                                                                     |
 | ``reset-all-attempts``                 |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                        |                               |                      |                 | ``course``          | string        |                                                                     |
 +----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``delete-student-module-state``,       |                               | Instructor Dashboard | Python          | ``problem``         | string        |                                                                     |
+| ``delete-student-module-state``,       |                               | Instructor Dashboard | Server          | ``problem``         | string        |                                                                     |
 | ``rescore-student-submission``         |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                        |                               |                      |                 | ``student``         | string        |                                                                     |
 |                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                        |                               |                      |                 | ``course``          | string        |                                                                     |
 +----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``reset-student-attempts``             |                               | Instructor Dashboard | Python          | ``old_attempts``    | string        |                                                                     |
+| ``reset-student-attempts``             |                               | Instructor Dashboard | Server          | ``old_attempts``    | string        |                                                                     |
 |                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                        |                               |                      |                 | ``student``         | string        |                                                                     |
 |                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
@@ -281,36 +286,36 @@ The Instructor Event Type table lists the event types logged for course team int
 |                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                        |                               |                      |                 | ``course``          | string        |                                                                     |
 +----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``get-student-progress-page``          |                               | Instructor Dashboard | Python          | ``student``         | string        |                                                                     |
+| ``get-student-progress-page``          |                               | Instructor Dashboard | Server          | ``student``         | string        |                                                                     |
 |                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                        |                               |                      |                 | ``instructor``      | string        |                                                                     |
 |                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                        |                               |                      |                 | ``course``          | string        |                                                                     |
 +----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``list-staff``,                        |                               | Instructor Dashboard | Python          |                     |               |                                                                     |
+| ``list-staff``,                        |                               | Instructor Dashboard | Server          |                     |               |                                                                     |
 | ``list-instructors``,                  |                               |                      |                 |                     |               |                                                                     |
 | ``list-beta-testers``                  |                               |                      |                 |                     |               |                                                                     |
 +----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``add-instructor``,                    |                               | Instructor Dashboard | Python          | ``instructor``      | string        |                                                                     |
+| ``add-instructor``,                    |                               | Instructor Dashboard | Server          | ``instructor``      | string        |                                                                     |
 | ``remove-instructor``                  |                               |                      |                 |                     |               |                                                                     |
 |                                        |                               |                      |                 |                     |               |                                                                     |
 +----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``list-forum-admins``,                 |                               | Instructor Dashboard | Python          | ``course``          | string        |                                                                     |
+| ``list-forum-admins``,                 |                               | Instructor Dashboard | Server          | ``course``          | string        |                                                                     |
 | ``list-forum-mods``,                   |                               |                      |                 |                     |               |                                                                     |
 | ``list-forum-community-TAs``           |                               |                      |                 |                     |               |                                                                     |
 +----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``remove-forum-admin``,                |                               | Instructor Dashboard | Python          | ``username``        | string        |                                                                     |
+| ``remove-forum-admin``,                |                               | Instructor Dashboard | Server          | ``username``        | string        |                                                                     |
 | ``add-forum-admin``,                   |                               |                      |                 |                     |               |                                                                     |
 | ``remove-forum-mod``,                  |                               |                      |                 |                     |               |                                                                     |
 | ``add-forum-mod``,                     |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
 | ``remove-forum-community-TA``,         |                               |                      |                 | ``course``          | string        |                                                                     |
 | ``add-forum-community-TA``             |                               |                      |                 |                     |               |                                                                     |
 +----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``psychometrics-histogram-generation`` |                               | Instructor Dashboard | Python          | ``problem``         | string        |                                                                     |
+| ``psychometrics-histogram-generation`` |                               | Instructor Dashboard | Server          | ``problem``         | string        |                                                                     |
 |                                        |                               |                      |                 |                     |               |                                                                     |
 |                                        |                               |                      |                 |                     |               |                                                                     |
 +----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
-| ``add-or-remove-user-group``           |                               | Instructor Dashboard |     Python      | ``event_name``      | string        |                                                                     |
+| ``add-or-remove-user-group``           |                               | Instructor Dashboard | Server          | ``event_name``      | string        |                                                                     |
 |                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
 |                                        |                               |                      |                 | ``user``            | string        |                                                                     |
 |                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
diff --git a/lms/djangoapps/branding/__init__.py b/lms/djangoapps/branding/__init__.py
index 0bdc69bd0d..aae57ac2e9 100644
--- a/lms/djangoapps/branding/__init__.py
+++ b/lms/djangoapps/branding/__init__.py
@@ -47,8 +47,10 @@ def get_logo_url(domain=None):
     university = get_university(domain)
 
     if university is None:
-        return '/static/images/header-logo.png'
+        return '{static_url}images/header-logo.png'.format(
+            static_url=settings.STATIC_URL
+        )
 
-    return '/static/images/{uni}-on-edx-logo.png'.format(
-        uni=university
+    return '{static_url}images/{uni}-on-edx-logo.png'.format(
+        static_url=settings.STATIC_URL, uni=university
     )
diff --git a/lms/djangoapps/bulk_email/admin.py b/lms/djangoapps/bulk_email/admin.py
index 3550e1eb42..f4529a9e70 100644
--- a/lms/djangoapps/bulk_email/admin.py
+++ b/lms/djangoapps/bulk_email/admin.py
@@ -3,8 +3,8 @@ Django admin page for bulk email models
 """
 from django.contrib import admin
 
-from bulk_email.models import CourseEmail, Optout, CourseEmailTemplate
-from bulk_email.forms import CourseEmailTemplateForm
+from bulk_email.models import CourseEmail, Optout, CourseEmailTemplate, CourseAuthorization
+from bulk_email.forms import CourseEmailTemplateForm, CourseAuthorizationAdminForm
 
 
 class CourseEmailAdmin(admin.ModelAdmin):
@@ -57,6 +57,23 @@ unsupported tags will cause email sending to fail.
         return False
 
 
+class CourseAuthorizationAdmin(admin.ModelAdmin):
+    """Admin for enabling email on a course-by-course basis."""
+    form = CourseAuthorizationAdminForm
+    fieldsets = (
+        (None, {
+            'fields': ('course_id', 'email_enabled'),
+            'description': '''
+Enter a course id in the following form: Org/Course/CourseRun, eg MITx/6.002x/2012_Fall
+Do not enter leading or trailing slashes. There is no need to surround the course ID with quotes.
+Validation will be performed on the course name, and if it is invalid, an error message will display.
+
+To enable email for the course, check the "Email enabled" box, then click "Save".
+'''
+        }),
+    )
+
 admin.site.register(CourseEmail, CourseEmailAdmin)
 admin.site.register(Optout, OptoutAdmin)
 admin.site.register(CourseEmailTemplate, CourseEmailTemplateAdmin)
+admin.site.register(CourseAuthorization, CourseAuthorizationAdmin)
diff --git a/lms/djangoapps/bulk_email/forms.py b/lms/djangoapps/bulk_email/forms.py
index fc75d4e4b6..bec05fba52 100644
--- a/lms/djangoapps/bulk_email/forms.py
+++ b/lms/djangoapps/bulk_email/forms.py
@@ -6,12 +6,16 @@ import logging
 from django import forms
 from django.core.exceptions import ValidationError
 
-from bulk_email.models import CourseEmailTemplate, COURSE_EMAIL_MESSAGE_BODY_TAG
+from bulk_email.models import CourseEmailTemplate, COURSE_EMAIL_MESSAGE_BODY_TAG, CourseAuthorization
+
+from courseware.courses import get_course_by_id
+from xmodule.modulestore import MONGO_MODULESTORE_TYPE
+from xmodule.modulestore.django import modulestore
 
 log = logging.getLogger(__name__)
 
 
-class CourseEmailTemplateForm(forms.ModelForm):
+class CourseEmailTemplateForm(forms.ModelForm):  # pylint: disable=R0924
     """Form providing validation of CourseEmail templates."""
 
     class Meta:  # pylint: disable=C0111
@@ -43,3 +47,32 @@ class CourseEmailTemplateForm(forms.ModelForm):
         template = self.cleaned_data["plain_template"]
         self._validate_template(template)
         return template
+
+
+class CourseAuthorizationAdminForm(forms.ModelForm):  # pylint: disable=R0924
+    """Input form for email enabling, allowing us to verify data."""
+
+    class Meta:  # pylint: disable=C0111
+        model = CourseAuthorization
+
+    def clean_course_id(self):
+        """Validate the course id"""
+        course_id = self.cleaned_data["course_id"]
+        try:
+            # Just try to get the course descriptor.
+            # If we can do that, it's a real course.
+            get_course_by_id(course_id, depth=1)
+        except Exception as exc:
+            msg = 'Error encountered ({0})'.format(str(exc).capitalize())
+            msg += ' --- Entered course id was: "{0}". '.format(course_id)
+            msg += 'Please recheck that you have supplied a course id in the format: ORG/COURSE/RUN'
+            raise forms.ValidationError(msg)
+
+        # Now, try and discern if it is a Studio course - HTML editor doesn't work with XML courses
+        is_studio_course = modulestore().get_modulestore_type(course_id) == MONGO_MODULESTORE_TYPE
+        if not is_studio_course:
+            msg = "Course Email feature is only available for courses authored in Studio. "
+            msg += '"{0}" appears to be an XML backed course.'.format(course_id)
+            raise forms.ValidationError(msg)
+
+        return course_id
diff --git a/lms/djangoapps/bulk_email/migrations/0008_add_course_authorizations.py b/lms/djangoapps/bulk_email/migrations/0008_add_course_authorizations.py
new file mode 100644
index 0000000000..b200ea2bde
--- /dev/null
+++ b/lms/djangoapps/bulk_email/migrations/0008_add_course_authorizations.py
@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'CourseAuthorization'
+        db.create_table('bulk_email_courseauthorization', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('course_id', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+            ('email_enabled', self.gf('django.db.models.fields.BooleanField')(default=False)),
+        ))
+        db.send_create_signal('bulk_email', ['CourseAuthorization'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'CourseAuthorization'
+        db.delete_table('bulk_email_courseauthorization')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'bulk_email.courseauthorization': {
+            'Meta': {'object_name': 'CourseAuthorization'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'email_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'bulk_email.courseemail': {
+            'Meta': {'object_name': 'CourseEmail'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'html_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}),
+            'subject': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'text_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'to_option': ('django.db.models.fields.CharField', [], {'default': "'myself'", 'max_length': '64'})
+        },
+        'bulk_email.courseemailtemplate': {
+            'Meta': {'object_name': 'CourseEmailTemplate'},
+            'html_template': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'plain_template': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'bulk_email.optout': {
+            'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'Optout'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['bulk_email']
\ No newline at end of file
diff --git a/lms/djangoapps/bulk_email/models.py b/lms/djangoapps/bulk_email/models.py
index 9d32dbd70c..83a691f18e 100644
--- a/lms/djangoapps/bulk_email/models.py
+++ b/lms/djangoapps/bulk_email/models.py
@@ -12,11 +12,21 @@ file and check it in at the same time as your model changes. To do that,
 
 """
 import logging
-from django.db import models
+from django.db import models, transaction
 from django.contrib.auth.models import User
+from html_to_text import html_to_text
+
+from django.conf import settings
 
 log = logging.getLogger(__name__)
 
+# Bulk email to_options - the send to options that users can
+# select from when they send email.
+SEND_TO_MYSELF = 'myself'
+SEND_TO_STAFF = 'staff'
+SEND_TO_ALL = 'all'
+TO_OPTIONS = [SEND_TO_MYSELF, SEND_TO_STAFF, SEND_TO_ALL]
+
 
 class Email(models.Model):
     """
@@ -33,12 +43,8 @@ class Email(models.Model):
     class Meta:  # pylint: disable=C0111
         abstract = True
 
-SEND_TO_MYSELF = 'myself'
-SEND_TO_STAFF = 'staff'
-SEND_TO_ALL = 'all'
 
-
-class CourseEmail(Email, models.Model):
+class CourseEmail(Email):
     """
     Stores information for an email to a course.
     """
@@ -51,17 +57,66 @@ class CourseEmail(Email, models.Model):
     # * All: This sends an email to anyone enrolled in the course, with any role
     #   (student, staff, or instructor)
     #
-    TO_OPTIONS = (
+    TO_OPTION_CHOICES = (
         (SEND_TO_MYSELF, 'Myself'),
         (SEND_TO_STAFF, 'Staff and instructors'),
         (SEND_TO_ALL, 'All')
     )
     course_id = models.CharField(max_length=255, db_index=True)
-    to_option = models.CharField(max_length=64, choices=TO_OPTIONS, default=SEND_TO_MYSELF)
+    to_option = models.CharField(max_length=64, choices=TO_OPTION_CHOICES, default=SEND_TO_MYSELF)
 
     def __unicode__(self):
         return self.subject
 
+    @classmethod
+    def create(cls, course_id, sender, to_option, subject, html_message, text_message=None):
+        """
+        Create an instance of CourseEmail.
+
+        The CourseEmail.save_now method makes sure the CourseEmail entry is committed.
+        When called from any view that is wrapped by TransactionMiddleware,
+        and thus in a "commit-on-success" transaction, an autocommit buried within here
+        will cause any pending transaction to be committed by a successful
+        save here.  Any future database operations will take place in a
+        separate transaction.
+        """
+        # automatically generate the stripped version of the text from the HTML markup:
+        if text_message is None:
+            text_message = html_to_text(html_message)
+
+        # perform some validation here:
+        if to_option not in TO_OPTIONS:
+            fmt = 'Course email being sent to unrecognized to_option: "{to_option}" for "{course}", subject "{subject}"'
+            msg = fmt.format(to_option=to_option, course=course_id, subject=subject)
+            raise ValueError(msg)
+
+        # create the task, then save it immediately:
+        course_email = cls(
+            course_id=course_id,
+            sender=sender,
+            to_option=to_option,
+            subject=subject,
+            html_message=html_message,
+            text_message=text_message,
+        )
+        course_email.save_now()
+
+        return course_email
+
+    @transaction.autocommit
+    def save_now(self):
+        """
+        Writes CourseEmail immediately, ensuring the transaction is committed.
+
+        Autocommit annotation makes sure the database entry is committed.
+        When called from any view that is wrapped by TransactionMiddleware,
+        and thus in a "commit-on-success" transaction, this autocommit here
+        will cause any pending transaction to be committed by a successful
+        save here.  Any future database operations will take place in a
+        separate transaction.
+        """
+        self.save()
+
 
 class Optout(models.Model):
     """
@@ -101,7 +156,11 @@ class CourseEmailTemplate(models.Model):
 
         If one isn't stored, an exception is thrown.
         """
-        return CourseEmailTemplate.objects.get()
+        try:
+            return CourseEmailTemplate.objects.get()
+        except CourseEmailTemplate.DoesNotExist:
+            log.exception("Attempting to fetch a non-existent course email template")
+            raise
 
     @staticmethod
     def _render(format_string, message_body, context):
@@ -153,3 +212,38 @@ class CourseEmailTemplate(models.Model):
         stored HTML template and the provided `context` dict.
         """
         return CourseEmailTemplate._render(self.html_template, htmltext, context)
+
+
+class CourseAuthorization(models.Model):
+    """
+    Enable the course email feature on a course-by-course basis.
+    """
+    # The course that these features are attached to.
+    course_id = models.CharField(max_length=255, db_index=True)
+
+    # Whether or not to enable instructor email
+    email_enabled = models.BooleanField(default=False)
+
+    @classmethod
+    def instructor_email_enabled(cls, course_id):
+        """
+        Returns whether or not email is enabled for the given course id.
+
+        If email has not been explicitly enabled, returns False.
+        """
+        # If settings.MITX_FEATURES['REQUIRE_COURSE_EMAIL_AUTH'] is
+        # set to False, then we enable email for every course.
+        if not settings.MITX_FEATURES['REQUIRE_COURSE_EMAIL_AUTH']:
+            return True
+
+        try:
+            record = cls.objects.get(course_id=course_id)
+            return record.email_enabled
+        except cls.DoesNotExist:
+            return False
+
+    def __unicode__(self):
+        not_en = "Not "
+        if self.email_enabled:
+            not_en = ""
+        return u"Course '{}': Instructor Email {}Enabled".format(self.course_id, not_en)
diff --git a/lms/djangoapps/bulk_email/tasks.py b/lms/djangoapps/bulk_email/tasks.py
index 1f15a8b4d7..a2f376cdcc 100644
--- a/lms/djangoapps/bulk_email/tasks.py
+++ b/lms/djangoapps/bulk_email/tasks.py
@@ -4,174 +4,500 @@ to a course.
 """
 import math
 import re
-import time
+import random
+import json
+from uuid import uuid4
+from time import sleep
 
 from dogapi import dog_stats_api
-from smtplib import SMTPServerDisconnected, SMTPDataError, SMTPConnectError
+from smtplib import SMTPServerDisconnected, SMTPDataError, SMTPConnectError, SMTPException
+from boto.ses.exceptions import (
+    SESDailyQuotaExceededError,
+    SESMaxSendingRateExceededError,
+    SESAddressBlacklistedError,
+    SESIllegalAddressError,
+    SESLocalAddressCharacterError,
+)
+from boto.exception import AWSConnectionError
+
+from celery import task, current_task, group
+from celery.utils.log import get_task_logger
+from celery.states import SUCCESS, FAILURE, RETRY
+from celery.exceptions import RetryTaskError
 
 from django.conf import settings
 from django.contrib.auth.models import User, Group
 from django.core.mail import EmailMultiAlternatives, get_connection
-from django.http import Http404
-from celery import task, current_task
-from celery.utils.log import get_task_logger
 from django.core.urlresolvers import reverse
 
 from bulk_email.models import (
     CourseEmail, Optout, CourseEmailTemplate,
-    SEND_TO_MYSELF, SEND_TO_STAFF, SEND_TO_ALL,
+    SEND_TO_MYSELF, SEND_TO_ALL, TO_OPTIONS,
 )
 from courseware.access import _course_staff_group_name, _course_instructor_group_name
-from courseware.courses import get_course_by_id, course_image_url
+from courseware.courses import get_course, course_image_url
+from instructor_task.models import InstructorTask
+from instructor_task.subtasks import (
+    update_subtask_status,
+    create_subtask_status,
+    increment_subtask_status,
+    initialize_subtask_info,
+    check_subtask_is_valid,
+)
 
 log = get_task_logger(__name__)
 
 
-@task(default_retry_delay=10, max_retries=5)  # pylint: disable=E1102
-def delegate_email_batches(email_id, user_id):
+# Errors that an individual email is failing to be sent, and should just
+# be treated as a fail.
+SINGLE_EMAIL_FAILURE_ERRORS = (SESAddressBlacklistedError, SESIllegalAddressError, SESLocalAddressCharacterError)
+
+# Exceptions that, if caught, should cause the task to be re-tried.
+# These errors will be caught a limited number of times before the task fails.
+LIMITED_RETRY_ERRORS = (SMTPConnectError, SMTPServerDisconnected, AWSConnectionError)
+
+# Errors that indicate that a mailing task should be retried without limit.
+# An example is if email is being sent too quickly, but may succeed if sent
+# more slowly.  When caught by a task, it triggers an exponential backoff and retry.
+# Retries happen continuously until the email is sent.
+# Note that the SMTPDataErrors here are only those within the 4xx range.
+# Those not in this range (i.e. in the 5xx range) are treated as hard failures
+# and thus like SINGLE_EMAIL_FAILURE_ERRORS.
+INFINITE_RETRY_ERRORS = (SESMaxSendingRateExceededError, SMTPDataError)
+
+# Errors that are known to indicate an inability to send any more emails,
+# and should therefore not be retried.  For example, exceeding a quota for emails.
+# Also, any SMTP errors that are not explicitly enumerated above.
+BULK_EMAIL_FAILURE_ERRORS = (SESDailyQuotaExceededError, SMTPException)
+
+
+def _get_recipient_queryset(user_id, to_option, course_id, course_location):
     """
-    Delegates emails by querying for the list of recipients who should
-    get the mail, chopping up into batches of settings.EMAILS_PER_TASK size,
-    and queueing up worker jobs.
+    Returns a query set of email recipients corresponding to the requested to_option category.
 
-    Returns the number of batches (workers) kicked off.
+    `to_option` is either SEND_TO_MYSELF, SEND_TO_STAFF, or SEND_TO_ALL.
+
+    Recipients who are in more than one category (e.g. enrolled in the course and are staff or self)
+    will be properly deduped.
     """
-    try:
-        email_obj = CourseEmail.objects.get(id=email_id)
-    except CourseEmail.DoesNotExist as exc:
-        # The retry behavior here is necessary because of a race condition between the commit of the transaction
-        # that creates this CourseEmail row and the celery pipeline that starts this task.
-        # We might possibly want to move the blocking into the view function rather than have it in this task.
-        log.warning("Failed to get CourseEmail with id %s, retry %d", email_id, current_task.request.retries)
-        raise delegate_email_batches.retry(arg=[email_id, user_id], exc=exc)
+    if to_option not in TO_OPTIONS:
+        log.error("Unexpected bulk email TO_OPTION found: %s", to_option)
+        raise Exception("Unexpected bulk email TO_OPTION found: {0}".format(to_option))
 
-    to_option = email_obj.to_option
-    course_id = email_obj.course_id
+    if to_option == SEND_TO_MYSELF:
+        recipient_qset = User.objects.filter(id=user_id)
+    else:
+        staff_grpname = _course_staff_group_name(course_location)
+        staff_group, _ = Group.objects.get_or_create(name=staff_grpname)
+        staff_qset = staff_group.user_set.all()
+        instructor_grpname = _course_instructor_group_name(course_location)
+        instructor_group, _ = Group.objects.get_or_create(name=instructor_grpname)
+        instructor_qset = instructor_group.user_set.all()
+        recipient_qset = staff_qset | instructor_qset
+        if to_option == SEND_TO_ALL:
+            # We also require students to have activated their accounts to
+            # provide verification that the provided email address is valid.
+            enrollment_qset = User.objects.filter(
+                is_active=True,
+                courseenrollment__course_id=course_id,
+                courseenrollment__is_active=True
+            )
+            recipient_qset = recipient_qset | enrollment_qset
+        recipient_qset = recipient_qset.distinct()
 
-    try:
-        course = get_course_by_id(course_id, depth=1)
-    except Http404 as exc:
-        log.exception("get_course_by_id failed: %s", exc.args[0])
-        raise Exception("get_course_by_id failed: " + exc.args[0])
+    recipient_qset = recipient_qset.order_by('pk')
+    return recipient_qset
 
+
+def _get_course_email_context(course):
+    """
+    Returns context arguments to apply to all emails, independent of recipient.
+    """
+    course_id = course.id
+    course_title = course.display_name
     course_url = 'https://{}{}'.format(
         settings.SITE_NAME,
         reverse('course_root', kwargs={'course_id': course_id})
     )
     image_url = 'https://{}{}'.format(settings.SITE_NAME, course_image_url(course))
+    email_context = {
+        'course_title': course_title,
+        'course_url': course_url,
+        'course_image_url': image_url,
+        'account_settings_url': 'https://{}{}'.format(settings.SITE_NAME, reverse('dashboard')),
+        'platform_name': settings.PLATFORM_NAME,
+    }
+    return email_context
 
-    if to_option == SEND_TO_MYSELF:
-        recipient_qset = User.objects.filter(id=user_id)
-    elif to_option == SEND_TO_ALL or to_option == SEND_TO_STAFF:
-        staff_grpname = _course_staff_group_name(course.location)
-        staff_group, _ = Group.objects.get_or_create(name=staff_grpname)
-        staff_qset = staff_group.user_set.all()
-        instructor_grpname = _course_instructor_group_name(course.location)
-        instructor_group, _ = Group.objects.get_or_create(name=instructor_grpname)
-        instructor_qset = instructor_group.user_set.all()
-        recipient_qset = staff_qset | instructor_qset
 
-        if to_option == SEND_TO_ALL:
-            enrollment_qset = User.objects.filter(courseenrollment__course_id=course_id,
-                                                  courseenrollment__is_active=True)
-            recipient_qset = recipient_qset | enrollment_qset
-        recipient_qset = recipient_qset.distinct()
-    else:
-        log.error("Unexpected bulk email TO_OPTION found: %s", to_option)
-        raise Exception("Unexpected bulk email TO_OPTION found: {0}".format(to_option))
+def _generate_subtasks(create_subtask_fcn, recipient_qset):
+    """
+    Generates a list of subtasks to send email to a given set of recipients.
 
-    recipient_qset = recipient_qset.order_by('pk')
+    Arguments:
+        `create_subtask_fcn` : a function whose inputs are a list of recipients and a subtask_id
+            to assign to the new subtask.  Returns the subtask that will send email to that
+            list of recipients.
+        `recipient_qset` : a query set that defines the recipients who should receive emails.
+
+    Returns:  a tuple, containing:
+
+      * A list of subtasks that will send emails to all recipients.
+      * A list of subtask_ids corresponding to those subtasks.
+      * A count of the total number of emails being sent.
+
+    """
     total_num_emails = recipient_qset.count()
-    num_queries = int(math.ceil(float(total_num_emails) / float(settings.EMAILS_PER_QUERY)))
+    num_queries = int(math.ceil(float(total_num_emails) / float(settings.BULK_EMAIL_EMAILS_PER_QUERY)))
     last_pk = recipient_qset[0].pk - 1
-    num_workers = 0
+    num_emails_queued = 0
+    task_list = []
+    subtask_id_list = []
     for _ in range(num_queries):
-        recipient_sublist = list(recipient_qset.order_by('pk').filter(pk__gt=last_pk)
-                                 .values('profile__name', 'email', 'pk')[:settings.EMAILS_PER_QUERY])
+        recipient_sublist = list(recipient_qset.order_by('pk').filter(pk__gt=last_pk).values('profile__name', 'email', 'pk')[:settings.BULK_EMAIL_EMAILS_PER_QUERY])
         last_pk = recipient_sublist[-1]['pk']
         num_emails_this_query = len(recipient_sublist)
-        num_tasks_this_query = int(math.ceil(float(num_emails_this_query) / float(settings.EMAILS_PER_TASK)))
+        num_tasks_this_query = int(math.ceil(float(num_emails_this_query) / float(settings.BULK_EMAIL_EMAILS_PER_TASK)))
         chunk = int(math.ceil(float(num_emails_this_query) / float(num_tasks_this_query)))
         for i in range(num_tasks_this_query):
             to_list = recipient_sublist[i * chunk:i * chunk + chunk]
-            course_email.delay(
-                email_id,
-                to_list,
-                course.display_name,
-                course_url,
-                image_url,
-                False
-            )
-        num_workers += num_tasks_this_query
-    return num_workers
+            subtask_id = str(uuid4())
+            subtask_id_list.append(subtask_id)
+            new_subtask = create_subtask_fcn(to_list, subtask_id)
+            task_list.append(new_subtask)
+
+        num_emails_queued += num_emails_this_query
+
+    # Sanity check: we expect the chunking to be properly summing to the original count:
+    if num_emails_queued != total_num_emails:
+        error_msg = "Task {}: number of emails generated by chunking {} not equal to original total {}".format(num_emails_queued, total_num_emails)
+        log.error(error_msg)
+        raise ValueError(error_msg)
+
+    return task_list, subtask_id_list, total_num_emails
 
 
-@task(default_retry_delay=15, max_retries=5)  # pylint: disable=E1102
-def course_email(email_id, to_list, course_title, course_url, image_url, throttle=False):
+def perform_delegate_email_batches(entry_id, course_id, task_input, action_name):
     """
-    Takes a primary id for a CourseEmail object and a 'to_list' of recipient objects--keys are
-    'profile__name', 'email' (address), and 'pk' (in the user table).
-    course_title, course_url, and image_url are to memoize course properties and save lookups.
+    Delegates emails by querying for the list of recipients who should
+    get the mail, chopping up into batches of settings.BULK_EMAIL_EMAILS_PER_TASK size,
+    and queueing up worker jobs.
 
-    Sends to all addresses contained in to_list.  Emails are sent multi-part, in both plain
-    text and html.
+    Returns the number of batches (workers) kicked off.
     """
-    with dog_stats_api.timer('course_email.single_task.time.overall', tags=[_statsd_tag(course_title)]):
-        _send_course_email(email_id, to_list, course_title, course_url, image_url, throttle)
+    entry = InstructorTask.objects.get(pk=entry_id)
+    # Get inputs to use in this task from the entry.
+    user_id = entry.requester.id
+    task_id = entry.task_id
 
-def _send_course_email(email_id, to_list, course_title, course_url, image_url, throttle):
-    """
-    Performs the email sending task.
-    """
+    # Perfunctory check, since expansion is made for convenience of other task
+    # code that doesn't need the entry_id.
+    if course_id != entry.course_id:
+        format_msg = "Course id conflict: explicit value {} does not match task value {}"
+        raise ValueError(format_msg.format(course_id, entry.course_id))
+
+    # Fetch the CourseEmail.
+    email_id = task_input['email_id']
     try:
-        msg = CourseEmail.objects.get(id=email_id)
+        email_obj = CourseEmail.objects.get(id=email_id)
     except CourseEmail.DoesNotExist:
-        log.exception("Could not find email id:{} to send.".format(email_id))
+        # The CourseEmail object should be committed in the view function before the task
+        # is submitted and reaches this point.
+        log.warning("Task %s: Failed to get CourseEmail with id %s", task_id, email_id)
         raise
 
-    # exclude optouts
-    optouts = (Optout.objects.filter(course_id=msg.course_id,
-                                     user__in=[i['pk'] for i in to_list])
-                             .values_list('user__email', flat=True))
+    # Check to see if email batches have already been defined.  This seems to
+    # happen sometimes when there is a loss of connection while a task is being
+    # queued.  When this happens, the same task gets called again, and a whole
+    # new raft of subtasks gets queued up.  We will assume that if subtasks
+    # have already been defined, there is no need to redefine them below.
+    # So we just return right away.  We don't raise an exception, because we want
+    # the current task to be marked with whatever it had been marked with before.
+    if len(entry.subtasks) > 0 and len(entry.task_output) > 0:
+        log.warning("Task %s has already been processed for email %s!  InstructorTask = %s", task_id, email_id, entry)
+        progress = json.loads(entry.task_output)
+        return progress
 
+    # Sanity check that course for email_obj matches that of the task referencing it.
+    if course_id != email_obj.course_id:
+        format_msg = "Course id conflict: explicit value {} does not match email value {}"
+        raise ValueError(format_msg.format(course_id, email_obj.course_id))
+
+    # Fetch the course object.
+    try:
+        course = get_course(course_id)
+    except ValueError:
+        log.exception("Task %s: course not found: %s", task_id, course_id)
+        raise
+
+    to_option = email_obj.to_option
+    recipient_qset = _get_recipient_queryset(user_id, to_option, course_id, course.location)
+    global_email_context = _get_course_email_context(course)
+
+    def _create_send_email_subtask(to_list, subtask_id):
+        """Creates a subtask to send email to a given recipient list."""
+        subtask_status = create_subtask_status(subtask_id)
+        new_subtask = send_course_email.subtask(
+            (
+                entry_id,
+                email_id,
+                to_list,
+                global_email_context,
+                subtask_status,
+            ),
+            task_id=subtask_id,
+            routing_key=settings.BULK_EMAIL_ROUTING_KEY,
+        )
+        return new_subtask
+
+    log.info("Task %s: Preparing to generate subtasks for course %s, email %s, to_option %s",
+             task_id, course_id, email_id, to_option)
+    task_list, subtask_id_list, total_num_emails = _generate_subtasks(_create_send_email_subtask, recipient_qset)
+
+    # Update the InstructorTask  with information about the subtasks we've defined.
+    log.info("Task %s: Preparing to update task for sending %d emails for course %s, email %s, to_option %s",
+             task_id, total_num_emails, course_id, email_id, to_option)
+    progress = initialize_subtask_info(entry, action_name, total_num_emails, subtask_id_list)
+    num_subtasks = len(subtask_id_list)
+
+    # Now group the subtasks, and start them running.  This allows all the subtasks
+    # in the list to be submitted at the same time.
+    log.info("Task %s: Preparing to queue %d email tasks (%d emails) for course %s, email %s, to %s",
+             task_id, num_subtasks, total_num_emails, course_id, email_id, to_option)
+    task_group = group(task_list)
+    task_group.apply_async(routing_key=settings.BULK_EMAIL_ROUTING_KEY)
+
+    # We want to return progress here, as this is what will be stored in the
+    # AsyncResult for the parent task as its return value.
+    # The AsyncResult will then be marked as SUCCEEDED, and have this return value as its "result".
+    # That's okay, for the InstructorTask will have the "real" status, and monitoring code
+    # should be using that instead.
+    return progress
+
+
+@task(default_retry_delay=settings.BULK_EMAIL_DEFAULT_RETRY_DELAY, max_retries=settings.BULK_EMAIL_MAX_RETRIES)  # pylint: disable=E1102
+def send_course_email(entry_id, email_id, to_list, global_email_context, subtask_status):
+    """
+    Sends an email to a list of recipients.
+
+    Inputs are:
+      * `entry_id`: id of the InstructorTask object to which progress should be recorded.
+      * `email_id`: id of the CourseEmail model that is to be emailed.
+      * `to_list`: list of recipients.  Each is represented as a dict with the following keys:
+        - 'profile__name': full name of User.
+        - 'email': email address of User.
+        - 'pk': primary key of User model.
+      * `global_email_context`: dict containing values that are unique for this email but the same
+        for all recipients of this email.  This dict is to be used to fill in slots in email
+        template.  It does not include 'name' and 'email', which will be provided by the to_list.
+      * `subtask_status` : dict containing values representing current status.  Keys are:
+
+        'task_id' : id of subtask.  This is used to pass task information across retries.
+        'attempted' : number of attempts -- should equal succeeded plus failed
+        'succeeded' : number that succeeded in processing
+        'skipped' : number that were not processed.
+        'failed' : number that failed during processing
+        'retried_nomax' : number of times the subtask has been retried for conditions that
+            should not have a maximum count applied
+        'retried_withmax' : number of times the subtask has been retried for conditions that
+            should have a maximum count applied
+        'state' : celery state of the subtask (e.g. QUEUING, PROGRESS, RETRY, FAILURE, SUCCESS)
+
+        Most values will be zero on initial call, but may be different when the task is
+        invoked as part of a retry.
+
+    Sends to all addresses contained in to_list that are not also in the Optout table.
+    Emails are sent multi-part, in both plain text and html.  Updates InstructorTask object
+    with status information (sends, failures, skips) and updates number of subtasks completed.
+    """
+    current_task_id = subtask_status['task_id']
+    num_to_send = len(to_list)
+    log.info("Preparing to send email %s to %d recipients as subtask %s for instructor task %d: context = %s, status=%s",
+             email_id, num_to_send, current_task_id, entry_id, global_email_context, subtask_status)
+
+    # Check that the requested subtask is actually known to the current InstructorTask entry.
+    # If this fails, it throws an exception, which should fail this subtask immediately.
+    # This can happen when the parent task has been run twice, and results in duplicate
+    # subtasks being created for the same InstructorTask entry.  We hope to catch this condition
+    # in perform_delegate_email_batches(), but just in case we fail to do so there,
+    # we check here as well.
+    check_subtask_is_valid(entry_id, current_task_id)
+
+    send_exception = None
+    new_subtask_status = None
+    try:
+        course_title = global_email_context['course_title']
+        with dog_stats_api.timer('course_email.single_task.time.overall', tags=[_statsd_tag(course_title)]):
+            new_subtask_status, send_exception = _send_course_email(
+                entry_id,
+                email_id,
+                to_list,
+                global_email_context,
+                subtask_status,
+            )
+    except Exception:
+        # Unexpected exception. Try to write out the failure to the entry before failing.
+        log.exception("Send-email task %s: failed unexpectedly!", current_task_id)
+        # We got here for really unexpected reasons.  Since we don't know how far
+        # the task got in emailing, we count all recipients as having failed.
+        # It at least keeps the counts consistent.
+        new_subtask_status = increment_subtask_status(subtask_status, failed=num_to_send, state=FAILURE)
+        update_subtask_status(entry_id, current_task_id, new_subtask_status)
+        raise
+
+    if send_exception is None:
+        # Update the InstructorTask object that is storing its progress.
+        log.info("Send-email task %s: succeeded", current_task_id)
+        update_subtask_status(entry_id, current_task_id, new_subtask_status)
+    elif isinstance(send_exception, RetryTaskError):
+        # If retrying, a RetryTaskError needs to be returned to Celery.
+        # We assume that the the progress made before the retry condition
+        # was encountered has already been updated before the retry call was made,
+        # so we only log here.
+        log.warning("Send-email task %s: being retried", current_task_id)
+        raise send_exception  # pylint: disable=E0702
+    else:
+        log.error("Send-email task %s: failed: %s", current_task_id, send_exception)
+        update_subtask_status(entry_id, current_task_id, new_subtask_status)
+        raise send_exception  # pylint: disable=E0702
+
+    log.info("Send-email task %s: returning status %s", current_task_id, new_subtask_status)
+    return new_subtask_status
+
+
+def _filter_optouts_from_recipients(to_list, course_id):
+    """
+    Filters a recipient list based on student opt-outs for a given course.
+
+    Returns the filtered recipient list, as well as the number of optouts
+    removed from the list.
+    """
+    optouts = Optout.objects.filter(
+        course_id=course_id,
+        user__in=[i['pk'] for i in to_list]
+    ).values_list('user__email', flat=True)
     optouts = set(optouts)
+    # Only count the num_optout for the first time the optouts are calculated.
+    # We assume that the number will not change on retries, and so we don't need
+    # to calculate it each time.
     num_optout = len(optouts)
-
     to_list = [recipient for recipient in to_list if recipient['email'] not in optouts]
+    return to_list, num_optout
 
-    subject = "[" + course_title + "] " + msg.subject
 
+def _get_source_address(course_id, course_title):
+    """
+    Calculates an email address to be used as the 'from-address' for sent emails.
+
+    Makes a unique from name and address for each course, e.g.
+
+        "COURSE_TITLE" Course Staff <coursenum-no-reply@courseupdates.edx.org>
+
+    """
     course_title_no_quotes = re.sub(r'"', '', course_title)
-    from_addr = '"{0}" Course Staff <{1}>'.format(course_title_no_quotes, settings.DEFAULT_BULK_FROM_EMAIL)
+
+    # The course_id is assumed to be in the form 'org/course_num/run',
+    # so pull out the course_num.  Then make sure that it can be used
+    # in an email address, by substituting a '_' anywhere a non-(ascii, period, or dash)
+    # character appears.
+    course_num = course_id.split('/')[1]
+    invalid_chars = re.compile(r"[^\w.-]")
+    course_num = invalid_chars.sub('_', course_num)
+
+    from_addr = '"{0}" Course Staff <{1}-{2}>'.format(course_title_no_quotes, course_num, settings.BULK_EMAIL_DEFAULT_FROM_EMAIL)
+    return from_addr
+
+
+def _send_course_email(entry_id, email_id, to_list, global_email_context, subtask_status):
+    """
+    Performs the email sending task.
+
+    Sends an email to a list of recipients.
+
+    Inputs are:
+      * `entry_id`: id of the InstructorTask object to which progress should be recorded.
+      * `email_id`: id of the CourseEmail model that is to be emailed.
+      * `to_list`: list of recipients.  Each is represented as a dict with the following keys:
+        - 'profile__name': full name of User.
+        - 'email': email address of User.
+        - 'pk': primary key of User model.
+      * `global_email_context`: dict containing values that are unique for this email but the same
+        for all recipients of this email.  This dict is to be used to fill in slots in email
+        template.  It does not include 'name' and 'email', which will be provided by the to_list.
+      * `subtask_status` : dict containing values representing current status.  Keys are:
+
+        'task_id' : id of subtask.  This is used to pass task information across retries.
+        'attempted' : number of attempts -- should equal succeeded plus failed
+        'succeeded' : number that succeeded in processing
+        'skipped' : number that were not processed.
+        'failed' : number that failed during processing
+        'retried_nomax' : number of times the subtask has been retried for conditions that
+            should not have a maximum count applied
+        'retried_withmax' : number of times the subtask has been retried for conditions that
+            should have a maximum count applied
+        'state' : celery state of the subtask (e.g. QUEUING, PROGRESS, RETRY, FAILURE, SUCCESS)
+
+    Sends to all addresses contained in to_list that are not also in the Optout table.
+    Emails are sent multi-part, in both plain text and html.
+
+    Returns a tuple of two values:
+      * First value is a dict which represents current progress at the end of this call.  Keys are
+        the same as for the input subtask_status.
+
+      * Second value is an exception returned by the innards of the method, indicating a fatal error.
+        In this case, the number of recipients that were not sent have already been added to the
+        'failed' count above.
+    """
+    # Get information from current task's request:
+    task_id = subtask_status['task_id']
+
+    # collect stats on progress:
+    num_optout = 0
+    num_sent = 0
+    num_error = 0
+
+    try:
+        course_email = CourseEmail.objects.get(id=email_id)
+    except CourseEmail.DoesNotExist as exc:
+        log.exception("Task %s: could not find email id:%s to send.", task_id, email_id)
+        raise
+
+    # Exclude optouts (if not a retry):
+    # Note that we don't have to do the optout logic at all if this is a retry,
+    # because we have presumably already performed the optout logic on the first
+    # attempt.  Anyone on the to_list on a retry has already passed the filter
+    # that existed at that time, and we don't need to keep checking for changes
+    # in the Optout list.
+    if (subtask_status['retried_nomax'] + subtask_status['retried_withmax']) == 0:
+        to_list, num_optout = _filter_optouts_from_recipients(to_list, course_email.course_id)
+
+    course_title = global_email_context['course_title']
+    subject = "[" + course_title + "] " + course_email.subject
+    from_addr = _get_source_address(course_email.course_id, course_title)
 
     course_email_template = CourseEmailTemplate.get_template()
-
     try:
         connection = get_connection()
         connection.open()
-        num_sent = 0
-        num_error = 0
 
         # Define context values to use in all course emails:
-        email_context = {
-            'name': '',
-            'email': '',
-            'course_title': course_title,
-            'course_url': course_url,
-            'course_image_url': image_url,
-            'account_settings_url': 'https://{}{}'.format(settings.SITE_NAME, reverse('dashboard')),
-            'platform_name': settings.PLATFORM_NAME,
-        }
+        email_context = {'name': '', 'email': ''}
+        email_context.update(global_email_context)
 
         while to_list:
-            # Update context with user-specific values:
-            email = to_list[-1]['email']
+            # Update context with user-specific values from the user at the end of the list.
+            # At the end of processing this user, they will be popped off of the to_list.
+            # That way, the to_list will always contain the recipients remaining to be emailed.
+            # This is convenient for retries, which will need to send to those who haven't
+            # yet been emailed, but not send to those who have already been sent to.
+            current_recipient = to_list[-1]
+            email = current_recipient['email']
             email_context['email'] = email
-            email_context['name'] = to_list[-1]['profile__name']
+            email_context['name'] = current_recipient['profile__name']
 
             # Construct message content using templates and context:
-            plaintext_msg = course_email_template.render_plaintext(msg.text_message, email_context)
-            html_msg = course_email_template.render_htmltext(msg.html_message, email_context)
+            plaintext_msg = course_email_template.render_plaintext(course_email.text_message, email_context)
+            html_msg = course_email_template.render_htmltext(course_email.html_message, email_context)
 
             # Create email:
             email_msg = EmailMultiAlternatives(
@@ -183,66 +509,247 @@ def _send_course_email(email_id, to_list, course_title, course_url, image_url, t
             )
             email_msg.attach_alternative(html_msg, 'text/html')
 
-            # Throttle if we tried a few times and got the rate limiter
-            if throttle or current_task.request.retries > 0:
-                time.sleep(0.2)
+            # Throttle if we have gotten the rate limiter.  This is not very high-tech,
+            # but if a task has been retried for rate-limiting reasons, then we sleep
+            # for a period of time between all emails within this task.  Choice of
+            # the value depends on the number of workers that might be sending email in
+            # parallel, and what the SES throttle rate is.
+            if subtask_status['retried_nomax'] > 0:
+                sleep(settings.BULK_EMAIL_RETRY_DELAY_BETWEEN_SENDS)
 
             try:
+                log.debug('Email with id %s to be sent to %s', email_id, email)
+
                 with dog_stats_api.timer('course_email.single_send.time.overall', tags=[_statsd_tag(course_title)]):
                     connection.send_messages([email_msg])
 
-                dog_stats_api.increment('course_email.sent', tags=[_statsd_tag(course_title)])
-
-                log.info('Email with id %s sent to %s', email_id, email)
-                num_sent += 1
             except SMTPDataError as exc:
-                # According to SMTP spec, we'll retry error codes in the 4xx range.  5xx range indicates hard failure
+                # According to SMTP spec, we'll retry error codes in the 4xx range.  5xx range indicates hard failure.
                 if exc.smtp_code >= 400 and exc.smtp_code < 500:
-                    # This will cause the outer handler to catch the exception and retry the entire task
+                    # This will cause the outer handler to catch the exception and retry the entire task.
                     raise exc
                 else:
-                    # This will fall through and not retry the message, since it will be popped
-                    log.warning('Email with id %s not delivered to %s due to error %s', email_id, email, exc.smtp_error)
-
+                    # This will fall through and not retry the message.
+                    log.warning('Task %s: email with id %s not delivered to %s due to error %s', task_id, email_id, email, exc.smtp_error)
                     dog_stats_api.increment('course_email.error', tags=[_statsd_tag(course_title)])
-
                     num_error += 1
 
+            except SINGLE_EMAIL_FAILURE_ERRORS as exc:
+                # This will fall through and not retry the message.
+                log.warning('Task %s: email with id %s not delivered to %s due to error %s', task_id, email_id, email, exc)
+                dog_stats_api.increment('course_email.error', tags=[_statsd_tag(course_title)])
+                num_error += 1
+
+            else:
+                dog_stats_api.increment('course_email.sent', tags=[_statsd_tag(course_title)])
+                if settings.BULK_EMAIL_LOG_SENT_EMAILS:
+                    log.info('Email with id %s sent to %s', email_id, email)
+                else:
+                    log.debug('Email with id %s sent to %s', email_id, email)
+                num_sent += 1
+
+            # Pop the user that was emailed off the end of the list only once they have
+            # successfully been processed.  (That way, if there were a failure that
+            # needed to be retried, the user is still on the list.)
             to_list.pop()
 
-        connection.close()
-        return course_email_result(num_sent, num_error, num_optout)
+    except INFINITE_RETRY_ERRORS as exc:
+        dog_stats_api.increment('course_email.infinite_retry', tags=[_statsd_tag(course_title)])
+        # Increment the "retried_nomax" counter, update other counters with progress to date,
+        # and set the state to RETRY:
+        subtask_progress = increment_subtask_status(
+            subtask_status,
+            succeeded=num_sent,
+            failed=num_error,
+            skipped=num_optout,
+            retried_nomax=1,
+            state=RETRY
+        )
+        return _submit_for_retry(
+            entry_id, email_id, to_list, global_email_context, exc, subtask_progress, skip_retry_max=True
+        )
 
-    except (SMTPDataError, SMTPConnectError, SMTPServerDisconnected) as exc:
-        # Error caught here cause the email to be retried.  The entire task is actually retried without popping the list
-        # Reasoning is that all of these errors may be temporary condition.
-        log.warning('Email with id %d not delivered due to temporary error %s, retrying send to %d recipients',
-                    email_id, exc, len(to_list))
-        raise course_email.retry(
-            arg=[
+    except LIMITED_RETRY_ERRORS as exc:
+        # Errors caught here cause the email to be retried.  The entire task is actually retried
+        # without popping the current recipient off of the existing list.
+        # Errors caught are those that indicate a temporary condition that might succeed on retry.
+        dog_stats_api.increment('course_email.limited_retry', tags=[_statsd_tag(course_title)])
+        # Increment the "retried_withmax" counter, update other counters with progress to date,
+        # and set the state to RETRY:
+        subtask_progress = increment_subtask_status(
+            subtask_status,
+            succeeded=num_sent,
+            failed=num_error,
+            skipped=num_optout,
+            retried_withmax=1,
+            state=RETRY
+        )
+        return _submit_for_retry(
+            entry_id, email_id, to_list, global_email_context, exc, subtask_progress, skip_retry_max=False
+        )
+
+    except BULK_EMAIL_FAILURE_ERRORS as exc:
+        dog_stats_api.increment('course_email.error', tags=[_statsd_tag(course_title)])
+        num_pending = len(to_list)
+        log.exception('Task %s: email with id %d caused send_course_email task to fail with "fatal" exception.  %d emails unsent.',
+                      task_id, email_id, num_pending)
+        # Update counters with progress to date, counting unsent emails as failures,
+        # and set the state to FAILURE:
+        subtask_progress = increment_subtask_status(
+            subtask_status,
+            succeeded=num_sent,
+            failed=(num_error + num_pending),
+            skipped=num_optout,
+            state=FAILURE
+        )
+        return subtask_progress, exc
+
+    except Exception as exc:
+        # Errors caught here cause the email to be retried.  The entire task is actually retried
+        # without popping the current recipient off of the existing list.
+        # These are unexpected errors.  Since they might be due to a temporary condition that might
+        # succeed on retry, we give them a retry.
+        dog_stats_api.increment('course_email.limited_retry', tags=[_statsd_tag(course_title)])
+        log.exception('Task %s: email with id %d caused send_course_email task to fail with unexpected exception.  Generating retry.',
+                      task_id, email_id)
+        # Increment the "retried_withmax" counter, update other counters with progress to date,
+        # and set the state to RETRY:
+        subtask_progress = increment_subtask_status(
+            subtask_status,
+            succeeded=num_sent,
+            failed=num_error,
+            skipped=num_optout,
+            retried_withmax=1,
+            state=RETRY
+        )
+        return _submit_for_retry(
+            entry_id, email_id, to_list, global_email_context, exc, subtask_progress, skip_retry_max=False
+        )
+
+    else:
+        # All went well.  Update counters with progress to date,
+        # and set the state to SUCCESS:
+        subtask_progress = increment_subtask_status(
+            subtask_status,
+            succeeded=num_sent,
+            failed=num_error,
+            skipped=num_optout,
+            state=SUCCESS
+        )
+        # Successful completion is marked by an exception value of None.
+        return subtask_progress, None
+    finally:
+        # Clean up at the end.
+        connection.close()
+
+
+def _get_current_task():
+    """
+    Stub to make it easier to test without actually running Celery.
+
+    This is a wrapper around celery.current_task, which provides access
+    to the top of the stack of Celery's tasks.  When running tests, however,
+    it doesn't seem to work to mock current_task directly, so this wrapper
+    is used to provide a hook to mock in tests, while providing the real
+    `current_task` in production.
+    """
+    return current_task
+
+
+def _submit_for_retry(entry_id, email_id, to_list, global_email_context, current_exception, subtask_status, skip_retry_max=False):
+    """
+    Helper function to requeue a task for retry, using the new version of arguments provided.
+
+    Inputs are the same as for running a task, plus two extra indicating the state at the time of retry.
+    These include the `current_exception` that the task encountered that is causing the retry attempt,
+    and the `subtask_status` that is to be returned.  A third extra argument `skip_retry_max`
+    indicates whether the current retry should be subject to a maximum test.
+
+    Returns a tuple of two values:
+      * First value is a dict which represents current progress.  Keys are:
+
+        'task_id' : id of subtask.  This is used to pass task information across retries.
+        'attempted' : number of attempts -- should equal succeeded plus failed
+        'succeeded' : number that succeeded in processing
+        'skipped' : number that were not processed.
+        'failed' : number that failed during processing
+        'retried_nomax' : number of times the subtask has been retried for conditions that
+            should not have a maximum count applied
+        'retried_withmax' : number of times the subtask has been retried for conditions that
+            should have a maximum count applied
+        'state' : celery state of the subtask (e.g. QUEUING, PROGRESS, RETRY, FAILURE, SUCCESS)
+
+      * Second value is an exception returned by the innards of the method.  If the retry was
+        successfully submitted, this value will be the RetryTaskError that retry() returns.
+        Otherwise, it (ought to be) the current_exception passed in.
+    """
+    task_id = subtask_status['task_id']
+    log.info("Task %s: Successfully sent to %s users; failed to send to %s users (and skipped %s users)",
+             task_id, subtask_status['succeeded'], subtask_status['failed'], subtask_status['skipped'])
+
+    # Calculate time until we retry this task (in seconds):
+    # The value for max_retries is increased by the number of times an "infinite-retry" exception
+    # has been retried.  We want the regular retries to trigger max-retry checking, but not these
+    # special retries.  So we count them separately.
+    max_retries = _get_current_task().max_retries + subtask_status['retried_nomax']
+    base_delay = _get_current_task().default_retry_delay
+    if skip_retry_max:
+        # once we reach five retries, don't increase the countdown further.
+        retry_index = min(subtask_status['retried_nomax'], 5)
+        exception_type = 'sending-rate'
+        # if we have a cap, after all, apply it now:
+        if hasattr(settings, 'BULK_EMAIL_INFINITE_RETRY_CAP'):
+            retry_cap = settings.BULK_EMAIL_INFINITE_RETRY_CAP + subtask_status['retried_withmax']
+            max_retries = min(max_retries, retry_cap)
+    else:
+        retry_index = subtask_status['retried_withmax']
+        exception_type = 'transient'
+
+    # Skew the new countdown value by a random factor, so that not all
+    # retries are deferred by the same amount.
+    countdown = ((2 ** retry_index) * base_delay) * random.uniform(.75, 1.25)
+
+    log.warning('Task %s: email with id %d not delivered due to %s error %s, retrying send to %d recipients in %s seconds (with max_retry=%s)',
+                task_id, email_id, exception_type, current_exception, len(to_list), countdown, max_retries)
+
+    # we make sure that we update the InstructorTask with the current subtask status
+    # *before* actually calling retry(), to be sure that there is no race
+    # condition between this update and the update made by the retried task.
+    update_subtask_status(entry_id, task_id, subtask_status)
+
+    # Now attempt the retry.  If it succeeds, it returns a RetryTaskError that
+    # needs to be returned back to Celery.  If it fails, we return the existing
+    # exception.
+    try:
+        send_course_email.retry(
+            args=[
+                entry_id,
                 email_id,
                 to_list,
-                course_title,
-                course_url,
-                image_url,
-                current_task.request.retries > 0
+                global_email_context,
+                subtask_status,
             ],
-            exc=exc,
-            countdown=(2 ** current_task.request.retries) * 15
+            exc=current_exception,
+            countdown=countdown,
+            max_retries=max_retries,
+            throw=True,
         )
-    except:
-        log.exception('Email with id %d caused course_email task to fail with uncaught exception. To list: %s',
-                      email_id,
-                      [i['email'] for i in to_list])
-        # Close the connection before we exit
-        connection.close()
-        raise
-
-
-# This string format code is wrapped in this function to allow mocking for a unit test
-def course_email_result(num_sent, num_error, num_optout):
-    """Return the formatted result of course_email sending."""
-    return "Sent {0}, Fail {1}, Optout {2}".format(num_sent, num_error, num_optout)
+    except RetryTaskError as retry_error:
+        # If the retry call is successful, update with the current progress:
+        log.exception('Task %s: email with id %d caused send_course_email task to retry.',
+                      task_id, email_id)
+        return subtask_status, retry_error
+    except Exception as retry_exc:
+        # If there are no more retries, because the maximum has been reached,
+        # we expect the original exception to be raised.  We catch it here
+        # (and put it in retry_exc just in case it's different, but it shouldn't be),
+        # and update status as if it were any other failure.  That means that
+        # the recipients still in the to_list are counted as failures.
+        log.exception('Task %s: email with id %d caused send_course_email task to fail to retry. To list: %s',
+                      task_id, email_id, [i['email'] for i in to_list])
+        num_failed = len(to_list)
+        new_subtask_progress = increment_subtask_status(subtask_status, failed=num_failed, state=FAILURE)
+        return new_subtask_progress, retry_exc
 
 
 def _statsd_tag(course_title):
diff --git a/lms/djangoapps/bulk_email/tests/test_course_optout.py b/lms/djangoapps/bulk_email/tests/test_course_optout.py
index 0adf119527..378610eeb3 100644
--- a/lms/djangoapps/bulk_email/tests/test_course_optout.py
+++ b/lms/djangoapps/bulk_email/tests/test_course_optout.py
@@ -59,7 +59,7 @@ class TestOptoutCourseEmails(ModuleStoreTestCase):
         selected_email_link = '<a href="#" onclick="goto(\'Email\')" class="selectedmode">Email</a>'
         self.assertTrue(selected_email_link in response.content)
 
-    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True})
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': False})
     def test_optout_course(self):
         """
         Make sure student does not receive course email after opting out.
@@ -88,7 +88,7 @@ class TestOptoutCourseEmails(ModuleStoreTestCase):
         # Assert that self.student.email not in mail.to, outbox should be empty
         self.assertEqual(len(mail.outbox), 0)
 
-    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True})
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': False})
     def test_optin_course(self):
         """
         Make sure student receives course email after opting in.
diff --git a/lms/djangoapps/bulk_email/tests/test_email.py b/lms/djangoapps/bulk_email/tests/test_email.py
index dab7812763..9da787dbaa 100644
--- a/lms/djangoapps/bulk_email/tests/test_email.py
+++ b/lms/djangoapps/bulk_email/tests/test_email.py
@@ -2,6 +2,8 @@
 """
 Unit tests for sending course email
 """
+from mock import patch
+
 from django.conf import settings
 from django.core import mail
 from django.core.urlresolvers import reverse
@@ -12,11 +14,8 @@ from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
 from student.tests.factories import UserFactory, GroupFactory, CourseEnrollmentFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
-
-from bulk_email.tasks import delegate_email_batches, course_email
-from bulk_email.models import CourseEmail, Optout
-
-from mock import patch
+from bulk_email.models import Optout
+from instructor_task.subtasks import increment_subtask_status
 
 STAFF_COUNT = 3
 STUDENT_COUNT = 10
@@ -30,13 +29,13 @@ class MockCourseEmailResult(object):
     """
     emails_sent = 0
 
-    def get_mock_course_email_result(self):
+    def get_mock_increment_subtask_status(self):
         """Wrapper for mock email function."""
-        def mock_course_email_result(sent, failed, output, **kwargs):  # pylint: disable=W0613
+        def mock_increment_subtask_status(original_status, **kwargs):  # pylint: disable=W0613
             """Increments count of number of emails sent."""
-            self.emails_sent += sent
-            return True
-        return mock_course_email_result
+            self.emails_sent += kwargs.get('succeeded', 0)
+            return increment_subtask_status(original_status, **kwargs)
+        return mock_increment_subtask_status
 
 
 @override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
@@ -45,7 +44,7 @@ class TestEmailSendFromDashboard(ModuleStoreTestCase):
     Test that emails send correctly.
     """
 
-    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True})
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': False})
     def setUp(self):
         self.course = CourseFactory.create()
         self.instructor = UserFactory.create(username="instructor", email="robot+instructor@edx.org")
@@ -244,14 +243,14 @@ class TestEmailSendFromDashboard(ModuleStoreTestCase):
             [self.instructor.email] + [s.email for s in self.staff] + [s.email for s in self.students]
         )
 
-    @override_settings(EMAILS_PER_TASK=3, EMAILS_PER_QUERY=7)
-    @patch('bulk_email.tasks.course_email_result')
+    @override_settings(BULK_EMAIL_EMAILS_PER_TASK=3, BULK_EMAIL_EMAILS_PER_QUERY=7)
+    @patch('bulk_email.tasks.increment_subtask_status')
     def test_chunked_queries_send_numerous_emails(self, email_mock):
         """
         Test sending a large number of emails, to test the chunked querying
         """
         mock_factory = MockCourseEmailResult()
-        email_mock.side_effect = mock_factory.get_mock_course_email_result()
+        email_mock.side_effect = mock_factory.get_mock_increment_subtask_status()
         added_users = []
         for _ in xrange(LARGE_NUM_EMAILS):
             user = UserFactory()
@@ -281,14 +280,3 @@ class TestEmailSendFromDashboard(ModuleStoreTestCase):
                                 [s.email for s in self.students] +
                                 [s.email for s in added_users if s not in optouts])
         self.assertItemsEqual(outbox_contents, should_send_contents)
-
-
-@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
-class TestEmailSendExceptions(ModuleStoreTestCase):
-    """
-    Test that exceptions are handled correctly.
-    """
-    def test_no_course_email_obj(self):
-        # Make sure course_email handles CourseEmail.DoesNotExist exception.
-        with self.assertRaises(CourseEmail.DoesNotExist):
-            course_email(101, [], "_", "_", "_", False)
diff --git a/lms/djangoapps/bulk_email/tests/test_err_handling.py b/lms/djangoapps/bulk_email/tests/test_err_handling.py
index abdbf4dc3b..dfe098306c 100644
--- a/lms/djangoapps/bulk_email/tests/test_err_handling.py
+++ b/lms/djangoapps/bulk_email/tests/test_err_handling.py
@@ -2,21 +2,24 @@
 Unit tests for handling email sending errors
 """
 from itertools import cycle
+from mock import patch
+from smtplib import SMTPDataError, SMTPServerDisconnected, SMTPConnectError
+
 from django.test.utils import override_settings
 from django.conf import settings
 from django.core.management import call_command
 from django.core.urlresolvers import reverse
 
+
 from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 from student.tests.factories import UserFactory, AdminFactory, CourseEnrollmentFactory
 
-from bulk_email.models import CourseEmail
-from bulk_email.tasks import delegate_email_batches
-
-from mock import patch, Mock
-from smtplib import SMTPDataError, SMTPServerDisconnected, SMTPConnectError
+from bulk_email.models import CourseEmail, SEND_TO_ALL
+from bulk_email.tasks import perform_delegate_email_batches, send_course_email
+from instructor_task.models import InstructorTask
+from instructor_task.subtasks import create_subtask_status, initialize_subtask_info
 
 
 class EmailTestException(Exception):
@@ -43,7 +46,7 @@ class TestEmailErrors(ModuleStoreTestCase):
         patch.stopall()
 
     @patch('bulk_email.tasks.get_connection', autospec=True)
-    @patch('bulk_email.tasks.course_email.retry')
+    @patch('bulk_email.tasks.send_course_email.retry')
     def test_data_err_retry(self, retry, get_conn):
         """
         Test that celery handles transient SMTPDataErrors by retrying.
@@ -61,18 +64,19 @@ class TestEmailErrors(ModuleStoreTestCase):
         self.assertTrue(retry.called)
         (_, kwargs) = retry.call_args
         exc = kwargs['exc']
-        self.assertTrue(type(exc) == SMTPDataError)
+        self.assertIsInstance(exc, SMTPDataError)
 
     @patch('bulk_email.tasks.get_connection', autospec=True)
-    @patch('bulk_email.tasks.course_email_result')
-    @patch('bulk_email.tasks.course_email.retry')
+    @patch('bulk_email.tasks.increment_subtask_status')
+    @patch('bulk_email.tasks.send_course_email.retry')
     def test_data_err_fail(self, retry, result, get_conn):
         """
         Test that celery handles permanent SMTPDataErrors by failing and not retrying.
         """
+        # have every fourth email fail due to blacklisting:
         get_conn.return_value.send_messages.side_effect = cycle([SMTPDataError(554, "Email address is blacklisted"),
-                                                                 None])
-        students = [UserFactory() for _ in xrange(settings.EMAILS_PER_TASK)]
+                                                                 None, None, None])
+        students = [UserFactory() for _ in xrange(settings.BULK_EMAIL_EMAILS_PER_TASK)]
         for student in students:
             CourseEnrollmentFactory.create(user=student, course_id=self.course.id)
 
@@ -87,13 +91,14 @@ class TestEmailErrors(ModuleStoreTestCase):
         # We shouldn't retry when hitting a 5xx error
         self.assertFalse(retry.called)
         # Test that after the rejected email, the rest still successfully send
-        ((sent, fail, optouts), _) = result.call_args
-        self.assertEquals(optouts, 0)
-        self.assertEquals(fail, settings.EMAILS_PER_TASK / 2)
-        self.assertEquals(sent, settings.EMAILS_PER_TASK / 2)
+        ((_initial_results), kwargs) = result.call_args
+        self.assertEquals(kwargs['skipped'], 0)
+        expected_fails = int((settings.BULK_EMAIL_EMAILS_PER_TASK + 3) / 4.0)
+        self.assertEquals(kwargs['failed'], expected_fails)
+        self.assertEquals(kwargs['succeeded'], settings.BULK_EMAIL_EMAILS_PER_TASK - expected_fails)
 
     @patch('bulk_email.tasks.get_connection', autospec=True)
-    @patch('bulk_email.tasks.course_email.retry')
+    @patch('bulk_email.tasks.send_course_email.retry')
     def test_disconn_err_retry(self, retry, get_conn):
         """
         Test that celery handles SMTPServerDisconnected by retrying.
@@ -110,10 +115,10 @@ class TestEmailErrors(ModuleStoreTestCase):
         self.assertTrue(retry.called)
         (_, kwargs) = retry.call_args
         exc = kwargs['exc']
-        self.assertTrue(type(exc) == SMTPServerDisconnected)
+        self.assertIsInstance(exc, SMTPServerDisconnected)
 
     @patch('bulk_email.tasks.get_connection', autospec=True)
-    @patch('bulk_email.tasks.course_email.retry')
+    @patch('bulk_email.tasks.send_course_email.retry')
     def test_conn_err_retry(self, retry, get_conn):
         """
         Test that celery handles SMTPConnectError by retrying.
@@ -131,69 +136,109 @@ class TestEmailErrors(ModuleStoreTestCase):
         self.assertTrue(retry.called)
         (_, kwargs) = retry.call_args
         exc = kwargs['exc']
-        self.assertTrue(type(exc) == SMTPConnectError)
+        self.assertIsInstance(exc, SMTPConnectError)
 
-    @patch('bulk_email.tasks.course_email_result')
-    @patch('bulk_email.tasks.course_email.retry')
+    @patch('bulk_email.tasks.increment_subtask_status')
     @patch('bulk_email.tasks.log')
-    @patch('bulk_email.tasks.get_connection', Mock(return_value=EmailTestException))
-    def test_general_exception(self, mock_log, retry, result):
-        """
-        Tests the if the error is not SMTP-related, we log and reraise
-        """
-        test_email = {
-            'action': 'Send email',
-            'to_option': 'myself',
-            'subject': 'test subject for myself',
-            'message': 'test message for myself'
-        }
-        # For some reason (probably the weirdness of testing with celery tasks) assertRaises doesn't work here
-        # so we assert on the arguments of log.exception
-        self.client.post(self.url, test_email)
-        ((log_str, email_id, to_list), _) = mock_log.exception.call_args
-        self.assertTrue(mock_log.exception.called)
-        self.assertIn('caused course_email task to fail with uncaught exception.', log_str)
-        self.assertEqual(email_id, 1)
-        self.assertEqual(to_list, [self.instructor.email])
-        self.assertFalse(retry.called)
-        self.assertFalse(result.called)
-
-    @patch('bulk_email.tasks.course_email_result')
-    @patch('bulk_email.tasks.delegate_email_batches.retry')
-    @patch('bulk_email.tasks.log')
-    def test_nonexist_email(self, mock_log, retry, result):
+    def test_nonexistent_email(self, mock_log, result):
         """
         Tests retries when the email doesn't exist
         """
-        delegate_email_batches.delay(-1, self.instructor.id)
-        ((log_str, email_id, _num_retries), _) = mock_log.warning.call_args
+        # create an InstructorTask object to pass through
+        course_id = self.course.id
+        entry = InstructorTask.create(course_id, "task_type", "task_key", "task_input", self.instructor)
+        task_input = {"email_id": -1}
+        with self.assertRaises(CourseEmail.DoesNotExist):
+            perform_delegate_email_batches(entry.id, course_id, task_input, "action_name")  # pylint: disable=E1101
+        ((log_str, _, email_id), _) = mock_log.warning.call_args
         self.assertTrue(mock_log.warning.called)
         self.assertIn('Failed to get CourseEmail with id', log_str)
         self.assertEqual(email_id, -1)
-        self.assertTrue(retry.called)
         self.assertFalse(result.called)
 
-    @patch('bulk_email.tasks.log')
-    def test_nonexist_course(self, mock_log):
+    def test_nonexistent_course(self):
         """
         Tests exception when the course in the email doesn't exist
         """
-        email = CourseEmail(course_id="I/DONT/EXIST")
+        course_id = "I/DONT/EXIST"
+        email = CourseEmail(course_id=course_id)
         email.save()
-        delegate_email_batches.delay(email.id, self.instructor.id)
-        ((log_str, _), _) = mock_log.exception.call_args
-        self.assertTrue(mock_log.exception.called)
-        self.assertIn('get_course_by_id failed:', log_str)
+        entry = InstructorTask.create(course_id, "task_type", "task_key", "task_input", self.instructor)
+        task_input = {"email_id": email.id}  # pylint: disable=E1101
+        with self.assertRaisesRegexp(ValueError, "Course not found"):
+            perform_delegate_email_batches(entry.id, course_id, task_input, "action_name")  # pylint: disable=E1101
 
-    @patch('bulk_email.tasks.log')
-    def test_nonexist_to_option(self, mock_log):
+    def test_nonexistent_to_option(self):
         """
         Tests exception when the to_option in the email doesn't exist
         """
         email = CourseEmail(course_id=self.course.id, to_option="IDONTEXIST")
         email.save()
-        delegate_email_batches.delay(email.id, self.instructor.id)
-        ((log_str, opt_str), _) = mock_log.error.call_args
-        self.assertTrue(mock_log.error.called)
-        self.assertIn('Unexpected bulk email TO_OPTION found', log_str)
-        self.assertEqual("IDONTEXIST", opt_str)
+        entry = InstructorTask.create(self.course.id, "task_type", "task_key", "task_input", self.instructor)
+        task_input = {"email_id": email.id}  # pylint: disable=E1101
+        with self.assertRaisesRegexp(Exception, 'Unexpected bulk email TO_OPTION found: IDONTEXIST'):
+            perform_delegate_email_batches(entry.id, self.course.id, task_input, "action_name")  # pylint: disable=E1101
+
+    def test_wrong_course_id_in_task(self):
+        """
+        Tests exception when the course_id in task is not the same as one explicitly passed in.
+        """
+        email = CourseEmail(course_id=self.course.id, to_option=SEND_TO_ALL)
+        email.save()
+        entry = InstructorTask.create("bogus_task_id", "task_type", "task_key", "task_input", self.instructor)
+        task_input = {"email_id": email.id}  # pylint: disable=E1101
+        with self.assertRaisesRegexp(ValueError, 'does not match task value'):
+            perform_delegate_email_batches(entry.id, self.course.id, task_input, "action_name")  # pylint: disable=E1101
+
+    def test_wrong_course_id_in_email(self):
+        """
+        Tests exception when the course_id in CourseEmail is not the same as one explicitly passed in.
+        """
+        email = CourseEmail(course_id="bogus_course_id", to_option=SEND_TO_ALL)
+        email.save()
+        entry = InstructorTask.create(self.course.id, "task_type", "task_key", "task_input", self.instructor)
+        task_input = {"email_id": email.id}  # pylint: disable=E1101
+        with self.assertRaisesRegexp(ValueError, 'does not match email value'):
+            perform_delegate_email_batches(entry.id, self.course.id, task_input, "action_name")  # pylint: disable=E1101
+
+    def test_send_email_undefined_subtask(self):
+        # test at a lower level, to ensure that the course gets checked down below too.
+        entry = InstructorTask.create(self.course.id, "task_type", "task_key", "task_input", self.instructor)
+        entry_id = entry.id  # pylint: disable=E1101
+        to_list = ['test@test.com']
+        global_email_context = {'course_title': 'dummy course'}
+        subtask_id = "subtask-id-value"
+        subtask_status = create_subtask_status(subtask_id)
+        email_id = 1001
+        with self.assertRaisesRegexp(ValueError, 'unable to find email subtasks of instructor task'):
+            send_course_email(entry_id, email_id, to_list, global_email_context, subtask_status)
+
+    def test_send_email_missing_subtask(self):
+        # test at a lower level, to ensure that the course gets checked down below too.
+        entry = InstructorTask.create(self.course.id, "task_type", "task_key", "task_input", self.instructor)
+        entry_id = entry.id  # pylint: disable=E1101
+        to_list = ['test@test.com']
+        global_email_context = {'course_title': 'dummy course'}
+        subtask_id = "subtask-id-value"
+        initialize_subtask_info(entry, "emailed", 100, [subtask_id])
+        different_subtask_id = "bogus-subtask-id-value"
+        subtask_status = create_subtask_status(different_subtask_id)
+        bogus_email_id = 1001
+        with self.assertRaisesRegexp(ValueError, 'unable to find status for email subtask of instructor task'):
+            send_course_email(entry_id, bogus_email_id, to_list, global_email_context, subtask_status)
+
+    def dont_test_send_email_undefined_email(self):
+        # test at a lower level, to ensure that the course gets checked down below too.
+        entry = InstructorTask.create(self.course.id, "task_type", "task_key", "task_input", self.instructor)
+        entry_id = entry.id  # pylint: disable=E1101
+        to_list = ['test@test.com']
+        global_email_context = {'course_title': 'dummy course'}
+        subtask_id = "subtask-id-value"
+        initialize_subtask_info(entry, "emailed", 100, [subtask_id])
+        subtask_status = create_subtask_status(subtask_id)
+        bogus_email_id = 1001
+        with self.assertRaises(CourseEmail.DoesNotExist):
+            # we skip the call that updates subtask status, since we've not set up the InstructorTask
+            # for the subtask, and it's not important to the test.
+            with patch('bulk_email.tasks.update_subtask_status'):
+                send_course_email(entry_id, bogus_email_id, to_list, global_email_context, subtask_status)
diff --git a/lms/djangoapps/bulk_email/tests/test_forms.py b/lms/djangoapps/bulk_email/tests/test_forms.py
new file mode 100644
index 0000000000..60a8abf95e
--- /dev/null
+++ b/lms/djangoapps/bulk_email/tests/test_forms.py
@@ -0,0 +1,105 @@
+"""
+Unit tests for bulk-email-related forms.
+"""
+from django.test.utils import override_settings
+from django.conf import settings
+
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
+from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
+from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore import MONGO_MODULESTORE_TYPE
+
+from mock import patch
+
+from bulk_email.models import CourseAuthorization
+from bulk_email.forms import CourseAuthorizationAdminForm
+
+
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
+class CourseAuthorizationFormTest(ModuleStoreTestCase):
+    """Test the CourseAuthorizationAdminForm form for Mongo-backed courses."""
+
+    def setUp(self):
+        # Make a mongo course
+        self.course = CourseFactory.create()
+
+    def tearDown(self):
+        """
+        Undo all patches.
+        """
+        patch.stopall()
+
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': True})
+    def test_authorize_mongo_course(self):
+        # Initially course shouldn't be authorized
+        self.assertFalse(CourseAuthorization.instructor_email_enabled(self.course.id))
+        # Test authorizing the course, which should totally work
+        form_data = {'course_id': self.course.id, 'email_enabled': True}
+        form = CourseAuthorizationAdminForm(data=form_data)
+        # Validation should work
+        self.assertTrue(form.is_valid())
+        form.save()
+        # Check that this course is authorized
+        self.assertTrue(CourseAuthorization.instructor_email_enabled(self.course.id))
+
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': True})
+    def test_form_typo(self):
+        # Munge course id
+        bad_id = self.course.id + '_typo'
+
+        form_data = {'course_id': bad_id, 'email_enabled': True}
+        form = CourseAuthorizationAdminForm(data=form_data)
+        # Validation shouldn't work
+        self.assertFalse(form.is_valid())
+
+        msg = u'Error encountered (Course not found.)'
+        msg += ' --- Entered course id was: "{0}". '.format(bad_id)
+        msg += 'Please recheck that you have supplied a course id in the format: ORG/COURSE/RUN'
+        self.assertEquals(msg, form._errors['course_id'][0])  # pylint: disable=protected-access
+
+        with self.assertRaisesRegexp(ValueError, "The CourseAuthorization could not be created because the data didn't validate."):
+            form.save()
+
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': True})
+    def test_course_name_only(self):
+        # Munge course id - common
+        bad_id = self.course.id.split('/')[-1]
+
+        form_data = {'course_id': bad_id, 'email_enabled': True}
+        form = CourseAuthorizationAdminForm(data=form_data)
+        # Validation shouldn't work
+        self.assertFalse(form.is_valid())
+
+        msg = u'Error encountered (Need more than 1 value to unpack)'
+        msg += ' --- Entered course id was: "{0}". '.format(bad_id)
+        msg += 'Please recheck that you have supplied a course id in the format: ORG/COURSE/RUN'
+        self.assertEquals(msg, form._errors['course_id'][0])  # pylint: disable=protected-access
+
+        with self.assertRaisesRegexp(ValueError, "The CourseAuthorization could not be created because the data didn't validate."):
+            form.save()
+
+
+@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+class CourseAuthorizationXMLFormTest(ModuleStoreTestCase):
+    """Check that XML courses cannot be authorized for email."""
+
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': True})
+    def test_xml_course_authorization(self):
+        course_id = 'edX/toy/2012_Fall'
+        # Assert this is an XML course
+        self.assertTrue(modulestore().get_modulestore_type(course_id) != MONGO_MODULESTORE_TYPE)
+
+        form_data = {'course_id': course_id, 'email_enabled': True}
+        form = CourseAuthorizationAdminForm(data=form_data)
+        # Validation shouldn't work
+        self.assertFalse(form.is_valid())
+
+        msg = u"Course Email feature is only available for courses authored in Studio. "
+        msg += '"{0}" appears to be an XML backed course.'.format(course_id)
+        self.assertEquals(msg, form._errors['course_id'][0])  # pylint: disable=protected-access
+
+        with self.assertRaisesRegexp(ValueError, "The CourseAuthorization could not be created because the data didn't validate."):
+            form.save()
diff --git a/lms/djangoapps/bulk_email/tests/test_models.py b/lms/djangoapps/bulk_email/tests/test_models.py
new file mode 100644
index 0000000000..30713e178c
--- /dev/null
+++ b/lms/djangoapps/bulk_email/tests/test_models.py
@@ -0,0 +1,147 @@
+"""
+Unit tests for bulk-email-related models.
+"""
+from django.test import TestCase
+from django.core.management import call_command
+from django.conf import settings
+
+from student.tests.factories import UserFactory
+
+from mock import patch
+
+from bulk_email.models import CourseEmail, SEND_TO_STAFF, CourseEmailTemplate, CourseAuthorization
+
+
+class CourseEmailTest(TestCase):
+    """Test the CourseEmail model."""
+
+    def test_creation(self):
+        course_id = 'abc/123/doremi'
+        sender = UserFactory.create()
+        to_option = SEND_TO_STAFF
+        subject = "dummy subject"
+        html_message = "<html>dummy message</html>"
+        email = CourseEmail.create(course_id, sender, to_option, subject, html_message)
+        self.assertEquals(email.course_id, course_id)
+        self.assertEquals(email.to_option, SEND_TO_STAFF)
+        self.assertEquals(email.subject, subject)
+        self.assertEquals(email.html_message, html_message)
+        self.assertEquals(email.sender, sender)
+
+    def test_bad_to_option(self):
+        course_id = 'abc/123/doremi'
+        sender = UserFactory.create()
+        to_option = "fake"
+        subject = "dummy subject"
+        html_message = "<html>dummy message</html>"
+        with self.assertRaises(ValueError):
+            CourseEmail.create(course_id, sender, to_option, subject, html_message)
+
+
+class NoCourseEmailTemplateTest(TestCase):
+    """Test the CourseEmailTemplate model without loading the template data."""
+
+    def test_get_missing_template(self):
+        with self.assertRaises(CourseEmailTemplate.DoesNotExist):
+            CourseEmailTemplate.get_template()
+
+
+class CourseEmailTemplateTest(TestCase):
+    """Test the CourseEmailTemplate model."""
+
+    def setUp(self):
+        # load initial content (since we don't run migrations as part of tests):
+        call_command("loaddata", "course_email_template.json")
+
+    def _get_sample_plain_context(self):
+        """Provide sample context sufficient for rendering plaintext template"""
+        context = {
+            'course_title': "Bogus Course Title",
+            'course_url': "/location/of/course/url",
+            'account_settings_url': "/location/of/account/settings/url",
+            'platform_name': 'edX',
+            'email': 'your-email@test.com',
+        }
+        return context
+
+    def _get_sample_html_context(self):
+        """Provide sample context sufficient for rendering HTML template"""
+        context = self._get_sample_plain_context()
+        context['course_image_url'] = "/location/of/course/image/url"
+        return context
+
+    def test_get_template(self):
+        template = CourseEmailTemplate.get_template()
+        self.assertIsNotNone(template.html_template)
+        self.assertIsNotNone(template.plain_template)
+
+    def test_render_html_without_context(self):
+        template = CourseEmailTemplate.get_template()
+        base_context = self._get_sample_html_context()
+        for keyname in base_context:
+            context = dict(base_context)
+            del context[keyname]
+            with self.assertRaises(KeyError):
+                template.render_htmltext("My new html text.", context)
+
+    def test_render_plaintext_without_context(self):
+        template = CourseEmailTemplate.get_template()
+        base_context = self._get_sample_plain_context()
+        for keyname in base_context:
+            context = dict(base_context)
+            del context[keyname]
+            with self.assertRaises(KeyError):
+                template.render_plaintext("My new plain text.", context)
+
+    def test_render_html(self):
+        template = CourseEmailTemplate.get_template()
+        context = self._get_sample_html_context()
+        template.render_htmltext("My new html text.", context)
+
+    def test_render_plain(self):
+        template = CourseEmailTemplate.get_template()
+        context = self._get_sample_plain_context()
+        template.render_plaintext("My new plain text.", context)
+
+
+class CourseAuthorizationTest(TestCase):
+    """Test the CourseAuthorization model."""
+
+    @patch.dict(settings.MITX_FEATURES, {'REQUIRE_COURSE_EMAIL_AUTH': True})
+    def test_creation_auth_on(self):
+        course_id = 'abc/123/doremi'
+        # Test that course is not authorized by default
+        self.assertFalse(CourseAuthorization.instructor_email_enabled(course_id))
+
+        # Authorize
+        cauth = CourseAuthorization(course_id=course_id, email_enabled=True)
+        cauth.save()
+        # Now, course should be authorized
+        self.assertTrue(CourseAuthorization.instructor_email_enabled(course_id))
+        self.assertEquals(
+            cauth.__unicode__(),
+            "Course 'abc/123/doremi': Instructor Email Enabled"
+        )
+
+        # Unauthorize by explicitly setting email_enabled to False
+        cauth.email_enabled = False
+        cauth.save()
+        # Test that course is now unauthorized
+        self.assertFalse(CourseAuthorization.instructor_email_enabled(course_id))
+        self.assertEquals(
+            cauth.__unicode__(),
+            "Course 'abc/123/doremi': Instructor Email Not Enabled"
+        )
+
+    @patch.dict(settings.MITX_FEATURES, {'REQUIRE_COURSE_EMAIL_AUTH': False})
+    def test_creation_auth_off(self):
+        course_id = 'blahx/blah101/ehhhhhhh'
+        # Test that course is authorized by default, since auth is turned off
+        self.assertTrue(CourseAuthorization.instructor_email_enabled(course_id))
+
+        # Use the admin interface to unauthorize the course
+        cauth = CourseAuthorization(course_id=course_id, email_enabled=False)
+        cauth.save()
+
+        # Now, course should STILL be authorized!
+        self.assertTrue(CourseAuthorization.instructor_email_enabled(course_id))
diff --git a/lms/djangoapps/bulk_email/tests/test_tasks.py b/lms/djangoapps/bulk_email/tests/test_tasks.py
new file mode 100644
index 0000000000..e49a04147a
--- /dev/null
+++ b/lms/djangoapps/bulk_email/tests/test_tasks.py
@@ -0,0 +1,398 @@
+"""
+Unit tests for LMS instructor-initiated background tasks.
+
+Runs tasks on answers to course problems to validate that code
+paths actually work.
+
+"""
+import json
+from uuid import uuid4
+from itertools import cycle, chain, repeat
+from mock import patch, Mock
+from smtplib import SMTPServerDisconnected, SMTPDataError, SMTPConnectError, SMTPAuthenticationError
+from boto.ses.exceptions import (
+    SESDailyQuotaExceededError,
+    SESMaxSendingRateExceededError,
+    SESAddressBlacklistedError,
+    SESIllegalAddressError,
+    SESLocalAddressCharacterError,
+)
+from boto.exception import AWSConnectionError
+
+from celery.states import SUCCESS, FAILURE
+
+from django.conf import settings
+from django.core.management import call_command
+
+from bulk_email.models import CourseEmail, Optout, SEND_TO_ALL
+
+from instructor_task.tasks import send_bulk_course_email
+from instructor_task.subtasks import update_subtask_status
+from instructor_task.models import InstructorTask
+from instructor_task.tests.test_base import InstructorTaskCourseTestCase
+from instructor_task.tests.factories import InstructorTaskFactory
+
+
+class TestTaskFailure(Exception):
+    """Dummy exception used for unit tests."""
+    pass
+
+
+def my_update_subtask_status(entry_id, current_task_id, new_subtask_status):
+    """
+    Check whether a subtask has been updated before really updating.
+
+    Check whether a subtask which has been retried
+    has had the retry already write its results here before the code
+    that was invoking the retry had a chance to update this status.
+
+    This is the norm in "eager" mode (used by tests) where the retry is called
+    and run to completion before control is returned to the code that
+    invoked the retry.  If the retries eventually end in failure (e.g. due to
+    a maximum number of retries being attempted), the "eager" code will return
+    the error for each retry as it is popped off the stack.  We want to just ignore
+    the later updates that are called as the result of the earlier retries.
+
+    This should not be an issue in production, where status is updated before
+    a task is retried, and is then updated afterwards if the retry fails.
+    """
+    entry = InstructorTask.objects.get(pk=entry_id)
+    subtask_dict = json.loads(entry.subtasks)
+    subtask_status_info = subtask_dict['status']
+    current_subtask_status = subtask_status_info[current_task_id]
+
+    def _get_retry_count(subtask_result):
+        """Return the number of retries counted for the given subtask."""
+        retry_count = subtask_result.get('retried_nomax', 0)
+        retry_count += subtask_result.get('retried_withmax', 0)
+        return retry_count
+
+    current_retry_count = _get_retry_count(current_subtask_status)
+    new_retry_count = _get_retry_count(new_subtask_status)
+    if current_retry_count <= new_retry_count:
+        update_subtask_status(entry_id, current_task_id, new_subtask_status)
+
+
+class TestBulkEmailInstructorTask(InstructorTaskCourseTestCase):
+    """Tests instructor task that send bulk email."""
+
+    def setUp(self):
+        super(TestBulkEmailInstructorTask, self).setUp()
+        self.initialize_course()
+        self.instructor = self.create_instructor('instructor')
+
+        # load initial content (since we don't run migrations as part of tests):
+        call_command("loaddata", "course_email_template.json")
+
+    def _create_input_entry(self, course_id=None):
+        """
+        Creates a InstructorTask entry for testing.
+
+        Overrides the base class version in that this creates CourseEmail.
+        """
+        to_option = SEND_TO_ALL
+        course_id = course_id or self.course.id
+        course_email = CourseEmail.create(course_id, self.instructor, to_option, "Test Subject", "<p>This is a test message</p>")
+        task_input = {'email_id': course_email.id}  # pylint: disable=E1101
+        task_id = str(uuid4())
+        instructor_task = InstructorTaskFactory.create(
+            course_id=course_id,
+            requester=self.instructor,
+            task_input=json.dumps(task_input),
+            task_key='dummy value',
+            task_id=task_id,
+        )
+        return instructor_task
+
+    def _run_task_with_mock_celery(self, task_class, entry_id, task_id):
+        """Submit a task and mock how celery provides a current_task."""
+        mock_current_task = Mock()
+        mock_current_task.max_retries = settings.BULK_EMAIL_MAX_RETRIES
+        mock_current_task.default_retry_delay = settings.BULK_EMAIL_DEFAULT_RETRY_DELAY
+        task_args = [entry_id, {}]
+
+        with patch('bulk_email.tasks._get_current_task') as mock_get_task:
+            mock_get_task.return_value = mock_current_task
+            return task_class.apply(task_args, task_id=task_id).get()
+
+    def test_email_missing_current_task(self):
+        task_entry = self._create_input_entry()
+        with self.assertRaises(ValueError):
+            send_bulk_course_email(task_entry.id, {})
+
+    def test_email_undefined_course(self):
+        # Check that we fail when passing in a course that doesn't exist.
+        task_entry = self._create_input_entry(course_id="bogus/course/id")
+        with self.assertRaises(ValueError):
+            self._run_task_with_mock_celery(send_bulk_course_email, task_entry.id, task_entry.task_id)
+
+    def test_bad_task_id_on_update(self):
+        task_entry = self._create_input_entry()
+
+        def dummy_update_subtask_status(entry_id, _current_task_id, new_subtask_status):
+            """Passes a bad value for task_id to test update_subtask_status"""
+            bogus_task_id = "this-is-bogus"
+            update_subtask_status(entry_id, bogus_task_id, new_subtask_status)
+
+        with self.assertRaises(ValueError):
+            with patch('bulk_email.tasks.update_subtask_status', dummy_update_subtask_status):
+                send_bulk_course_email(task_entry.id, {})  # pylint: disable=E1101
+
+    def _create_students(self, num_students):
+        """Create students for testing"""
+        return [self.create_student('robot%d' % i) for i in xrange(num_students)]
+
+    def _assert_single_subtask_status(self, entry, succeeded, failed=0, skipped=0, retried_nomax=0, retried_withmax=0):
+        """Compare counts with 'subtasks' entry in InstructorTask table."""
+        subtask_info = json.loads(entry.subtasks)
+        # verify subtask-level counts:
+        self.assertEquals(subtask_info.get('total'), 1)
+        self.assertEquals(subtask_info.get('succeeded'), 1 if succeeded > 0 else 0)
+        self.assertEquals(subtask_info.get('failed'), 0 if succeeded > 0 else 1)
+        # verify individual subtask status:
+        subtask_status_info = subtask_info.get('status')
+        task_id_list = subtask_status_info.keys()
+        self.assertEquals(len(task_id_list), 1)
+        task_id = task_id_list[0]
+        subtask_status = subtask_status_info.get(task_id)
+        print("Testing subtask status: {}".format(subtask_status))
+        self.assertEquals(subtask_status.get('task_id'), task_id)
+        self.assertEquals(subtask_status.get('attempted'), succeeded + failed)
+        self.assertEquals(subtask_status.get('succeeded'), succeeded)
+        self.assertEquals(subtask_status.get('skipped'), skipped)
+        self.assertEquals(subtask_status.get('failed'), failed)
+        self.assertEquals(subtask_status.get('retried_nomax'), retried_nomax)
+        self.assertEquals(subtask_status.get('retried_withmax'), retried_withmax)
+        self.assertEquals(subtask_status.get('state'), SUCCESS if succeeded > 0 else FAILURE)
+
+    def _test_run_with_task(self, task_class, action_name, total, succeeded, failed=0, skipped=0, retried_nomax=0, retried_withmax=0):
+        """Run a task and check the number of emails processed."""
+        task_entry = self._create_input_entry()
+        parent_status = self._run_task_with_mock_celery(task_class, task_entry.id, task_entry.task_id)
+
+        # check return value
+        self.assertEquals(parent_status.get('total'), total)
+        self.assertEquals(parent_status.get('action_name'), action_name)
+
+        # compare with task_output entry in InstructorTask table:
+        entry = InstructorTask.objects.get(id=task_entry.id)
+        status = json.loads(entry.task_output)
+        self.assertEquals(status.get('attempted'), succeeded + failed)
+        self.assertEquals(status.get('succeeded'), succeeded)
+        self.assertEquals(status.get('skipped'), skipped)
+        self.assertEquals(status.get('failed'), failed)
+        self.assertEquals(status.get('total'), total)
+        self.assertEquals(status.get('action_name'), action_name)
+        self.assertGreater(status.get('duration_ms'), 0)
+        self.assertEquals(entry.task_state, SUCCESS)
+        self._assert_single_subtask_status(entry, succeeded, failed, skipped, retried_nomax, retried_withmax)
+        return entry
+
+    def test_successful(self):
+        # Select number of emails to fit into a single subtask.
+        num_emails = settings.BULK_EMAIL_EMAILS_PER_TASK
+        # We also send email to the instructor:
+        self._create_students(num_emails - 1)
+        with patch('bulk_email.tasks.get_connection', autospec=True) as get_conn:
+            get_conn.return_value.send_messages.side_effect = cycle([None])
+            self._test_run_with_task(send_bulk_course_email, 'emailed', num_emails, num_emails)
+
+    def test_successful_twice(self):
+        # Select number of emails to fit into a single subtask.
+        num_emails = settings.BULK_EMAIL_EMAILS_PER_TASK
+        # We also send email to the instructor:
+        self._create_students(num_emails - 1)
+        with patch('bulk_email.tasks.get_connection', autospec=True) as get_conn:
+            get_conn.return_value.send_messages.side_effect = cycle([None])
+            task_entry = self._test_run_with_task(send_bulk_course_email, 'emailed', num_emails, num_emails)
+
+        # submit the same task a second time, and confirm that it is not run again.
+        with patch('bulk_email.tasks.get_connection', autospec=True) as get_conn:
+            get_conn.return_value.send_messages.side_effect = cycle([Exception("This should not happen!")])
+            parent_status = self._run_task_with_mock_celery(send_bulk_course_email, task_entry.id, task_entry.task_id)
+        self.assertEquals(parent_status.get('total'), num_emails)
+        self.assertEquals(parent_status.get('succeeded'), num_emails)
+        self.assertEquals(parent_status.get('failed'), 0)
+
+    def test_unactivated_user(self):
+        # Select number of emails to fit into a single subtask.
+        num_emails = settings.BULK_EMAIL_EMAILS_PER_TASK
+        # We also send email to the instructor:
+        students = self._create_students(num_emails - 1)
+        # mark a student as not yet having activated their email:
+        student = students[0]
+        student.is_active = False
+        student.save()
+        with patch('bulk_email.tasks.get_connection', autospec=True) as get_conn:
+            get_conn.return_value.send_messages.side_effect = cycle([None])
+            self._test_run_with_task(send_bulk_course_email, 'emailed', num_emails - 1, num_emails - 1)
+
+    def test_skipped(self):
+        # Select number of emails to fit into a single subtask.
+        num_emails = settings.BULK_EMAIL_EMAILS_PER_TASK
+        # We also send email to the instructor:
+        students = self._create_students(num_emails - 1)
+        # have every fourth student optout:
+        expected_skipped = int((num_emails + 3) / 4.0)
+        expected_succeeds = num_emails - expected_skipped
+        for index in range(0, num_emails, 4):
+            Optout.objects.create(user=students[index], course_id=self.course.id)
+        # mark some students as opting out
+        with patch('bulk_email.tasks.get_connection', autospec=True) as get_conn:
+            get_conn.return_value.send_messages.side_effect = cycle([None])
+            self._test_run_with_task(send_bulk_course_email, 'emailed', num_emails, expected_succeeds, skipped=expected_skipped)
+
+    def _test_email_address_failures(self, exception):
+        """Test that celery handles bad address errors by failing and not retrying."""
+        # Select number of emails to fit into a single subtask.
+        num_emails = settings.BULK_EMAIL_EMAILS_PER_TASK
+        # We also send email to the instructor:
+        self._create_students(num_emails - 1)
+        expected_fails = int((num_emails + 3) / 4.0)
+        expected_succeeds = num_emails - expected_fails
+        with patch('bulk_email.tasks.get_connection', autospec=True) as get_conn:
+            # have every fourth email fail due to some address failure:
+            get_conn.return_value.send_messages.side_effect = cycle([exception, None, None, None])
+            self._test_run_with_task(send_bulk_course_email, 'emailed', num_emails, expected_succeeds, failed=expected_fails)
+
+    def test_smtp_blacklisted_user(self):
+        # Test that celery handles permanent SMTPDataErrors by failing and not retrying.
+        self._test_email_address_failures(SMTPDataError(554, "Email address is blacklisted"))
+
+    def test_ses_blacklisted_user(self):
+        # Test that celery handles permanent SMTPDataErrors by failing and not retrying.
+        self._test_email_address_failures(SESAddressBlacklistedError(554, "Email address is blacklisted"))
+
+    def test_ses_illegal_address(self):
+        # Test that celery handles permanent SMTPDataErrors by failing and not retrying.
+        self._test_email_address_failures(SESIllegalAddressError(554, "Email address is illegal"))
+
+    def test_ses_local_address_character_error(self):
+        # Test that celery handles permanent SMTPDataErrors by failing and not retrying.
+        self._test_email_address_failures(SESLocalAddressCharacterError(554, "Email address contains a bad character"))
+
+    def _test_retry_after_limited_retry_error(self, exception):
+        """Test that celery handles connection failures by retrying."""
+        # If we want the batch to succeed, we need to send fewer emails
+        # than the max retries, so that the max is not triggered.
+        num_emails = settings.BULK_EMAIL_MAX_RETRIES
+        # We also send email to the instructor:
+        self._create_students(num_emails - 1)
+        expected_fails = 0
+        expected_succeeds = num_emails
+        with patch('bulk_email.tasks.get_connection', autospec=True) as get_conn:
+            # Have every other mail attempt fail due to disconnection.
+            get_conn.return_value.send_messages.side_effect = cycle([exception, None])
+            self._test_run_with_task(
+                send_bulk_course_email,
+                'emailed',
+                num_emails,
+                expected_succeeds,
+                failed=expected_fails,
+                retried_withmax=num_emails
+            )
+
+    def _test_max_retry_limit_causes_failure(self, exception):
+        """Test that celery can hit a maximum number of retries."""
+        # Doesn't really matter how many recipients, since we expect
+        # to fail on the first.
+        num_emails = 10
+        # We also send email to the instructor:
+        self._create_students(num_emails - 1)
+        expected_fails = num_emails
+        expected_succeeds = 0
+        with patch('bulk_email.tasks.get_connection', autospec=True) as get_conn:
+            # always fail to connect, triggering repeated retries until limit is hit:
+            get_conn.return_value.send_messages.side_effect = cycle([exception])
+            with patch('bulk_email.tasks.update_subtask_status', my_update_subtask_status):
+                self._test_run_with_task(
+                    send_bulk_course_email,
+                    'emailed',
+                    num_emails,
+                    expected_succeeds,
+                    failed=expected_fails,
+                    retried_withmax=(settings.BULK_EMAIL_MAX_RETRIES + 1)
+                )
+
+    def test_retry_after_smtp_disconnect(self):
+        self._test_retry_after_limited_retry_error(SMTPServerDisconnected(425, "Disconnecting"))
+
+    def test_max_retry_after_smtp_disconnect(self):
+        self._test_max_retry_limit_causes_failure(SMTPServerDisconnected(425, "Disconnecting"))
+
+    def test_retry_after_smtp_connect_error(self):
+        self._test_retry_after_limited_retry_error(SMTPConnectError(424, "Bad Connection"))
+
+    def test_max_retry_after_smtp_connect_error(self):
+        self._test_max_retry_limit_causes_failure(SMTPConnectError(424, "Bad Connection"))
+
+    def test_retry_after_aws_connect_error(self):
+        self._test_retry_after_limited_retry_error(AWSConnectionError("Unable to provide secure connection through proxy"))
+
+    def test_max_retry_after_aws_connect_error(self):
+        self._test_max_retry_limit_causes_failure(AWSConnectionError("Unable to provide secure connection through proxy"))
+
+    def test_retry_after_general_error(self):
+        self._test_retry_after_limited_retry_error(Exception("This is some random exception."))
+
+    def test_max_retry_after_general_error(self):
+        self._test_max_retry_limit_causes_failure(Exception("This is some random exception."))
+
+    def _test_retry_after_unlimited_retry_error(self, exception):
+        """Test that celery handles throttling failures by retrying."""
+        num_emails = 8
+        # We also send email to the instructor:
+        self._create_students(num_emails - 1)
+        expected_fails = 0
+        expected_succeeds = num_emails
+        # Note that because celery in eager mode will call retries synchronously,
+        # each retry will increase the stack depth.  It turns out that there is a
+        # maximum depth at which a RuntimeError is raised ("maximum recursion depth
+        # exceeded").  The maximum recursion depth is 90, so
+        # num_emails * expected_retries < 90.
+        expected_retries = 10
+        with patch('bulk_email.tasks.get_connection', autospec=True) as get_conn:
+            # Cycle through N throttling errors followed by a success.
+            get_conn.return_value.send_messages.side_effect = cycle(
+                chain(repeat(exception, expected_retries), [None])
+            )
+            self._test_run_with_task(
+                send_bulk_course_email,
+                'emailed',
+                num_emails,
+                expected_succeeds,
+                failed=expected_fails,
+                retried_nomax=(expected_retries * num_emails)
+            )
+
+    def test_retry_after_smtp_throttling_error(self):
+        self._test_retry_after_unlimited_retry_error(SMTPDataError(455, "Throttling: Sending rate exceeded"))
+
+    def test_retry_after_ses_throttling_error(self):
+        self._test_retry_after_unlimited_retry_error(SESMaxSendingRateExceededError(455, "Throttling: Sending rate exceeded"))
+
+    def _test_immediate_failure(self, exception):
+        """Test that celery can hit a maximum number of retries."""
+        # Doesn't really matter how many recipients, since we expect
+        # to fail on the first.
+        num_emails = 10
+        # We also send email to the instructor:
+        self._create_students(num_emails - 1)
+        expected_fails = num_emails
+        expected_succeeds = 0
+        with patch('bulk_email.tasks.get_connection', autospec=True) as get_conn:
+            # always fail to connect, triggering repeated retries until limit is hit:
+            get_conn.return_value.send_messages.side_effect = cycle([exception])
+            self._test_run_with_task(
+                send_bulk_course_email,
+                'emailed',
+                num_emails,
+                expected_succeeds,
+                failed=expected_fails,
+            )
+
+    def test_failure_on_unhandled_smtp(self):
+        self._test_immediate_failure(SMTPAuthenticationError(403, "That password doesn't work!"))
+
+    def test_failure_on_ses_quota_exceeded(self):
+        self._test_immediate_failure(SESDailyQuotaExceededError(403, "You're done for the day!"))
diff --git a/lms/djangoapps/certificates/queue.py b/lms/djangoapps/certificates/queue.py
index bc7bbc0e86..1628fee337 100644
--- a/lms/djangoapps/certificates/queue.py
+++ b/lms/djangoapps/certificates/queue.py
@@ -192,6 +192,7 @@ class XQueueCertInterface(object):
                         'username': student.username,
                         'course_id': course_id,
                         'name': profile.name,
+                        'grade': grade['grade'],
                     }
                     cert.status = status.generating
                     cert.save()
diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py
index 78e1d51cbc..aa6e7214d4 100644
--- a/lms/djangoapps/courseware/courses.py
+++ b/lms/djangoapps/courseware/courses.py
@@ -36,11 +36,31 @@ def get_request_for_thread():
         del frame
 
 
+def get_course(course_id, depth=0):
+    """
+    Given a course id, return the corresponding course descriptor.
+
+    If course_id is not valid, raises a ValueError.  This is appropriate
+    for internal use.
+
+    depth: The number of levels of children for the modulestore to cache.
+    None means infinite depth.  Default is to fetch no children.
+    """
+    try:
+        course_loc = CourseDescriptor.id_to_location(course_id)
+        return modulestore().get_instance(course_id, course_loc, depth=depth)
+    except (KeyError, ItemNotFoundError):
+        raise ValueError("Course not found: {}".format(course_id))
+    except InvalidLocationError:
+        raise ValueError("Invalid location: {}".format(course_id))
+
+
 def get_course_by_id(course_id, depth=0):
     """
     Given a course id, return the corresponding course descriptor.
 
     If course_id is not valid, raises a 404.
+
     depth: The number of levels of children for the modulestore to cache. None means infinite depth
     """
     try:
@@ -51,6 +71,7 @@ def get_course_by_id(course_id, depth=0):
     except InvalidLocationError:
         raise Http404("Invalid location")
 
+
 def get_course_with_access(user, course_id, action, depth=0):
     """
     Given a course_id, look up the corresponding course descriptor,
@@ -164,7 +185,7 @@ def get_course_about_section(course, section_key):
             html = ''
 
             if about_module is not None:
-                html = about_module.runtime.render(about_module, None, 'student_view').content
+                html = about_module.render('student_view').content
 
             return html
 
@@ -182,7 +203,6 @@ def get_course_about_section(course, section_key):
     raise KeyError("Invalid about key " + str(section_key))
 
 
-
 def get_course_info_section(request, course, section_key):
     """
     This returns the snippet of html to be rendered on the course info page,
@@ -194,8 +214,6 @@ def get_course_info_section(request, course, section_key):
     - updates
     - guest_updates
     """
-
-
     loc = Location(course.location.tag, course.location.org, course.location.course, 'course_info', section_key)
 
     # Use an empty cache
@@ -213,7 +231,7 @@ def get_course_info_section(request, course, section_key):
     html = ''
 
     if info_module is not None:
-        html = info_module.runtime.render(info_module, None, 'student_view').content
+        html = info_module.render('student_view').content
 
     return html
 
diff --git a/lms/djangoapps/courseware/features/events.feature b/lms/djangoapps/courseware/features/events.feature
new file mode 100644
index 0000000000..3ffe817ca6
--- /dev/null
+++ b/lms/djangoapps/courseware/features/events.feature
@@ -0,0 +1,14 @@
+@shard_2
+Feature: LMS.Events
+  As a researcher, I want to be able to track events in the LMS
+
+  Scenario Outline: An event is emitted for each request
+    Given: I am registered for the course "6.002x"
+    And I visit the url "<url>"
+    Then a "<url>" server event is emitted
+
+  Examples:
+    | url                                        |
+    | /dashboard                                 |
+    | /courses/edx/6.002x/Test_Course/info       |
+    | /courses/edx/6.002x/Test_Course/courseware |
diff --git a/lms/djangoapps/courseware/features/events.py b/lms/djangoapps/courseware/features/events.py
new file mode 100644
index 0000000000..6fa1d5d190
--- /dev/null
+++ b/lms/djangoapps/courseware/features/events.py
@@ -0,0 +1,62 @@
+#pylint: disable=C0111
+
+from lettuce import step
+from lettuce import world
+from lettuce import before
+from pymongo import MongoClient
+from nose.tools import assert_equals
+from nose.tools import assert_in
+
+
+@before.all
+def connect_to_mongodb():
+    world.mongo_client = MongoClient()
+    world.event_collection = world.mongo_client['track']['events']
+
+
+@before.each_scenario
+def reset_captured_events(_scenario):
+    world.event_collection.drop()
+
+
+@before.outline
+def reset_between_outline_scenarios(_scenario, order, outline, reasons_to_fail):
+    world.event_collection.drop()
+
+
+@step('[aA]n? "(.*)" (server|browser) event is emitted')
+def event_is_emitted(_step, event_type, event_source):
+
+    # Ensure all events are written out to mongo before querying.
+    world.mongo_client.fsync()
+
+    # Note that splinter makes 2 requests when you call browser.visit('/foo')
+    # the first just checks to see if the server responds with a status
+    # code of 200, the next actually uses the browser to submit the request.
+    # We filter out events associated with the status code checks by ignoring
+    # events that come directly from splinter.
+    criteria = {
+        'event_type': event_type,
+        'event_source': event_source,
+        'agent': {
+            '$ne': 'python/splinter'
+        }
+    }
+    cursor = world.event_collection.find(criteria)
+    assert_equals(cursor.count(), 1)
+
+    event = cursor.next()
+
+    # These fields should be present in the event, but we won't bother
+    # validating them since it is difficult to predict their values.
+    for expected_field in ['host', 'time', 'agent', 'ip', 'event_source', 'event', 'page']:
+        assert_in(expected_field, event, msg='Expected field {} not found in event'.format(expected_field))
+
+    expected_field_values = {
+        "username": world.scenario_dict['USER'].username,
+        "event_type": event_type,
+    }
+    for key, value in expected_field_values.iteritems():
+        assert_equals(event[key], value)
+
+    # Note that the event may contain other fields, which is fine!
diff --git a/lms/djangoapps/courseware/features/lti.feature b/lms/djangoapps/courseware/features/lti.feature
index a7182a3dae..8255e515b0 100644
--- a/lms/djangoapps/courseware/features/lti.feature
+++ b/lms/djangoapps/courseware/features/lti.feature
@@ -2,17 +2,27 @@
 Feature: LMS.LTI component
   As a student, I want to view LTI component in LMS.
 
-  Scenario: LTI component in LMS is not rendered
+  Scenario: LTI component in LMS with no launch_url is not rendered
   Given the course has correct LTI credentials
-  And the course has an LTI component with incorrect fields
-  Then I view the LTI and it is not rendered
+  And the course has an LTI component with no_launch_url fields, new_page is false
+  Then I view the LTI and error is shown
 
-  Scenario: LTI component in LMS is rendered
+  Scenario: LTI component in LMS with incorrect lti_id is rendered incorrectly
   Given the course has correct LTI credentials
-  And the course has an LTI component filled with correct fields
-  Then I view the LTI and it is rendered
+  And the course has an LTI component with incorrect_lti_id fields, new_page is false
+  Then I view the LTI but incorrect_signature warning is rendered
 
   Scenario: LTI component in LMS is rendered incorrectly
   Given the course has incorrect LTI credentials
-  And the course has an LTI component filled with correct fields
+  And the course has an LTI component with correct fields, new_page is false
   Then I view the LTI but incorrect_signature warning is rendered
+
+  Scenario: LTI component in LMS is correctly rendered in new page
+  Given the course has correct LTI credentials
+  And the course has an LTI component with correct fields, new_page is true
+  Then I view the LTI and it is rendered in new page
+
+  Scenario: LTI component in LMS is correctly rendered in iframe
+  Given the course has correct LTI credentials
+  And the course has an LTI component with correct fields, new_page is false
+  Then I view the LTI and it is rendered in iframe
diff --git a/lms/djangoapps/courseware/features/lti.py b/lms/djangoapps/courseware/features/lti.py
index ef385cf2c9..58de82ded6 100644
--- a/lms/djangoapps/courseware/features/lti.py
+++ b/lms/djangoapps/courseware/features/lti.py
@@ -1,5 +1,6 @@
 #pylint: disable=C0111
 
+import os
 from django.contrib.auth.models import User
 from lettuce import world, step
 from lettuce.django import django_url
@@ -8,69 +9,58 @@ from common import course_id
 from student.models import CourseEnrollment
 
 
-@step('I view the LTI and it is not rendered$')
+@step('I view the LTI and error is shown$')
 def lti_is_not_rendered(_step):
-    # lti div has no class rendered
-    assert world.is_css_not_present('div.lti.rendered')
-
     # error is shown
-    assert world.css_visible('.error_message')
+    assert world.is_css_present('.error_message')
 
-    # iframe is not visible
-    assert not world.css_visible('iframe')
+    # iframe is not presented
+    assert not world.is_css_present('iframe')
 
-    #inside iframe test content is not presented
-    with world.browser.get_iframe('ltiLaunchFrame') as iframe:
-        # iframe does not contain functions from terrain/ui_helpers.py
-        world.browser.driver.implicitly_wait(1)
-        try:
-            assert iframe.is_element_not_present_by_css('.result', wait_time=1)
-        except:
-            raise
-        finally:
-            world.browser.driver.implicitly_wait(world.IMPLICIT_WAIT)
+    # link is not presented
+    assert not world.is_css_present('.link_lti_new_window')
 
 
-@step('I view the LTI and it is rendered$')
-def lti_is_rendered(_step):
-    # lti div has class rendered
-    assert world.is_css_present('div.lti.rendered')
-
-    # error is hidden
-    assert not world.css_visible('.error_message')
-
-    # iframe is visible
-    assert world.css_visible('iframe')
-
+def check_lti_iframe_content(text):
     #inside iframe test content is presented
-    with world.browser.get_iframe('ltiLaunchFrame') as iframe:
+    location = world.scenario_dict['LTI'].location.html_id()
+    iframe_name = 'ltiLaunchFrame-' + location
+    with world.browser.get_iframe(iframe_name) as iframe:
         # iframe does not contain functions from terrain/ui_helpers.py
         assert iframe.is_element_present_by_css('.result', wait_time=5)
-        assert ("This is LTI tool. Success." == world.retry_on_exception(
+        assert (text == world.retry_on_exception(
             lambda: iframe.find_by_css('.result')[0].text,
             max_attempts=5
         ))
 
 
+@step('I view the LTI and it is rendered in (.*)$')
+def lti_is_rendered(_step, rendered_in):
+    if rendered_in.strip() == 'iframe':
+        assert world.is_css_present('iframe')
+        assert not world.is_css_present('.link_lti_new_window')
+        assert not world.is_css_present('.error_message')
+
+        # iframe is visible
+        assert world.css_visible('iframe')
+        check_lti_iframe_content("This is LTI tool. Success.")
+
+    elif rendered_in.strip() == 'new page':
+        assert not world.is_css_present('iframe')
+        assert world.is_css_present('.link_lti_new_window')
+        assert not world.is_css_present('.error_message')
+        check_lti_popup()
+    else:  # incorrent rendered_in parameter
+        assert False
+
+
 @step('I view the LTI but incorrect_signature warning is rendered$')
 def incorrect_lti_is_rendered(_step):
-    # lti div has class rendered
-    assert world.is_css_present('div.lti.rendered')
-
-    # error is hidden
-    assert not world.css_visible('.error_message')
-
-    # iframe is visible
-    assert world.css_visible('iframe')
-
+    assert world.is_css_present('iframe')
+    assert not world.is_css_present('.link_lti_new_window')
+    assert not world.is_css_present('.error_message')
     #inside iframe test content is presented
-    with world.browser.get_iframe('ltiLaunchFrame') as iframe:
-        # iframe does not contain functions from terrain/ui_helpers.py
-        assert iframe.is_element_present_by_css('.result', wait_time=5)
-        assert ("Wrong LTI signature" == world.retry_on_exception(
-            lambda: iframe.find_by_css('.result')[0].text,
-            max_attempts=5
-        ))
+    check_lti_iframe_content("Wrong LTI signature")
 
 
 @step('the course has correct LTI credentials$')
@@ -97,44 +87,33 @@ def set_incorrect_lti_passport(_step):
     i_am_registered_for_the_course(coursenum, metadata)
 
 
-@step('the course has an LTI component filled with correct fields$')
-def add_correct_lti_to_course(_step):
+@step('the course has an LTI component with (.*) fields, new_page is(.*)$')
+def add_correct_lti_to_course(_step, fields, new_page):
     category = 'lti'
-    world.ItemFactory.create(
-        # parent_location=section_location(course),
+    lti_id = 'correct_lti_id'
+    launch_url = world.lti_server.oauth_settings['lti_base'] + world.lti_server.oauth_settings['lti_endpoint']
+    if fields.strip() == 'incorrect_lti_id':  # incorrect fields
+        lti_id = 'incorrect_lti_id'
+    elif fields.strip() == 'correct':  # correct fields
+        pass
+    elif fields.strip() == 'no_launch_url':
+        launch_url = u''
+    else:  # incorrect parameter
+        assert False
+
+    if new_page.strip().lower() == 'false':
+        new_page = False
+    else:  # default is True
+        new_page = True
+
+    world.scenario_dict['LTI'] = world.ItemFactory.create(
         parent_location=world.scenario_dict['SEQUENTIAL'].location,
         category=category,
         display_name='LTI',
         metadata={
-            'lti_id': 'correct_lti_id',
-            'launch_url': world.lti_server.oauth_settings['lti_base'] + world.lti_server.oauth_settings['lti_endpoint']
-        }
-    )
-    course = world.scenario_dict["COURSE"]
-    chapter_name = world.scenario_dict['SECTION'].display_name.replace(
-        " ", "_")
-    section_name = chapter_name
-    path = "/courses/{org}/{num}/{name}/courseware/{chapter}/{section}".format(
-        org=course.org,
-        num=course.number,
-        name=course.display_name.replace(' ', '_'),
-        chapter=chapter_name,
-        section=section_name)
-    url = django_url(path)
-
-    world.browser.visit(url)
-
-
-@step('the course has an LTI component with incorrect fields$')
-def add_incorrect_lti_to_course(_step):
-    category = 'lti'
-    world.ItemFactory.create(
-        parent_location=world.scenario_dict['SEQUENTIAL'].location,
-        category=category,
-        display_name='LTI',
-        metadata={
-            'lti_id': 'incorrect_lti_id',
-            'lti_url': world.lti_server.oauth_settings['lti_base'] + world.lti_server.oauth_settings['lti_endpoint']
+            'lti_id': lti_id,
+            'launch_url': launch_url,
+            'open_in_a_new_page': new_page
         }
     )
     course = world.scenario_dict["COURSE"]
@@ -192,3 +171,28 @@ def i_am_registered_for_the_course(course, metadata):
     CourseEnrollment.enroll(usr, course_id(course))
 
     world.log_in(username='robot', password='test')
+
+
+def check_lti_popup():
+    parent_window = world.browser.current_window # Save the parent window
+    world.css_find('.link_lti_new_window').first.click()
+
+    assert len(world.browser.windows) != 1
+
+    for window in world.browser.windows:
+        world.browser.switch_to_window(window) # Switch to a different window (the pop-up)
+        # Check if this is the one we want by comparing the url
+        url = world.browser.url
+        basename = os.path.basename(url)
+        pathname = os.path.splitext(basename)[0]
+
+        if pathname == u'correct_lti_endpoint':
+            break
+
+    result = world.css_find('.result').first.text
+    assert result == u'This is LTI tool. Success.'
+
+    world.browser.driver.close() # Close the pop-up window
+    world.browser.switch_to_window(parent_window) # Switch to the main window again
+
+
diff --git a/lms/djangoapps/courseware/features/navigation.feature b/lms/djangoapps/courseware/features/navigation.feature
index ad84019725..ca23f49828 100644
--- a/lms/djangoapps/courseware/features/navigation.feature
+++ b/lms/djangoapps/courseware/features/navigation.feature
@@ -18,6 +18,7 @@ Feature: LMS.Navigate Course
         Given I am viewing a section with multiple sequences
         When I navigate to an item in a sequence
         Then I see the content of the sequence item
+        And a "seq_goto" browser event is emitted
 
     Scenario: I can return to the last section I visited
         Given I am viewing a course with multiple sections
diff --git a/lms/djangoapps/courseware/features/problems.feature b/lms/djangoapps/courseware/features/problems.feature
index 2f15619a94..0dca3201c1 100644
--- a/lms/djangoapps/courseware/features/problems.feature
+++ b/lms/djangoapps/courseware/features/problems.feature
@@ -10,6 +10,8 @@ Feature: LMS.Answer problems
         When I answer a "<ProblemType>" problem "correctly"
         Then my "<ProblemType>" answer is marked "correct"
         And The "<ProblemType>" problem displays a "correct" answer
+        And a "problem_check" server event is emitted
+        And a "problem_check" browser event is emitted
 
         Examples:
         | ProblemType       |
diff --git a/lms/djangoapps/courseware/features/video.feature b/lms/djangoapps/courseware/features/video.feature
index 001481a6a5..7518bf6bdb 100644
--- a/lms/djangoapps/courseware/features/video.feature
+++ b/lms/djangoapps/courseware/features/video.feature
@@ -2,38 +2,45 @@
 Feature: LMS.Video component
   As a student, I want to view course videos in LMS.
 
+  # 1
   Scenario: Video component is fully rendered in the LMS in HTML5 mode
     Given the course has a Video component in HTML5 mode
     Then when I view the video it has rendered in HTML5 mode
     And all sources are correct
 
+  # 2
   # Firefox doesn't have HTML5 (only mp4 - fix here)
   @skip_firefox
   Scenario: Autoplay is disabled in LMS for a Video component
     Given the course has a Video component in HTML5 mode
     Then when I view the video it does not have autoplay enabled
 
+  # 3
   # Youtube testing
   Scenario: Video component is fully rendered in the LMS in Youtube mode with HTML5 sources
     Given youtube server is up and response time is  0.4 seconds
     And the course has a Video component in Youtube_HTML5 mode
     Then when I view the video it has rendered in Youtube mode
 
+  # 4
   Scenario: Video component is not rendered in the LMS in Youtube mode with HTML5 sources
     Given youtube server is up and response time is 2 seconds
     And the course has a Video component in Youtube_HTML5 mode
     Then when I view the video it has rendered in HTML5 mode
 
+  # 5
   Scenario: Video component is rendered in the LMS in Youtube mode without HTML5 sources
     Given youtube server is up and response time is 2 seconds
     And the course has a Video component in Youtube mode
     Then when I view the video it has rendered in Youtube mode
 
+  # 6
   Scenario: Video component is rendered in the LMS in Youtube mode with HTML5 sources that doesn't supported by browser
     Given youtube server is up and response time is 2 seconds
     And the course has a Video component in Youtube_HTML5_Unsupported_Video mode
     Then when I view the video it has rendered in Youtube mode
 
+  # 7
   Scenario: Video component is rendered in the LMS in HTML5 mode with HTML5 sources that doesn't supported by browser
     Given the course has a Video component in HTML5_Unsupported_Video mode
     Then error message is shown
diff --git a/lms/djangoapps/courseware/features/word_cloud.py b/lms/djangoapps/courseware/features/word_cloud.py
index accc4d6c03..5ef2931ee4 100644
--- a/lms/djangoapps/courseware/features/word_cloud.py
+++ b/lms/djangoapps/courseware/features/word_cloud.py
@@ -33,8 +33,6 @@ def view_word_cloud(_step):
 @step('I press the Save button')
 def press_the_save_button(_step):
     button_css = '.input_cloud_section input.save'
-    elem = world.css_find(button_css).first
-    world.css_has_text(button_css, elem)
     world.css_click(button_css)
 
 
diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py
index e7a488ec75..4640cd3f82 100644
--- a/lms/djangoapps/courseware/grades.py
+++ b/lms/djangoapps/courseware/grades.py
@@ -305,9 +305,9 @@ def progress_summary(student, request, course, field_data_cache):
             graded = section_module.graded
             scores = []
 
-            module_creator = section_module.system.get_module
+            module_creator = section_module.xmodule_runtime.get_module
 
-            for module_descriptor in yield_dynamic_descriptor_descendents(section_module.descriptor, module_creator):
+            for module_descriptor in yield_dynamic_descriptor_descendents(section_module, module_creator):
 
                 course_id = course.id
                 (correct, total) = get_score(course_id, student, module_descriptor, module_creator, field_data_cache)
diff --git a/lms/djangoapps/courseware/management/commands/dump_course_ids.py b/lms/djangoapps/courseware/management/commands/dump_course_ids.py
new file mode 100644
index 0000000000..749b64f6a7
--- /dev/null
+++ b/lms/djangoapps/courseware/management/commands/dump_course_ids.py
@@ -0,0 +1,36 @@
+# pylint: disable=missing-docstring
+
+from optparse import make_option
+from textwrap import dedent
+
+from django.core.management.base import BaseCommand, CommandError
+
+from xmodule.modulestore.django import modulestore
+
+
+class Command(BaseCommand):
+    """
+    Simple command to dump the course_ids available to the lms.
+    """
+    help = dedent(__doc__).strip()
+    option_list = BaseCommand.option_list + (
+        make_option('--modulestore',
+                    action='store',
+                    default='default',
+                    help='Name of the modulestore to use'),
+    )
+
+    def handle(self, *args, **options):
+        output = []
+
+        try:
+            name = options['modulestore']
+            store = modulestore(name)
+        except KeyError:
+            raise CommandError("Unknown modulestore {}".format(name))
+
+        for course in store.get_courses():
+            course_id = course.location.course_id
+            output.append(course_id)
+
+        return '\n'.join(output) + '\n'
diff --git a/lms/djangoapps/courseware/management/commands/dump_course_structure.py b/lms/djangoapps/courseware/management/commands/dump_course_structure.py
new file mode 100644
index 0000000000..3debfa1af1
--- /dev/null
+++ b/lms/djangoapps/courseware/management/commands/dump_course_structure.py
@@ -0,0 +1,92 @@
+"""
+A Django command that dumps the structure of a course as a JSON object.
+
+The resulting JSON object has one entry for each module in the course:
+
+{
+  "$module_url": {
+    "category": "$module_category",
+    "children": [$module_children_urls... ],
+    "metadata": {$module_metadata}
+  },
+
+  "$module_url": ....
+  ...
+}
+
+"""
+
+import json
+from optparse import make_option
+from textwrap import dedent
+
+from django.core.management.base import BaseCommand, CommandError
+
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.inheritance import own_metadata
+
+
+FILTER_LIST = ['xml_attributes', 'checklists']
+
+
+class Command(BaseCommand):
+    """
+    Write out to stdout a structural and metadata information for a
+    course as a JSON object
+    """
+    args = "<course_id>"
+    help = dedent(__doc__).strip()
+    option_list = BaseCommand.option_list + (
+        make_option('--modulestore',
+                    action='store',
+                    default='default',
+                    help='Name of the modulestore'),
+    )
+
+    def handle(self, *args, **options):
+        if len(args) != 1:
+            raise CommandError("course_id not specified")
+
+        # Get the modulestore
+
+        try:
+            name = options['modulestore']
+            store = modulestore(name)
+        except KeyError:
+            raise CommandError("Unknown modulestore {}".format(name))
+
+        # Get the course data
+
+        course_id = args[0]
+        course = store.get_course(course_id)
+        if course is None:
+            raise CommandError("Invalid course_id")
+
+        # Convert course data to dictionary and dump it as JSON to stdout
+
+        info = dump_module(course)
+
+        return json.dumps(info, indent=2, sort_keys=True)
+
+
+def dump_module(module, destination=None):
+    """
+    Add the module and all its children to the destination dictionary in
+    as a flat structure.
+    """
+
+    destination = destination if destination else {}
+
+    items = own_metadata(module).iteritems()
+    filtered_metadata = {k: v for k, v in items if k not in FILTER_LIST}
+
+    destination[module.location.url()] = {
+        'category': module.location.category,
+        'children': module.children if hasattr(module, 'children') else [],
+        'metadata': filtered_metadata
+    }
+
+    for child in module.get_children():
+        dump_module(child, destination)
+
+    return destination
diff --git a/lms/djangoapps/courseware/management/commands/export_course.py b/lms/djangoapps/courseware/management/commands/export_course.py
new file mode 100644
index 0000000000..646b2f8d5a
--- /dev/null
+++ b/lms/djangoapps/courseware/management/commands/export_course.py
@@ -0,0 +1,66 @@
+"""
+A Django command that exports a course to a tar.gz file.
+"""
+
+import shutil
+import tarfile
+from tempfile import mkdtemp
+from textwrap import dedent
+
+from path import path
+
+from django.core.management.base import BaseCommand, CommandError
+
+from xmodule.modulestore.django import modulestore
+from xmodule.contentstore.django import contentstore
+from xmodule.modulestore.xml_exporter import export_to_xml
+
+
+class Command(BaseCommand):
+    """
+    Export a course to XML. The output is compressed as a tar.gz file
+
+    """
+    args = "<course_id> <output_filename>"
+    help = dedent(__doc__).strip()
+
+    def handle(self, *args, **options):
+        try:
+            course_id = args[0]
+            filename = args[1]
+        except IndexError:
+            raise CommandError("Insufficient arguments")
+
+        export_course_to_tarfile(course_id, filename)
+
+
+def export_course_to_tarfile(course_id, filename):
+    """Exports a course into a tar.gz file"""
+    tmp_dir = mkdtemp()
+    try:
+        course_dir = export_course_to_directory(course_id, tmp_dir)
+        compress_directory(course_dir, filename)
+    finally:
+        shutil.rmtree(tmp_dir)
+
+
+def export_course_to_directory(course_id, root_dir):
+    """Export course into a directory"""
+    store = modulestore()
+    course = store.get_course(course_id)
+    if course is None:
+        raise CommandError("Invalid course_id")
+
+    course_name = course.location.course_id.replace('/', '-')
+    export_to_xml(store, None, course.location, root_dir, course_name)
+
+    course_dir = path(root_dir) / course_name
+    return course_dir
+
+
+def compress_directory(directory, filename):
+    """Compress a directrory into a tar.gz file"""
+    mode = 'w:gz'
+    name = path(directory).name
+    with tarfile.open(filename, mode) as tar_file:
+        tar_file.add(directory, arcname=name)
diff --git a/lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py b/lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
index 833df3a1c3..83208d0102 100644
--- a/lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
+++ b/lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
@@ -2,6 +2,7 @@ from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
 import urlparse
 from oauthlib.oauth1.rfc5849 import signature
 import mock
+import sys
 from logging import getLogger
 logger = getLogger(__name__)
 
@@ -13,6 +14,15 @@ class MockLTIRequestHandler(BaseHTTPRequestHandler):
 
     protocol = "HTTP/1.0"
 
+    def log_message(self, format, *args):
+        """Log an arbitrary message."""
+        # Code copied from BaseHTTPServer.py. Changed to write to sys.stdout
+        # so that messages won't pollute test output.
+        sys.stdout.write("%s - - [%s] %s\n" %
+                         (self.client_address[0],
+                          self.log_date_time_string(),
+                          format % args))
+
     def do_HEAD(self):
         self._send_head()
 
diff --git a/lms/djangoapps/courseware/model_data.py b/lms/djangoapps/courseware/model_data.py
index f480d0ef44..da5d639bf0 100644
--- a/lms/djangoapps/courseware/model_data.py
+++ b/lms/djangoapps/courseware/model_data.py
@@ -289,7 +289,7 @@ class DjangoKeyValueStore(KeyValueStore):
 
     def get(self, key):
         if key.scope not in self._allowed_scopes:
-            raise InvalidScopeError(key.scope)
+            raise InvalidScopeError(key)
 
         field_object = self._field_data_cache.find(key)
         if field_object is None:
@@ -320,7 +320,7 @@ class DjangoKeyValueStore(KeyValueStore):
         for field in kv_dict:
             # Check field for validity
             if field.scope not in self._allowed_scopes:
-                raise InvalidScopeError(field.scope)
+                raise InvalidScopeError(field)
 
             # If the field is valid and isn't already in the dictionary, add it.
             field_object = self._field_data_cache.find_or_create(field)
@@ -352,7 +352,7 @@ class DjangoKeyValueStore(KeyValueStore):
 
     def delete(self, key):
         if key.scope not in self._allowed_scopes:
-            raise InvalidScopeError(key.scope)
+            raise InvalidScopeError(key)
 
         field_object = self._field_data_cache.find(key)
         if field_object is None:
@@ -368,7 +368,7 @@ class DjangoKeyValueStore(KeyValueStore):
 
     def has(self, key):
         if key.scope not in self._allowed_scopes:
-            raise InvalidScopeError(key.scope)
+            raise InvalidScopeError(key)
 
         field_object = self._field_data_cache.find(key)
         if field_object is None:
diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index ab656a0923..aa8f1f99d8 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -219,6 +219,9 @@ def get_module_for_descriptor_internal(user, descriptor, field_data_cache, cours
     if not has_access(user, descriptor, 'load', course_id):
         return None
 
+    student_data = DbModel(DjangoKeyValueStore(field_data_cache))
+    descriptor._field_data = lms_field_data(descriptor._field_data, student_data)
+
     # Setup system context for module instance
     ajax_url = reverse(
         'modx_dispatch',
@@ -294,10 +297,6 @@ def get_module_for_descriptor_internal(user, descriptor, field_data_cache, cours
                                                   position, wrap_xmodule_display, grade_bucket_type,
                                                   static_asset_path)
 
-    def xmodule_field_data(descriptor):
-        student_data = DbModel(DjangoKeyValueStore(field_data_cache))
-        return lms_field_data(descriptor._field_data, student_data)
-
     def publish(event):
         """A function that allows XModules to publish events. This only supports grade changes right now."""
         if event.get('event_name') != 'grade':
@@ -405,7 +404,6 @@ def get_module_for_descriptor_internal(user, descriptor, field_data_cache, cours
             jump_to_id_base_url=reverse('jump_to_id', kwargs={'course_id': course_id, 'module_id': ''})
         ),
         node_path=settings.NODE_PATH,
-        xmodule_field_data=xmodule_field_data,
         publish=publish,
         anonymous_student_id=unique_id_for_user(user),
         course_id=course_id,
@@ -426,27 +424,17 @@ def get_module_for_descriptor_internal(user, descriptor, field_data_cache, cours
             make_psychometrics_data_update_handler(course_id, user, descriptor.location.url())
         )
 
-    try:
-        module = descriptor.xmodule(system)
-    except:
-        log.exception("Error creating module from descriptor {0}".format(descriptor))
-
-        # make an ErrorDescriptor -- assuming that the descriptor's system is ok
-        if has_access(user, descriptor.location, 'staff', course_id):
-            err_descriptor_class = ErrorDescriptor
-        else:
-            err_descriptor_class = NonStaffErrorDescriptor
-
-        err_descriptor = err_descriptor_class.from_descriptor(
-            descriptor,
-            error_msg=exc_info_to_str(sys.exc_info())
-        )
-
-        # Make an error module
-        return err_descriptor.xmodule(system)
-
     system.set('user_is_staff', has_access(user, descriptor.location, 'staff', course_id))
-    return module
+
+    # make an ErrorDescriptor -- assuming that the descriptor's system is ok
+    if has_access(user, descriptor.location, 'staff', course_id):
+        system.error_descriptor_class = ErrorDescriptor
+    else:
+        system.error_descriptor_class = NonStaffErrorDescriptor
+
+    descriptor.xmodule_runtime = system
+    descriptor.scope_ids = descriptor.scope_ids._replace(user_id=user.id)
+    return descriptor
 
 
 def find_target_student_module(request, user_id, course_id, mod_id):
diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py
index 6579e631d6..7ee16adcfb 100644
--- a/lms/djangoapps/courseware/tabs.py
+++ b/lms/djangoapps/courseware/tabs.py
@@ -419,6 +419,6 @@ def get_static_tab_contents(request, course, tab):
     html = ''
 
     if tab_module is not None:
-        html = tab_module.runtime.render(tab_module, None, 'student_view').content
+        html = tab_module.render('student_view').content
 
     return html
diff --git a/lms/djangoapps/courseware/tests/__init__.py b/lms/djangoapps/courseware/tests/__init__.py
index afd5fae2cc..91be45516d 100644
--- a/lms/djangoapps/courseware/tests/__init__.py
+++ b/lms/djangoapps/courseware/tests/__init__.py
@@ -16,7 +16,7 @@ from student.tests.factories import UserFactory, CourseEnrollmentFactory
 from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
 from xblock.field_data import DictFieldData
 from xblock.fields import Scope
-from xmodule.tests import get_test_system
+from xmodule.tests import get_test_system, get_test_descriptor_system
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
@@ -49,11 +49,26 @@ class BaseTestXmodule(ModuleStoreTestCase):
     DATA = ''
     MODEL_DATA = {'data': '<some_module></some_module>'}
 
-    def xmodule_field_data(self, descriptor):
-        field_data = {}
-        field_data.update(self.MODEL_DATA)
-        student_data = DictFieldData(field_data)
-        return lms_field_data(descriptor._field_data, student_data)
+    def new_module_runtime(self):
+        """
+        Generate a new ModuleSystem that is minimally set up for testing
+        """
+        runtime = get_test_system(course_id=self.course.id)
+
+        # When asked for a module out of a descriptor, just create a new xmodule runtime,
+        # and inject it into the descriptor
+        def get_module(descr):
+            descr.xmodule_runtime = self.new_module_runtime()
+            return descr
+
+        runtime.get_module = get_module
+
+        return runtime
+
+    def new_descriptor_runtime(self):
+        runtime = get_test_descriptor_system()
+        runtime.get_block = modulestore().get_item
+        return runtime
 
     def setUp(self):
 
@@ -87,16 +102,15 @@ class BaseTestXmodule(ModuleStoreTestCase):
             data=self.DATA
         )
 
-        self.runtime = get_test_system(course_id=self.course.id)
-        # Allow us to assert that the template was called in the same way from
-        # different code paths while maintaining the type returned by render_template
-        self.runtime.render_template = lambda template, context: u'{!r}, {!r}'.format(template, sorted(context.items()))
+        self.runtime = self.new_descriptor_runtime()
 
-        self.runtime.xmodule_field_data = self.xmodule_field_data
+        field_data = {}
+        field_data.update(self.MODEL_DATA)
+        student_data = DictFieldData(field_data)
+        self.item_descriptor._field_data = lms_field_data(self.item_descriptor._field_data, student_data)
 
-        self.runtime.get_module = lambda descr: descr.xmodule(self.runtime)
-
-        self.item_module = self.item_descriptor.xmodule(self.runtime)
+        self.item_descriptor.xmodule_runtime = self.new_module_runtime()
+        self.item_module = self.item_descriptor
 
         self.item_url = Location(self.item_module.location).url()
 
@@ -119,7 +133,11 @@ class BaseTestXmodule(ModuleStoreTestCase):
 
 
 class XModuleRenderingTestBase(BaseTestXmodule):
-    def setUp(self):
-        super(XModuleRenderingTestBase, self).setUp()
 
-        self.runtime.render_template = render_to_string
+    def new_module_runtime(self):
+        """
+        Create a runtime that actually does html rendering
+        """
+        runtime = super(XModuleRenderingTestBase, self).new_module_runtime()
+        runtime.render_template = render_to_string
+        return runtime
diff --git a/lms/djangoapps/courseware/tests/test_commands.py b/lms/djangoapps/courseware/tests/test_commands.py
new file mode 100644
index 0000000000..bc7ca43df9
--- /dev/null
+++ b/lms/djangoapps/courseware/tests/test_commands.py
@@ -0,0 +1,112 @@
+"""Tests for Django management commands"""
+
+import json
+import shutil
+from StringIO import StringIO
+import tarfile
+from tempfile import mkdtemp
+
+from path import path
+
+from django.core.management import call_command
+from django.test.utils import override_settings
+
+from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
+
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.xml_importer import import_from_xml
+
+DATA_DIR = 'common/test/data/'
+
+
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
+class CommandTestCase(ModuleStoreTestCase):
+    """Parent class with helpers for testing management commands"""
+
+    def load_courses(self):
+        """Load test courses and return list of ids"""
+        store = modulestore()
+        import_from_xml(store, DATA_DIR, ['toy', 'simple'])
+        return [course.id for course in store.get_courses()]
+
+    def call_command(self, name, *args, **kwargs):
+        """Call management command and return output"""
+        out = StringIO()  # To Capture the output of the command
+        call_command(name, *args, stdout=out, **kwargs)
+        out.seek(0)
+        return out.read()
+
+
+class CommandsTestCase(CommandTestCase):
+    """Test case for management commands"""
+
+    def setUp(self):
+        self.loaded_courses = self.load_courses()
+
+    def test_dump_course_ids(self):
+        kwargs = {'modulestore': 'default'}
+        output = self.call_command('dump_course_ids', **kwargs)
+        dumped_courses = output.strip().split('\n')
+        self.assertEqual(self.loaded_courses, dumped_courses)
+
+    def test_dump_course_structure(self):
+        dumped_courses = self.call_command('dump_course_ids').split('\n')
+        self.assertEqual(self.loaded_courses, dumped_courses)
+
+    def test_dump_course_structure(self):
+        args = ['edX/simple/2012_Fall']
+        kwargs = {'modulestore': 'default'}
+        output = self.call_command('dump_course_structure', *args, **kwargs)
+
+        dump = json.loads(output)
+
+        # Check a few elements in the course dump
+
+        parent_id = 'i4x://edX/simple/chapter/Overview'
+        self.assertEqual(dump[parent_id]['category'], 'chapter')
+        self.assertEqual(len(dump[parent_id]['children']), 3)
+
+        child_id = dump[parent_id]['children'][1]
+        self.assertEqual(dump[child_id]['category'], 'videosequence')
+        self.assertEqual(len(dump[child_id]['children']), 2)
+
+        video_id = 'i4x://edX/simple/video/Welcome'
+        self.assertEqual(dump[video_id]['category'], 'video')
+        self.assertEqual(len(dump[video_id]['metadata']), 4)
+        self.assertIn('youtube_id_1_0', dump[video_id]['metadata'])
+
+        # Check if there is the right number of elements
+
+        self.assertEqual(len(dump), 16)
+
+    def test_export_course(self):
+        tmp_dir = path(mkdtemp())
+        filename = tmp_dir / 'test.tar.gz'
+        try:
+            self.run_export_course(filename)
+            with tarfile.open(filename) as tar_file:
+                self.check_export_file(tar_file)
+
+        finally:
+            shutil.rmtree(tmp_dir)
+
+    def run_export_course(self, filename):  # pylint: disable=missing-docstring
+        args = ['edX/simple/2012_Fall', filename]
+        kwargs = {'modulestore': 'default'}
+        self.call_command('export_course', *args, **kwargs)
+
+    def check_export_file(self, tar_file):  # pylint: disable=missing-docstring
+        names = tar_file.getnames()
+
+        # Check if some of the files are present.
+
+        # The rest is of the code should be covered by the tests for
+        # xmodule.modulestore.xml_exporter, used by the dump_course command
+
+        assert_in = self.assertIn
+        assert_in('edX-simple-2012_Fall', names)
+        assert_in('edX-simple-2012_Fall/policies/2012_Fall/policy.json', names)
+        assert_in('edX-simple-2012_Fall/html/toylab.html', names)
+        assert_in('edX-simple-2012_Fall/videosequence/A_simple_sequence.xml', names)
+        assert_in('edX-simple-2012_Fall/sequential/Lecture_2.xml', names)
diff --git a/lms/djangoapps/courseware/tests/test_courses.py b/lms/djangoapps/courseware/tests/test_courses.py
index 20cb83a411..207752a85f 100644
--- a/lms/djangoapps/courseware/tests/test_courses.py
+++ b/lms/djangoapps/courseware/tests/test_courses.py
@@ -1,16 +1,22 @@
 # -*- coding: utf-8 -*-
+import mock
+
 from django.test import TestCase
 from django.http import Http404
 from django.test.utils import override_settings
-from courseware.courses import get_course_by_id, get_cms_course_link_by_id
+from courseware.courses import get_course_by_id, get_course, get_cms_course_link_by_id
+from xmodule.modulestore.django import get_default_store_name_for_current_request
 
 CMS_BASE_TEST = 'testcms'
 
+
 class CoursesTest(TestCase):
+    """Test methods related to fetching courses."""
+
     def test_get_course_by_id_invalid_chars(self):
         """
         Test that `get_course_by_id` throws a 404, rather than
-        an exception, when faced with unexpected characters 
+        an exception, when faced with unexpected characters
         (such as unicode characters, and symbols such as = and ' ')
         """
         with self.assertRaises(Http404):
@@ -18,6 +24,17 @@ class CoursesTest(TestCase):
             get_course_by_id('MITx/foobar/business and management')
             get_course_by_id('MITx/foobar/NiñøJoséMaríáßç')
 
+    def test_get_course_invalid_chars(self):
+        """
+        Test that `get_course` throws a ValueError, rather than
+        a 404, when faced with unexpected characters
+        (such as unicode characters, and symbols such as = and ' ')
+        """
+        with self.assertRaises(ValueError):
+            get_course('MITx/foobar/statistics=introduction')
+            get_course('MITx/foobar/business and management')
+            get_course('MITx/foobar/NiñøJoséMaríáßç')
+
     @override_settings(CMS_BASE=CMS_BASE_TEST)
     def test_get_cms_course_link_by_id(self):
         """
@@ -26,3 +43,14 @@ class CoursesTest(TestCase):
         self.assertEqual("//{}/".format(CMS_BASE_TEST), get_cms_course_link_by_id("blah_bad_course_id"))
         self.assertEqual("//{}/".format(CMS_BASE_TEST), get_cms_course_link_by_id("too/too/many/slashes"))
         self.assertEqual("//{}/org/num/course/name".format(CMS_BASE_TEST), get_cms_course_link_by_id('org/num/name'))
+
+
+    @mock.patch('xmodule.modulestore.django.get_current_request_hostname', mock.Mock(return_value='preview.localhost'))
+    @override_settings(HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS={'preview\.': 'draft'})
+    def test_default_modulestore_preview_mapping(self):   
+        self.assertEqual(get_default_store_name_for_current_request(), 'draft')
+
+    @mock.patch('xmodule.modulestore.django.get_current_request_hostname', mock.Mock(return_value='localhost'))
+    @override_settings(HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS={'preview\.': 'draft'})
+    def test_default_modulestore_published_mapping(self):
+        self.assertEqual(get_default_store_name_for_current_request(), 'default')
diff --git a/lms/djangoapps/courseware/tests/test_lti.py b/lms/djangoapps/courseware/tests/test_lti.py
index 596ec2dd9a..a176384fd1 100644
--- a/lms/djangoapps/courseware/tests/test_lti.py
+++ b/lms/djangoapps/courseware/tests/test_lti.py
@@ -39,7 +39,7 @@ class TestLTI(BaseTestXmodule):
             u'oauth_consumer_key': u'',
             u'oauth_signature_method': u'HMAC-SHA1',
             u'oauth_version': u'1.0',
-            u'user_id': self.runtime.anonymous_student_id,
+            u'user_id': self.item_descriptor.xmodule_runtime.anonymous_student_id,
             u'role': u'student',
             u'oauth_signature': mocked_decoded_signature
         }
@@ -69,12 +69,16 @@ class TestLTI(BaseTestXmodule):
         """
         Makes sure that all parameters extracted.
         """
-        self.runtime.render_template = lambda template, context: context
-        generated_context = self.item_module.get_html()
+        generated_context = self.item_module.render('student_view').content
         expected_context = {
             'input_fields': self.correct_headers,
+            'display_name': self.item_module.display_name,
             'element_class': self.item_module.location.category,
             'element_id': self.item_module.location.html_id(),
             'launch_url': 'http://www.example.com',  # default value
+            'open_in_a_new_page': True,
         }
-        self.assertDictEqual(generated_context, expected_context)
+        self.assertEqual(
+            generated_context,
+            self.runtime.render_template('lti.html', expected_context),
+        )
diff --git a/lms/djangoapps/courseware/tests/test_module_render.py b/lms/djangoapps/courseware/tests/test_module_render.py
index f287c9acc4..8cc9ce8c0a 100644
--- a/lms/djangoapps/courseware/tests/test_module_render.py
+++ b/lms/djangoapps/courseware/tests/test_module_render.py
@@ -74,7 +74,7 @@ class ModuleRenderTestCase(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
 
         # get the rendered HTML output which should have the rewritten link
-        html = module.system.render(module, None, 'student_view').content
+        html = module.render('student_view').content
 
         # See if the url got rewritten to the target link
         # note if the URL mapping changes then this assertion will break
@@ -297,7 +297,7 @@ class TestHtmlModifiers(ModuleStoreTestCase):
             self.course.id,
             wrap_xmodule_display=True,
         )
-        result_fragment = module.runtime.render(module, None, 'student_view')
+        result_fragment = module.render('student_view')
 
         self.assertIn('section class="xmodule_display xmodule_HtmlModule"', result_fragment.content)
 
@@ -310,7 +310,7 @@ class TestHtmlModifiers(ModuleStoreTestCase):
             self.course.id,
             wrap_xmodule_display=False,
         )
-        result_fragment = module.runtime.render(module, None, 'student_view')
+        result_fragment = module.render('student_view')
 
         self.assertNotIn('section class="xmodule_display xmodule_HtmlModule"', result_fragment.content)
 
@@ -322,7 +322,7 @@ class TestHtmlModifiers(ModuleStoreTestCase):
             self.field_data_cache,
             self.course.id,
         )
-        result_fragment = module.runtime.render(module, None, 'student_view')
+        result_fragment = module.render('student_view')
 
         self.assertIn(
             '/c4x/{org}/{course}/asset/foo_content'.format(
@@ -340,7 +340,7 @@ class TestHtmlModifiers(ModuleStoreTestCase):
             self.field_data_cache,
             self.course.id,
         )
-        result_fragment = module.runtime.render(module, None, 'student_view')
+        result_fragment = module.render('student_view')
 
         self.assertIn(
             '/c4x/{org}/{course}/asset/_file.jpg'.format(
@@ -364,7 +364,7 @@ class TestHtmlModifiers(ModuleStoreTestCase):
             self.course.id,
             static_asset_path="toy_course_dir",
         )
-        result_fragment = module.runtime.render(module, None, 'student_view')
+        result_fragment = module.render('student_view')
         self.assertIn('href="/static/toy_course_dir', result_fragment.content)
 
     def test_course_image(self):
@@ -390,7 +390,7 @@ class TestHtmlModifiers(ModuleStoreTestCase):
             self.field_data_cache,
             self.course.id,
         )
-        result_fragment = module.runtime.render(module, None, 'student_view')
+        result_fragment = module.render('student_view')
 
         self.assertIn(
             '/courses/{course_id}/bar/content'.format(
@@ -408,7 +408,7 @@ class TestHtmlModifiers(ModuleStoreTestCase):
             self.field_data_cache,
             self.course.id,
         )
-        result_fragment = module.runtime.render(module, None, 'student_view')
+        result_fragment = module.render('student_view')
 
         self.assertIn(
             'Staff Debug',
diff --git a/lms/djangoapps/courseware/tests/test_timelimit_module.py b/lms/djangoapps/courseware/tests/test_timelimit_module.py
index 41b2a00304..3e3e0943f3 100644
--- a/lms/djangoapps/courseware/tests/test_timelimit_module.py
+++ b/lms/djangoapps/courseware/tests/test_timelimit_module.py
@@ -17,10 +17,13 @@ class TestTimeLimitModuleRendering(XModuleRenderingTestBase):
     """
     def test_with_children(self):
         block = ItemFactory.create(category='timelimit')
+        block.xmodule_runtime = self.new_module_runtime()
         ItemFactory.create(category='html', data='<html>This is just text</html>', parent=block)
 
-        assert_student_view(block, self.runtime.render(block.xmodule(self.runtime), None, 'student_view'))
+        assert_student_view(block, block.render('student_view'))
 
     def test_without_children(self):
         block = ItemFactory.create(category='timelimit')
-        assert_student_view(block, self.runtime.render(block.xmodule(self.runtime), None, 'student_view'))
+        block.xmodule_runtime = self.new_module_runtime()
+
+        assert_student_view(block, block.render('student_view'))
diff --git a/lms/djangoapps/courseware/tests/test_video_mongo.py b/lms/djangoapps/courseware/tests/test_video_mongo.py
index 75cf55c1cc..d364dc6fe5 100644
--- a/lms/djangoapps/courseware/tests/test_video_mongo.py
+++ b/lms/djangoapps/courseware/tests/test_video_mongo.py
@@ -13,14 +13,6 @@ class TestVideo(BaseTestXmodule):
     CATEGORY = "video"
     DATA = SOURCE_XML
 
-    def setUp(self):
-        # Since the VideoDescriptor changes `self._field_data`,
-        # we need to instantiate `self.item_module` through
-        # `self.item_descriptor` rather than directly constructing it
-        super(TestVideo, self).setUp()
-        self.item_module = self.item_descriptor.xmodule(self.runtime)
-        self.item_module.runtime.render_template = lambda template, context: context
-
     def test_handle_ajax_dispatch(self):
         responses = {
             user.username: self.clients[user.username].post(
@@ -40,7 +32,7 @@ class TestVideo(BaseTestXmodule):
     def test_video_constructor(self):
         """Make sure that all parameters extracted correclty from xml"""
 
-        context = self.item_module.get_html()
+        context = self.item_module.render('student_view').content
 
         sources = {
             'main': u'example.mp4',
@@ -53,7 +45,7 @@ class TestVideo(BaseTestXmodule):
             'data_dir': getattr(self, 'data_dir', None),
             'caption_asset_path': '/static/subs/',
             'show_captions': 'true',
-            'display_name': 'A Name',
+            'display_name': u'A Name',
             'end': 3610.0,
             'id': self.item_module.location.html_id(),
             'sources': sources,
@@ -66,8 +58,10 @@ class TestVideo(BaseTestXmodule):
             'yt_test_url': 'https://gdata.youtube.com/feeds/api/videos/'
         }
 
-        self.maxDiff = None
-        self.assertEqual(context, expected_context)
+        self.assertEqual(
+            context,
+            self.item_module.xmodule_runtime.render_template('video.html', expected_context)
+        )
 
 
 class TestVideoNonYouTube(TestVideo):
@@ -93,24 +87,24 @@ class TestVideoNonYouTube(TestVideo):
             the template generates an empty string for the YouTube streams.
         """
         sources = {
-            u'main': u'example.mp4',
+            'main': u'example.mp4',
             u'mp4': u'example.mp4',
             u'webm': u'example.webm',
             u'ogv': u'example.ogv'
         }
 
-        context = self.item_module.get_html()
+        context = self.item_module.render('student_view').content
 
         expected_context = {
             'data_dir': getattr(self, 'data_dir', None),
             'caption_asset_path': '/static/subs/',
             'show_captions': 'true',
-            'display_name': 'A Name',
+            'display_name': u'A Name',
             'end': 3610.0,
             'id': self.item_module.location.html_id(),
             'sources': sources,
             'start': 3603.0,
-            'sub': 'a_sub_file.srt.sjson',
+            'sub': u'a_sub_file.srt.sjson',
             'track': '',
             'youtube_streams': '1.00:OEoXaMPEzfM',
             'autoplay': settings.MITX_FEATURES.get('AUTOPLAY_VIDEOS', True),
@@ -118,4 +112,7 @@ class TestVideoNonYouTube(TestVideo):
             'yt_test_url': 'https://gdata.youtube.com/feeds/api/videos/'
         }
 
-        self.assertEqual(context, expected_context)
+        self.assertEqual(
+            context,
+            self.item_module.xmodule_runtime.render_template('video.html', expected_context)
+        )
diff --git a/lms/djangoapps/courseware/tests/test_video_xml.py b/lms/djangoapps/courseware/tests/test_video_xml.py
index 28cee28e7c..616c518ffe 100644
--- a/lms/djangoapps/courseware/tests/test_video_xml.py
+++ b/lms/djangoapps/courseware/tests/test_video_xml.py
@@ -22,7 +22,7 @@ from django.conf import settings
 
 from xmodule.video_module import VideoDescriptor, _create_youtube_string
 from xmodule.modulestore import Location
-from xmodule.tests import get_test_system, LogicTest
+from xmodule.tests import get_test_system, LogicTest, get_test_descriptor_system
 from xblock.field_data import DictFieldData
 from xblock.fields import ScopeIds
 
@@ -57,23 +57,18 @@ class VideoFactory(object):
         field_data = {'data': VideoFactory.sample_problem_xml_youtube,
                       'location': location}
 
-        system = get_test_system()
-        system.render_template = lambda template, context: context
+        system = get_test_descriptor_system()
 
         descriptor = VideoDescriptor(system, DictFieldData(field_data), ScopeIds(None, None, None, None))
-
-        module = descriptor.xmodule(system)
-
-        return module
+        descriptor.xmodule_runtime = get_test_system()
+        return descriptor
 
 
 class VideoModuleUnitTest(unittest.TestCase):
     """Unit tests for Video Xmodule."""
-
     def test_video_get_html(self):
         """Make sure that all parameters extracted correclty from xml"""
         module = VideoFactory.create()
-        module.runtime.render_template = lambda template, context: context
 
         sources = {
             'main': 'example.mp4',
@@ -99,14 +94,10 @@ class VideoModuleUnitTest(unittest.TestCase):
             'yt_test_url': 'https://gdata.youtube.com/feeds/api/videos/'
         }
 
-        self.assertEqual(module.get_html(), expected_context)
-
-    def test_video_instance_state(self):
-        module = VideoFactory.create()
-
-        self.assertDictEqual(
-            json.loads(module.get_instance_state()),
-            {'position': 0})
+        self.assertEqual(
+            module.render('student_view').content,
+            module.runtime.render_template('video.html', expected_context)
+        )
 
 
 class VideoModuleLogicTest(LogicTest):
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index dbf4bf1994..17198c372d 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -1,9 +1,10 @@
 """
 Tests courseware views.py
 """
-from mock import MagicMock, patch
-import datetime
 import unittest
+from mock import MagicMock, patch
+from datetime import datetime
+from pytz import UTC
 
 from django.test import TestCase
 from django.http import Http404
@@ -18,12 +19,13 @@ from student.models import CourseEnrollment
 from student.tests.factories import AdminFactory
 from mitxmako.middleware import MakoMiddleware
 
-from xmodule.modulestore.django import modulestore, clear_existing_modulestores
-from xmodule.modulestore.tests.factories import CourseFactory
+from xmodule.modulestore import Location
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from student.tests.factories import UserFactory
 
 import courseware.views as views
-from xmodule.modulestore import Location
-from pytz import UTC
 from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
 from course_modes.models import CourseMode
 import shoppingcart
@@ -73,7 +75,7 @@ class ViewsTestCase(TestCase):
     def setUp(self):
         self.user = User.objects.create(username='dummy', password='123456',
                                         email='test@mit.edu')
-        self.date = datetime.datetime(2013, 1, 22, tzinfo=UTC)
+        self.date = datetime(2013, 1, 22, tzinfo=UTC)
         self.course_id = 'edX/toy/2012_Fall'
         self.enrollment = CourseEnrollment.enroll(self.user, self.course_id)
         self.enrollment.created = self.date
@@ -109,7 +111,6 @@ class ViewsTestCase(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertIn(in_cart_span, response.content)
 
-
     def test_user_groups(self):
         # depreciated function
         mock_user = MagicMock()
@@ -254,98 +255,115 @@ class ViewsTestCase(TestCase):
         response = self.client.get(url)
         self.assertFalse('<script>' in response.content)
 
-    def test_accordion_due_date(self):
+
+@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+class BaseDueDateTests(ModuleStoreTestCase):
+    """
+    Base class that verifies that due dates are rendered correctly on a page
+    """
+    __test__ = False
+
+    def get_text(self, course):  # pylint: disable=unused-argument
+        """Return the rendered text for the page to be verified"""
+        raise NotImplementedError
+
+    def set_up_course(self, **course_kwargs):
         """
-        Tests the formatting of due dates in the accordion view.
+        Create a stock course with a specific due date.
+
+        :param course_kwargs: All kwargs are passed to through to the :class:`CourseFactory`
         """
-        def get_accordion():
-            """ Returns the HTML for the accordion """
-            return views.render_accordion(
-                request, modulestore().get_course("edX/due_date/2013_fall"),
-                "c804fa32227142a1bd9d5bc183d4a20d", None, None
-            )
+        course = CourseFactory(**course_kwargs)
+        chapter = ItemFactory(category='chapter', parent_location=course.location)  # pylint: disable=no-member
+        section = ItemFactory(category='sequential', parent_location=chapter.location, due=datetime(2013, 9, 18, 11, 30, 00))
+        vertical = ItemFactory(category='vertical', parent_location=section.location)
+        ItemFactory(category='problem', parent_location=vertical.location)
 
-        request = self.request_factory.get("foo")
-        self.verify_due_date(request, get_accordion)
+        course = modulestore().get_instance(course.id, course.location)  # pylint: disable=no-member
+        self.assertIsNotNone(course.get_children()[0].get_children()[0].due)
+        return course
 
-    def test_progress_due_date(self):
-        """
-        Tests the formatting of due dates in the progress page.
-        """
-        def get_progress():
-            """ Returns the HTML for the progress page """
-            return views.progress(request, "edX/due_date/2013_fall", self.user.id).content
+    def setUp(self):
+        self.request_factory = RequestFactory()
+        self.user = UserFactory.create()
+        self.request = self.request_factory.get("foo")
+        self.request.user = self.user
 
-        request = self.request_factory.get("foo")
-        self.verify_due_date(request, get_progress)
-
-    def verify_due_date(self, request, get_text):
-        """
-        Verifies that due dates are formatted properly in text returned by get_text function.
-        """
-        def set_show_timezone(show_timezone):
-            """
-            Sets the show_timezone property and returns value from get_text function.
-
-            Note that show_timezone is deprecated and cannot be set by the user.
-            """
-            course.show_timezone = show_timezone
-            course.save()
-            return get_text()
-
-        def set_due_date_format(due_date_format):
-            """
-            Sets the due_date_display_format property and returns value from get_text function.
-            """
-            course.due_date_display_format = due_date_format
-            course.save()
-            return get_text()
-
-        request.user = self.user
-        # Clear out the modulestores, so we start with the test course in its default state.
-        clear_existing_modulestores()
-        course = modulestore().get_course("edX/due_date/2013_fall")
-
-        time_with_utc = "due Sep 18, 2013 at 11:30 UTC"
-        time_without_utc = "due Sep 18, 2013 at 11:30"
+        self.time_with_utc = "due Sep 18, 2013 at 11:30 UTC"
+        self.time_without_utc = "due Sep 18, 2013 at 11:30"
 
+    def test_backwards_compatability(self):
         # The test course being used has show_timezone = False in the policy file
         # (and no due_date_display_format set). This is to test our backwards compatibility--
         # in course_module's init method, the date_display_format will be set accordingly to
         # remove the timezone.
-        text = get_text()
-        self.assertIn(time_without_utc, text)
-        self.assertNotIn(time_with_utc, text)
+        course = self.set_up_course(due_date_display_format=None, show_timezone=False)
+        text = self.get_text(course)
+        self.assertIn(self.time_without_utc, text)
+        self.assertNotIn(self.time_with_utc, text)
         # Test that show_timezone has been cleared (which means you get the default value of True).
         self.assertTrue(course.show_timezone)
 
-        # Clear out the due date format and verify you get the default (with timezone).
-        delattr(course, 'due_date_display_format')
-        course.save()
-        text = get_text()
-        self.assertIn(time_with_utc, text)
+    def test_defaults(self):
+        course = self.set_up_course()
+        text = self.get_text(course)
+        self.assertIn(self.time_with_utc, text)
 
+    def test_format_none(self):
         # Same for setting the due date to None
-        text = set_due_date_format(None)
-        self.assertIn(time_with_utc, text)
+        course = self.set_up_course(due_date_display_format=None)
+        text = self.get_text(course)
+        self.assertIn(self.time_with_utc, text)
 
+    def test_format_plain_text(self):
         # plain text due date
-        text = set_due_date_format("foobar")
-        self.assertNotIn(time_with_utc, text)
+        course = self.set_up_course(due_date_display_format="foobar")
+        text = self.get_text(course)
+        self.assertNotIn(self.time_with_utc, text)
         self.assertIn("due foobar", text)
 
+    def test_format_date(self):
+
         # due date with no time
-        text = set_due_date_format(u"%b %d %y")
-        self.assertNotIn(time_with_utc, text)
+        course = self.set_up_course(due_date_display_format=u"%b %d %y")
+        text = self.get_text(course)
+        self.assertNotIn(self.time_with_utc, text)
         self.assertIn("due Sep 18 13", text)
 
+    def test_format_hidden(self):
         # hide due date completely
-        text = set_due_date_format(u"")
+        course = self.set_up_course(due_date_display_format=u"")
+        text = self.get_text(course)
         self.assertNotIn("due ", text)
 
+    def test_format_invalid(self):
         # improperly formatted due_date_display_format falls through to default
         # (value of show_timezone does not matter-- setting to False to make that clear).
-        set_show_timezone(False)
-        text = set_due_date_format(u"%%%")
+        course = self.set_up_course(due_date_display_format=u"%%%", show_timezone=False)
+        text = self.get_text(course)
         self.assertNotIn("%%%", text)
-        self.assertIn(time_with_utc, text)
+        self.assertIn(self.time_with_utc, text)
+
+
+class TestProgressDueDate(BaseDueDateTests):
+    """
+    Test that the progress page displays due dates correctly
+    """
+    __test__ = True
+
+    def get_text(self, course):
+        """ Returns the HTML for the progress page """
+        return views.progress(self.request, course.id, self.user.id).content
+
+
+class TestAccordionDueDate(BaseDueDateTests):
+    """
+    Test that the accordion page displays due dates correctly
+    """
+    __test__ = True
+
+    def get_text(self, course):
+        """ Returns the HTML for the accordion """
+        return views.render_accordion(
+            self.request, course, course.get_children()[0].id, None, None
+        )
diff --git a/lms/djangoapps/courseware/tests/test_word_cloud.py b/lms/djangoapps/courseware/tests/test_word_cloud.py
index 6b01ae94f4..53e7c20850 100644
--- a/lms/djangoapps/courseware/tests/test_word_cloud.py
+++ b/lms/djangoapps/courseware/tests/test_word_cloud.py
@@ -242,10 +242,10 @@ class TestWordCloud(BaseTestXmodule):
 
     def test_word_cloud_constructor(self):
         """Make sure that all parameters extracted correclty from xml"""
-        fragment = self.runtime.render(self.item_module, None, 'student_view')
+        fragment = self.runtime.render(self.item_module, 'student_view')
 
         expected_context = {
-            'ajax_url': self.item_module.system.ajax_url,
+            'ajax_url': self.item_module.xmodule_runtime.ajax_url,
             'element_class': self.item_module.location.category,
             'element_id': self.item_module.location.html_id(),
             'num_inputs': 5,  # default value
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index c5489d3b30..75a8d8db1c 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -31,6 +31,7 @@ from django_comment_client.utils import get_discussion_title
 
 from student.models import UserTestGroup, CourseEnrollment
 from util.cache import cache, cache_if_anonymous
+from xblock.fragment import Fragment
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import InvalidLocationError, ItemNotFoundError, NoPathToItem
@@ -142,7 +143,7 @@ def redirect_to_course_position(course_module):
     the first child.
 
     """
-    urlargs = {'course_id': course_module.descriptor.id}
+    urlargs = {'course_id': course_module.id}
     chapter = get_current_child(course_module)
     if chapter is None:
         # oops.  Something bad has happened.
@@ -327,7 +328,7 @@ def index(request, course_id, chapter=None, section=None,
             'COURSE_TITLE': course.display_name_with_default,
             'course': course,
             'init': '',
-            'content': '',
+            'fragment': Fragment(),
             'staff_access': staff_access,
             'masquerade': masq,
             'xqa_server': settings.MITX_FEATURES.get('USE_XQA_SERVER', 'http://xqa:server@content-qa.mitx.mit.edu/xqa')
@@ -395,7 +396,7 @@ def index(request, course_id, chapter=None, section=None,
 
             # check here if this section *is* a timed module.
             if section_module.category == 'timelimit':
-                timer_context = update_timelimit_module(user, course_id, student_module_cache,
+                timer_context = update_timelimit_module(user, course_id, section_field_data_cache,
                                                         section_descriptor, section_module)
                 if 'timer_expiration_duration' in timer_context:
                     context.update(timer_context)
@@ -407,7 +408,7 @@ def index(request, course_id, chapter=None, section=None,
                 # add in the appropriate timer information to the rendering context:
                 context.update(check_for_active_timelimit_module(request, course_id, course))
 
-            context['content'] = section_module.runtime.render(section_module, None, 'student_view').content
+            context['fragment'] = section_module.render('student_view')
         else:
             # section is none, so display a message
             prev_section = get_current_child(chapter_module)
@@ -417,11 +418,15 @@ def index(request, course_id, chapter=None, section=None,
             prev_section_url = reverse('courseware_section', kwargs={'course_id': course_id,
                                                                      'chapter': chapter_descriptor.url_name,
                                                                      'section': prev_section.url_name})
-            context['content'] = render_to_string('courseware/welcome-back.html',
-                                                  {'course': course,
-                                                   'chapter_module': chapter_module,
-                                                   'prev_section': prev_section,
-                                                   'prev_section_url': prev_section_url})
+            context['fragment'] = Fragment(content=render_to_string(
+                'courseware/welcome-back.html',
+                {
+                    'course': course,
+                    'chapter_module': chapter_module,
+                    'prev_section': prev_section,
+                    'prev_section_url': prev_section_url
+                }
+            ))
 
         result = render_to_response('courseware/courseware.html', context)
     except Exception as e:
diff --git a/lms/djangoapps/django_comment_client/base/tests.py b/lms/djangoapps/django_comment_client/base/tests.py
index 45b4ecb5cc..53c8bd0ed3 100644
--- a/lms/djangoapps/django_comment_client/base/tests.py
+++ b/lms/djangoapps/django_comment_client/base/tests.py
@@ -87,14 +87,19 @@ class ViewsTestCase(UrlResetMixin, ModuleStoreTestCase):
                                                'course_id': self.course_id})
         response = self.client.post(url, data=thread)
         assert_true(mock_request.called)
-        mock_request.assert_called_with('post',
-                                        'http://localhost:4567/api/v1/i4x-MITx-999-course-Robot_Super_Course/threads',
-                                        data={'body': u'this is a post',
-                                        'anonymous_to_peers': False, 'user_id': 1,
-                                        'title': u'Hello',
-                                        'commentable_id': u'i4x-MITx-999-course-Robot_Super_Course',
-                                        'anonymous': False, 'course_id': u'MITx/999/Robot_Super_Course',
-                                        'api_key': 'PUT_YOUR_API_KEY_HERE'}, timeout=5)
+        mock_request.assert_called_with(
+            'post',
+            'http://localhost:4567/api/v1/i4x-MITx-999-course-Robot_Super_Course/threads',
+            data={
+                'body': u'this is a post',
+                'anonymous_to_peers': False, 'user_id': 1,
+                'title': u'Hello',
+                'commentable_id': u'i4x-MITx-999-course-Robot_Super_Course',
+                'anonymous': False, 'course_id': u'MITx/999/Robot_Super_Course',
+            },
+            headers={'X-Edx-Api-Key': 'PUT_YOUR_API_KEY_HERE'},
+            timeout=5
+        )
         assert_equal(response.status_code, 200)
 
     def test_flag_thread(self, mock_request):
@@ -123,9 +128,32 @@ class ViewsTestCase(UrlResetMixin, ModuleStoreTestCase):
         response = self.client.post(url)
         assert_true(mock_request.called)
 
-        call_list = [(('get', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d'), {'params': {'mark_as_read': True, 'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5}),
-                     (('put', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d/abuse_flag'), {'data': {'api_key': 'PUT_YOUR_API_KEY_HERE', 'user_id': '1'}, 'timeout': 5}),
-                     (('get', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d'), {'params': {'mark_as_read': True, 'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5})]
+        call_list = [
+            (
+                ('get', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d'),
+                {
+                    'params': {'mark_as_read': True},
+                    'headers': {'X-Edx-Api-Key': 'PUT_YOUR_API_KEY_HERE'},
+                    'timeout': 5
+                }
+            ),
+            (
+                ('put', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d/abuse_flag'),
+                {
+                    'data': {'user_id': '1'},
+                    'headers': {'X-Edx-Api-Key': 'PUT_YOUR_API_KEY_HERE'},
+                    'timeout': 5
+                }
+            ),
+            (
+                ('get', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d'),
+                {
+                    'params': {'mark_as_read': True},
+                    'headers': {'X-Edx-Api-Key': 'PUT_YOUR_API_KEY_HERE'},
+                    'timeout': 5
+                }
+            )
+        ]
 
         assert_equal(call_list, mock_request.call_args_list)
 
@@ -157,9 +185,32 @@ class ViewsTestCase(UrlResetMixin, ModuleStoreTestCase):
         response = self.client.post(url)
         assert_true(mock_request.called)
 
-        call_list = [(('get', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d'), {'params': {'mark_as_read': True, 'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5}),
-                     (('put', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d/abuse_unflag'), {'data': {'api_key': 'PUT_YOUR_API_KEY_HERE', 'user_id': '1'}, 'timeout': 5}),
-                     (('get', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d'), {'params': {'mark_as_read': True, 'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5})]
+        call_list = [
+            (
+                ('get', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d'),
+                {
+                    'params': {'mark_as_read': True},
+                    'headers': {'X-Edx-Api-Key': 'PUT_YOUR_API_KEY_HERE'},
+                    'timeout': 5
+                }
+            ),
+            (
+                ('put', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d/abuse_unflag'),
+                {
+                    'data': {'user_id': '1'},
+                    'headers': {'X-Edx-Api-Key': 'PUT_YOUR_API_KEY_HERE'},
+                    'timeout': 5
+                }
+            ),
+            (
+                ('get', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d'),
+                {
+                    'params': {'mark_as_read': True},
+                    'headers': {'X-Edx-Api-Key': 'PUT_YOUR_API_KEY_HERE'},
+                    'timeout': 5
+                }
+            )
+        ]
 
         assert_equal(call_list, mock_request.call_args_list)
 
@@ -187,9 +238,32 @@ class ViewsTestCase(UrlResetMixin, ModuleStoreTestCase):
         response = self.client.post(url)
         assert_true(mock_request.called)
 
-        call_list = [(('get', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d'), {'params': {'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5}),
-                     (('put', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d/abuse_flag'), {'data': {'api_key': 'PUT_YOUR_API_KEY_HERE', 'user_id': '1'}, 'timeout': 5}),
-                     (('get', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d'), {'params': {'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5})]
+        call_list = [
+            (
+                ('get', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d'),
+                {
+                    'params': {},
+                    'headers': {'X-Edx-Api-Key': 'PUT_YOUR_API_KEY_HERE'},
+                    'timeout': 5
+                }
+            ),
+            (
+                ('put', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d/abuse_flag'),
+                {
+                    'data': {'user_id': '1'},
+                    'headers': {'X-Edx-Api-Key': 'PUT_YOUR_API_KEY_HERE'},
+                    'timeout': 5
+                }
+            ),
+            (
+                ('get', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d'),
+                {
+                    'params': {},
+                    'headers': {'X-Edx-Api-Key': 'PUT_YOUR_API_KEY_HERE'},
+                    'timeout': 5
+                }
+            )
+        ]
 
         assert_equal(call_list, mock_request.call_args_list)
 
@@ -217,9 +291,32 @@ class ViewsTestCase(UrlResetMixin, ModuleStoreTestCase):
         response = self.client.post(url)
         assert_true(mock_request.called)
 
-        call_list = [(('get', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d'), {'params': {'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5}),
-                     (('put', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d/abuse_unflag'), {'data': {'api_key': 'PUT_YOUR_API_KEY_HERE', 'user_id': '1'}, 'timeout': 5}),
-                     (('get', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d'), {'params': {'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5})]
+        call_list = [
+            (
+                ('get', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d'),
+                {
+                    'params': {},
+                    'headers': {'X-Edx-Api-Key': 'PUT_YOUR_API_KEY_HERE'},
+                    'timeout': 5
+                }
+            ),
+            (
+                ('put', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d/abuse_unflag'),
+                {
+                    'data': {'user_id': '1'},
+                    'headers': {'X-Edx-Api-Key': 'PUT_YOUR_API_KEY_HERE'},
+                    'timeout': 5
+                }
+            ),
+            (
+                ('get', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d'),
+                {
+                    'params': {},
+                    'headers': {'X-Edx-Api-Key': 'PUT_YOUR_API_KEY_HERE'},
+                    'timeout': 5
+                }
+            )
+        ]
 
         assert_equal(call_list, mock_request.call_args_list)
 
diff --git a/lms/djangoapps/django_comment_client/forum/tests.py b/lms/djangoapps/django_comment_client/forum/tests.py
index 0fc5a14c70..aac03d54ce 100644
--- a/lms/djangoapps/django_comment_client/forum/tests.py
+++ b/lms/djangoapps/django_comment_client/forum/tests.py
@@ -65,7 +65,7 @@ class ViewsExceptionTestCase(UrlResetMixin, ModuleStoreTestCase):
         self.assertEqual(self.response.status_code, 404)
 
     @patch('student.models.cc.User.from_django_user')
-    @patch('student.models.cc.User.active_threads')
+    @patch('student.models.cc.User.subscribed_threads')
     def test_user_followed_threads_exception(self, mock_threads, mock_from_django_user):
 
         # Mock the code that makes the HTTP requests to the cs_comment_service app
diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py
index f18ecb24e8..148dbcdae2 100644
--- a/lms/djangoapps/django_comment_client/forum/views.py
+++ b/lms/djangoapps/django_comment_client/forum/views.py
@@ -115,11 +115,8 @@ def inline_discussion(request, course_id, discussion_id):
         cc_user = cc.User.from_django_user(request.user)
         user_info = cc_user.to_dict()
     except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError):
-        # TODO (vshnayder): since none of this code seems to be aware of the fact that
-        # sometimes things go wrong, I suspect that the js client is also not
-        # checking for errors on request.  Check and fix as needed.
         log.error("Error loading inline discussion threads.")
-        raise Http404
+        raise
 
     annotated_content_info = utils.get_metadata_for_threads(course_id, threads, request.user, user_info)
 
@@ -180,7 +177,7 @@ def forum_form_discussion(request, course_id):
         return render_to_response('discussion/maintenance.html', {})
     except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError) as err:
         log.error("Error loading forum discussion threads: %s", str(err))
-        raise Http404
+        raise
 
     user = cc.User.from_django_user(request.user)
     user_info = user.to_dict()
@@ -247,7 +244,7 @@ def single_thread(request, course_id, discussion_id, thread_id):
         thread = cc.Thread.find(thread_id).retrieve(recursive=True, user_id=request.user.id)
     except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError):
         log.error("Error loading single thread.")
-        raise Http404
+        raise
 
     if request.is_ajax():
         courseware_context = get_courseware_context(thread, course)
@@ -272,7 +269,7 @@ def single_thread(request, course_id, discussion_id, thread_id):
             threads.append(thread.to_dict())
         except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError):
             log.error("Error loading single thread.")
-            raise Http404
+            raise
 
         course = get_course_with_access(request.user, course_id, 'load_forum')
 
@@ -370,10 +367,11 @@ def user_profile(request, course_id, user_id):
             }
 
             return render_to_response('discussion/user_profile.html', context)
-    except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError, User.DoesNotExist):
+    except User.DoesNotExist:
         raise Http404
 
 
+@login_required
 def followed_threads(request, course_id, user_id):
     course = get_course_with_access(request.user, course_id, 'load_forum')
     try:
@@ -413,5 +411,5 @@ def followed_threads(request, course_id, user_id):
             }
 
             return render_to_response('discussion/user_profile.html', context)
-    except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError, User.DoesNotExist):
+    except User.DoesNotExist:
         raise Http404
diff --git a/lms/djangoapps/django_comment_client/middleware.py b/lms/djangoapps/django_comment_client/middleware.py
index b9efc1589e..7876631d9e 100644
--- a/lms/djangoapps/django_comment_client/middleware.py
+++ b/lms/djangoapps/django_comment_client/middleware.py
@@ -18,7 +18,7 @@ class AjaxExceptionMiddleware(object):
         """
         if isinstance(exception, CommentClientError) and request.is_ajax():
             try:
-                return JsonError(json.loads(exception.message))
+                return JsonError(json.loads(exception.message), 500)
             except ValueError:
-                return JsonError(exception.message)
+                return JsonError(exception.message, 500)
         return None
diff --git a/lms/djangoapps/django_comment_client/tests/mock_cs_server/mock_cs_server.py b/lms/djangoapps/django_comment_client/tests/mock_cs_server/mock_cs_server.py
index 367485effb..974f0e276e 100644
--- a/lms/djangoapps/django_comment_client/tests/mock_cs_server/mock_cs_server.py
+++ b/lms/djangoapps/django_comment_client/tests/mock_cs_server/mock_cs_server.py
@@ -27,7 +27,7 @@ class MockCommentServiceRequestHandler(BaseHTTPRequestHandler):
                     (json.dumps(post_dict), self.path))
 
         # Every good post has at least an API key
-        if 'api_key' in post_dict:
+        if 'X-Edx-Api-Key' in self.headers:
             response = self.server._response_str
             # Log the response
             logger.debug("Comment Service: sending response %s" % json.dumps(response))
@@ -62,7 +62,7 @@ class MockCommentServiceRequestHandler(BaseHTTPRequestHandler):
                     (json.dumps(post_dict), self.path))
 
         # Every good post has at least an API key
-        if 'api_key' in post_dict:
+        if 'X-Edx-Api-Key' in self.headers:
             response = self.server._response_str
             # Log the response
             logger.debug("Comment Service: sending response %s" % json.dumps(response))
diff --git a/lms/djangoapps/django_comment_client/tests/mock_cs_server/test_mock_cs_server.py b/lms/djangoapps/django_comment_client/tests/mock_cs_server/test_mock_cs_server.py
index 9b1977cbff..2b41d9428b 100644
--- a/lms/djangoapps/django_comment_client/tests/mock_cs_server/test_mock_cs_server.py
+++ b/lms/djangoapps/django_comment_client/tests/mock_cs_server/test_mock_cs_server.py
@@ -43,10 +43,10 @@ class MockCommentServiceServerTest(unittest.TestCase):
         of how you would create a new user
         """
         # Send a request
-        values = {'username': u'user100', 'api_key': 'TEST_API_KEY',
+        values = {'username': u'user100',
                   'external_id': '4', 'email': u'user100@edx.org'}
         data = json.dumps(values)
-        headers = {'Content-Type': 'application/json', 'Content-Length': len(data)}
+        headers = {'Content-Type': 'application/json', 'Content-Length': len(data), 'X-Edx-Api-Key': 'TEST_API_KEY'}
         req = urllib2.Request(self.server_url + '/api/v1/users/4', data, headers)
 
         # Send the request to the mock cs server
diff --git a/lms/djangoapps/django_comment_client/tests/test_middleware.py b/lms/djangoapps/django_comment_client/tests/test_middleware.py
index ab9517c160..54fcbd3c58 100644
--- a/lms/djangoapps/django_comment_client/tests/test_middleware.py
+++ b/lms/djangoapps/django_comment_client/tests/test_middleware.py
@@ -20,8 +20,14 @@ class AjaxExceptionTestCase(TestCase):
         self.request0.META['HTTP_X_REQUESTED_WITH'] = "SHADOWFAX"
 
     def test_process_exception(self):
-        self.assertIsInstance(self.a.process_exception(self.request1, self.exception1), middleware.JsonError)
-        self.assertIsInstance(self.a.process_exception(self.request1, self.exception2), middleware.JsonError)
+        response1 = self.a.process_exception(self.request1, self.exception1)
+        self.assertIsInstance(response1, middleware.JsonError)
+        self.assertEqual(500, response1.status_code)
+
+        response2 = self.a.process_exception(self.request1, self.exception2)
+        self.assertIsInstance(response2, middleware.JsonError)
+        self.assertEqual(500, response2.status_code)
+
         self.assertIsNone(self.a.process_exception(self.request1, self.exception0))
         self.assertIsNone(self.a.process_exception(self.request0, self.exception1))
         self.assertIsNone(self.a.process_exception(self.request0, self.exception0))
diff --git a/lms/djangoapps/instructor/features/bulk_email.feature b/lms/djangoapps/instructor/features/bulk_email.feature
new file mode 100644
index 0000000000..8d3784c1ea
--- /dev/null
+++ b/lms/djangoapps/instructor/features/bulk_email.feature
@@ -0,0 +1,20 @@
+@shard_2
+Feature: Bulk Email
+    As an instructor or course staff,
+    In order to communicate with students and staff
+    I want to send email to staff and students in a course.
+
+    Scenario: Send bulk email
+    Given I am "<Role>" for a course
+    When I send email to "<Recipient>"
+    Then Email is sent to "<Recipient>"
+
+    Examples:
+    | Role          |  Recipient     |
+    | instructor    |  myself        |
+    | instructor    |  course staff  |
+    | instructor    |  students, staff, and instructors  |
+    | staff         |  myself        |
+    | staff         |  course staff  |
+    | staff         |  students, staff, and instructors  |
+    
diff --git a/lms/djangoapps/instructor/features/bulk_email.py b/lms/djangoapps/instructor/features/bulk_email.py
new file mode 100644
index 0000000000..220ab9ecee
--- /dev/null
+++ b/lms/djangoapps/instructor/features/bulk_email.py
@@ -0,0 +1,162 @@
+"""
+Define steps for bulk email acceptance test.
+"""
+
+#pylint: disable=C0111
+#pylint: disable=W0621
+
+from lettuce import world, step
+from lettuce.django import mail
+from nose.tools import assert_in, assert_true, assert_equal  # pylint: disable=E0611
+from django.core.management import call_command
+from django.conf import settings
+
+
+@step(u'I am an instructor for a course')
+def i_am_an_instructor(step):  # pylint: disable=W0613
+
+    # Clear existing courses to avoid conflicts
+    world.clear_courses()
+
+    # Register the instructor as staff for the course
+    world.register_by_course_id(
+        'edx/999/Test_Course',
+        username='instructor',
+        password='password',
+        is_staff=True
+    )
+    world.add_to_course_staff('instructor', '999')
+
+    # Register another staff member
+    world.register_by_course_id(
+        'edx/999/Test_Course',
+        username='staff',
+        password='password',
+        is_staff=True
+    )
+    world.add_to_course_staff('staff', '999')
+
+    # Register a student
+    world.register_by_course_id(
+        'edx/999/Test_Course',
+        username='student',
+        password='password',
+        is_staff=False
+    )
+
+    # Log in as the instructor for the course
+    world.log_in(
+        username='instructor',
+        password='password',
+        email="instructor@edx.org",
+        name="Instructor"
+    )
+
+
+# Dictionary mapping a description of the email recipient
+# to the corresponding <option> value in the UI.
+SEND_TO_OPTIONS = {
+    'myself': 'myself',
+    'course staff': 'staff',
+    'students, staff, and instructors': 'all'
+}
+
+
+@step(u'I send email to "([^"]*)"')
+def when_i_send_an_email(recipient):
+
+    # Check that the recipient is valid
+    assert_in(
+        recipient, SEND_TO_OPTIONS,
+        msg="Invalid recipient: {}".format(recipient)
+    )
+
+    # Because we flush the database before each run,
+    # we need to ensure that the email template fixture
+    # is re-loaded into the database
+    call_command('loaddata', 'course_email_template.json')
+
+    # Go to the email section of the instructor dash
+    world.visit('/courses/edx/999/Test_Course')
+    world.css_click('a[href="/courses/edx/999/Test_Course/instructor"]')
+    world.css_click('div.beta-button-wrapper>a')
+    world.css_click('a[data-section="send_email"]')
+
+    # Select the recipient
+    world.select_option('send_to', SEND_TO_OPTIONS[recipient])
+
+    # Enter subject and message
+    world.css_fill('input#id_subject', 'Hello')
+
+    with world.browser.get_iframe('mce_0_ifr') as iframe:
+        editor = iframe.find_by_id('tinymce')[0]
+        editor.fill('test message')
+
+    # Click send
+    world.css_click('input[name="send"]')
+
+    # Expect to see a message that the email was sent
+    expected_msg = "Your email was successfully queued for sending."
+    assert_true(
+        world.css_has_text('div.request-response', expected_msg, '#request-response', allow_blank=False),
+        msg="Could not find email success message."
+    )
+
+
+# Dictionaries mapping description of email recipient
+# to the expected recipient email addresses
+EXPECTED_ADDRESSES = {
+    'myself': ['instructor@edx.org'],
+    'course staff': ['instructor@edx.org', 'staff@edx.org'],
+    'students, staff, and instructors': ['instructor@edx.org', 'staff@edx.org', 'student@edx.org']
+}
+
+UNSUBSCRIBE_MSG = 'To stop receiving email like this'
+
+
+@step(u'Email is sent to "([^"]*)"')
+def then_the_email_is_sent(recipient):
+
+    # Check that the recipient is valid
+    assert_in(
+        recipient, SEND_TO_OPTIONS,
+        msg="Invalid recipient: {}".format(recipient)
+    )
+
+    # Retrieve messages.  Because we are using celery in "always eager"
+    # mode, we expect all messages to be sent by this point.
+    messages = []
+    while not mail.queue.empty():  # pylint: disable=E1101
+        messages.append(mail.queue.get())  # pylint: disable=E1101
+
+    # Check that we got the right number of messages
+    assert_equal(
+        len(messages), len(EXPECTED_ADDRESSES[recipient]),
+        msg="Received {0} instead of {1} messages for {2}".format(
+            len(messages), len(EXPECTED_ADDRESSES[recipient]), recipient
+        )
+    )
+
+    # Check that the message properties were correct
+    recipients = []
+    for msg in messages:
+        assert_in('Hello', msg.subject)
+        assert_in(settings.DEFAULT_BULK_FROM_EMAIL, msg.from_email)
+
+        # Message body should have the message we sent
+        # and an unsubscribe message
+        assert_in('test message', msg.body)
+        assert_in(UNSUBSCRIBE_MSG, msg.body)
+
+        # Should have alternative HTML form
+        assert_equal(len(msg.alternatives), 1)
+        content = msg.alternatives[0]
+        assert_in('test message', content)
+        assert_in(UNSUBSCRIBE_MSG, content)
+
+        # Store the recipient address so we can verify later
+        recipients.extend(msg.recipients())
+
+    # Check that the messages were sent to the right people
+    for addr in EXPECTED_ADDRESSES[recipient]:
+        assert_in(addr, recipients)
diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py
index a32217ab30..693e832e5d 100644
--- a/lms/djangoapps/instructor/tests/test_api.py
+++ b/lms/djangoapps/instructor/tests/test_api.py
@@ -6,7 +6,6 @@ import unittest
 import json
 import requests
 from urllib import quote
-from django.conf import settings
 from django.test import TestCase
 from nose.tools import raises
 from mock import Mock, patch
@@ -125,6 +124,7 @@ class TestInstructorAPIDenyLevels(ModuleStoreTestCase, LoginEnrollmentTestCase):
             'list_forum_members',
             'update_forum_role_membership',
             'proxy_legacy_analytics',
+            'send_email',
         ]
         for endpoint in staff_level_endpoints:
             url = reverse(endpoint, kwargs={'course_id': self.course.id})
@@ -280,8 +280,8 @@ class TestInstructorAPILevelsAccess(ModuleStoreTestCase, LoginEnrollmentTestCase
     This test does NOT test whether the actions had an effect on the
     database, that is the job of test_access.
     This tests the response and action switch.
-    Actually, modify_access does not having a very meaningful
-        response yet, so only the status code is tested.
+    Actually, modify_access does not have a very meaningful
+    response yet, so only the status code is tested.
     """
     def setUp(self):
         self.instructor = AdminFactory.create()
@@ -691,7 +691,74 @@ class TestInstructorAPIRegradeTask(ModuleStoreTestCase, LoginEnrollmentTestCase)
         })
         print response.content
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(act.called)
+
+
+@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+class TestInstructorSendEmail(ModuleStoreTestCase, LoginEnrollmentTestCase):
+    """
+    Checks that only instructors have access to email endpoints, and that
+    these endpoints are only accessible with courses that actually exist,
+    only with valid email messages.
+    """
+    def setUp(self):
+        self.instructor = AdminFactory.create()
+        self.course = CourseFactory.create()
+        self.client.login(username=self.instructor.username, password='test')
+        test_subject = u'\u1234 test subject'
+        test_message = u'\u6824 test message'
+        self.full_test_message = {
+            'send_to': 'staff',
+            'subject': test_subject,
+            'message': test_message,
+        }
+
+    def test_send_email_as_logged_in_instructor(self):
+        url = reverse('send_email', kwargs={'course_id': self.course.id})
+        response = self.client.post(url, self.full_test_message)
+        self.assertEqual(response.status_code, 200)
+
+    def test_send_email_but_not_logged_in(self):
+        self.client.logout()
+        url = reverse('send_email', kwargs={'course_id': self.course.id})
+        response = self.client.post(url, self.full_test_message)
+        self.assertEqual(response.status_code, 403)
+
+    def test_send_email_but_not_staff(self):
+        self.client.logout()
+        student = UserFactory()
+        self.client.login(username=student.username, password='test')
+        url = reverse('send_email', kwargs={'course_id': self.course.id})
+        response = self.client.post(url, self.full_test_message)
+        self.assertEqual(response.status_code, 403)
+
+    def test_send_email_but_course_not_exist(self):
+        url = reverse('send_email', kwargs={'course_id': 'GarbageCourse/DNE/NoTerm'})
+        response = self.client.post(url, self.full_test_message)
+        self.assertNotEqual(response.status_code, 200)
+
+    def test_send_email_no_sendto(self):
+        url = reverse('send_email', kwargs={'course_id': self.course.id})
+        response = self.client.post(url, {
+            'subject': 'test subject',
+            'message': 'test message',
+        })
+        self.assertEqual(response.status_code, 400)
+
+    def test_send_email_no_subject(self):
+        url = reverse('send_email', kwargs={'course_id': self.course.id})
+        response = self.client.post(url, {
+            'send_to': 'staff',
+            'message': 'test message',
+        })
+        self.assertEqual(response.status_code, 400)
+
+    def test_send_email_no_message(self):
+        url = reverse('send_email', kwargs={'course_id': self.course.id})
+        response = self.client.post(url, {
+            'send_to': 'staff',
+            'subject': 'test subject',
+        })
+        self.assertEqual(response.status_code, 400)
 
 
 @override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
diff --git a/lms/djangoapps/instructor/tests/test_email.py b/lms/djangoapps/instructor/tests/test_email.py
new file mode 100644
index 0000000000..de8832a625
--- /dev/null
+++ b/lms/djangoapps/instructor/tests/test_email.py
@@ -0,0 +1,139 @@
+"""
+Unit tests for email feature flag in new instructor dashboard.
+Additionally tests that bulk email is always disabled for
+non-Mongo backed courses, regardless of email feature flag.
+"""
+
+from django.test.utils import override_settings
+from django.conf import settings
+from django.core.urlresolvers import reverse
+
+from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
+from student.tests.factories import AdminFactory
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
+from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+
+from mock import patch
+
+from bulk_email.models import CourseAuthorization
+
+
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
+class TestNewInstructorDashboardEmailViewMongoBacked(ModuleStoreTestCase):
+    """
+    Check for email view on the new instructor dashboard
+    for Mongo-backed courses
+    """
+    def setUp(self):
+        self.course = CourseFactory.create()
+
+        # Create instructor account
+        instructor = AdminFactory.create()
+        self.client.login(username=instructor.username, password="test")
+
+        # URL for instructor dash
+        self.url = reverse('instructor_dashboard_2', kwargs={'course_id': self.course.id})
+        # URL for email view
+        self.email_link = '<a href="" data-section="send_email">Email</a>'
+
+    def tearDown(self):
+        """
+        Undo all patches.
+        """
+        patch.stopall()
+
+    # In order for bulk email to work, we must have both the ENABLE_INSTRUCTOR_EMAIL_FLAG
+    # set to True and for the course to be Mongo-backed.
+    # The flag is enabled and the course is Mongo-backed (should work)
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': False})
+    def test_email_flag_true_mongo_true(self):
+        # Assert that instructor email is enabled for this course - since REQUIRE_COURSE_EMAIL_AUTH is False,
+        # all courses should be authorized to use email.
+        self.assertTrue(CourseAuthorization.instructor_email_enabled(self.course.id))
+        # Assert that the URL for the email view is in the response
+        response = self.client.get(self.url)
+        self.assertIn(self.email_link, response.content)
+
+        send_to_label = '<label for="id_to">Send to:</label>'
+        self.assertTrue(send_to_label in response.content)
+        self.assertEqual(response.status_code, 200)
+
+    # The course is Mongo-backed but the flag is disabled (should not work)
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': False})
+    def test_email_flag_false_mongo_true(self):
+        # Assert that the URL for the email view is not in the response
+        response = self.client.get(self.url)
+        self.assertFalse(self.email_link in response.content)
+
+    # Flag is enabled, but we require course auth and haven't turned it on for this course
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': True})
+    def test_course_not_authorized(self):
+        # Assert that instructor email is not enabled for this course
+        self.assertFalse(CourseAuthorization.instructor_email_enabled(self.course.id))
+        # Assert that the URL for the email view is not in the response
+        response = self.client.get(self.url)
+        self.assertFalse(self.email_link in response.content)
+
+    # Flag is enabled, we require course auth and turn it on for this course
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': True})
+    def test_course_authorized(self):
+        # Assert that instructor email is not enabled for this course
+        self.assertFalse(CourseAuthorization.instructor_email_enabled(self.course.id))
+        # Assert that the URL for the email view is not in the response
+        response = self.client.get(self.url)
+        self.assertFalse(self.email_link in response.content)
+
+        # Authorize the course to use email
+        cauth = CourseAuthorization(course_id=self.course.id, email_enabled=True)
+        cauth.save()
+
+        # Assert that instructor email is enabled for this course
+        self.assertTrue(CourseAuthorization.instructor_email_enabled(self.course.id))
+        # Assert that the URL for the email view is not in the response
+        response = self.client.get(self.url)
+        self.assertTrue(self.email_link in response.content)
+
+    # Flag is disabled, but course is authorized
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': False, 'REQUIRE_COURSE_EMAIL_AUTH': True})
+    def test_course_authorized_feature_off(self):
+        # Authorize the course to use email
+        cauth = CourseAuthorization(course_id=self.course.id, email_enabled=True)
+        cauth.save()
+
+        # Assert that instructor email IS enabled for this course
+        self.assertTrue(CourseAuthorization.instructor_email_enabled(self.course.id))
+        # Assert that the URL for the email view IS NOT in the response
+        response = self.client.get(self.url)
+        self.assertFalse(self.email_link in response.content)
+
+
+@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+class TestNewInstructorDashboardEmailViewXMLBacked(ModuleStoreTestCase):
+    """
+    Check for email view on the new instructor dashboard
+    """
+    def setUp(self):
+        self.course_name = 'edX/toy/2012_Fall'
+
+        # Create instructor account
+        instructor = AdminFactory.create()
+        self.client.login(username=instructor.username, password="test")
+
+        # URL for instructor dash
+        self.url = reverse('instructor_dashboard_2', kwargs={'course_id': self.course_name})
+        # URL for email view
+        self.email_link = '<a href="" data-section="send_email">Email</a>'
+
+    # The flag is enabled, and since REQUIRE_COURSE_EMAIL_AUTH is False, all courses should
+    # be authorized to use email. But the course is not Mongo-backed (should not work)
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': False})
+    def test_email_flag_true_mongo_false(self):
+        response = self.client.get(self.url)
+        self.assertFalse(self.email_link in response.content)
+
+    # The flag is disabled and the course is not Mongo-backed (should not work)
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': False, 'REQUIRE_COURSE_EMAIL_AUTH': False})
+    def test_email_flag_false_mongo_false(self):
+        response = self.client.get(self.url)
+        self.assertFalse(self.email_link in response.content)
diff --git a/lms/djangoapps/instructor/tests/test_legacy_email.py b/lms/djangoapps/instructor/tests/test_legacy_email.py
index d8761466b0..20b8271bdf 100644
--- a/lms/djangoapps/instructor/tests/test_legacy_email.py
+++ b/lms/djangoapps/instructor/tests/test_legacy_email.py
@@ -1,5 +1,5 @@
 """
-Unit tests for email feature flag in instructor dashboard
+Unit tests for email feature flag in legacy instructor dashboard
 and student dashboard. Additionally tests that bulk email
 is always disabled for non-Mongo backed courses, regardless
 of email feature flag.
@@ -41,7 +41,7 @@ class TestInstructorDashboardEmailView(ModuleStoreTestCase):
         """
         patch.stopall()
 
-    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True})
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': False})
     def test_email_flag_true(self):
         # Assert that the URL for the email view is in the response
         response = self.client.get(self.url)
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index e0b047604e..facf648580 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -9,7 +9,6 @@ Many of these GETs may become PUTs in the future.
 import re
 import logging
 import requests
-from collections import OrderedDict
 from django.conf import settings
 from django_future.csrf import ensure_csrf_cookie
 from django.views.decorators.cache import cache_control
@@ -40,6 +39,8 @@ import analytics.distributions
 import analytics.csvs
 import csv
 
+from bulk_email.models import CourseEmail
+
 log = logging.getLogger(__name__)
 
 
@@ -95,7 +96,44 @@ def require_query_params(*args, **kwargs):
             for (param, extra) in required_params:
                 default = object()
                 if request.GET.get(param, default) == default:
-                    error_response_data['parameters'] += [param]
+                    error_response_data['parameters'].append(param)
+                    error_response_data['info'][param] = extra
+
+            if len(error_response_data['parameters']) > 0:
+                return JsonResponse(error_response_data, status=400)
+            else:
+                return func(*args, **kwargs)
+        return wrapped
+    return decorator
+
+
+def require_post_params(*args, **kwargs):
+    """
+    Checks for required parameters or renders a 400 error.
+    (decorator with arguments)
+
+    Functions like 'require_query_params', but checks for
+    POST parameters rather than GET parameters.
+    """
+    required_params = []
+    required_params += [(arg, None) for arg in args]
+    required_params += [(key, kwargs[key]) for key in kwargs]
+    # required_params = e.g. [('action', 'enroll or unenroll'), ['emails', None]]
+
+    def decorator(func):  # pylint: disable=C0111
+        def wrapped(*args, **kwargs):  # pylint: disable=C0111
+            request = args[0]
+
+            error_response_data = {
+                'error': 'Missing required query parameter(s)',
+                'parameters': [],
+                'info': {},
+            }
+
+            for (param, extra) in required_params:
+                default = object()
+                if request.POST.get(param, default) == default:
+                    error_response_data['parameters'].append(param)
                     error_response_data['info'][param] = extra
 
             if len(error_response_data['parameters']) > 0:
@@ -397,7 +435,7 @@ def get_anon_ids(request, course_id):  # pylint: disable=W0613
     students = User.objects.filter(
         courseenrollment__course_id=course_id,
     ).order_by('id')
-    header =['User ID', 'Anonymized user ID']
+    header = ['User ID', 'Anonymized user ID']
     rows = [[s.id, unique_id_for_user(s)] for s in students]
     return csv_response(course_id.replace('/', '-') + '-anon-ids.csv', header, rows)
 
@@ -706,6 +744,36 @@ def list_forum_members(request, course_id):
     return JsonResponse(response_payload)
 
 
+@ensure_csrf_cookie
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+@require_level('staff')
+@require_post_params(send_to="sending to whom", subject="subject line", message="message text")
+def send_email(request, course_id):
+    """
+    Send an email to self, staff, or everyone involved in a course.
+    Query Parameters:
+    - 'send_to' specifies what group the email should be sent to
+       Options are defined by the CourseEmail model in
+       lms/djangoapps/bulk_email/models.py
+    - 'subject' specifies email's subject
+    - 'message' specifies email's content
+    """
+    send_to = request.POST.get("send_to")
+    subject = request.POST.get("subject")
+    message = request.POST.get("message")
+
+    # Create the CourseEmail object.  This is saved immediately, so that
+    # any transaction that has been pending up to this point will also be
+    # committed.
+    email = CourseEmail.create(course_id, request.user, send_to, subject, message)
+
+    # Submit the task, so that the correct InstructorTask object gets created (for monitoring purposes)
+    instructor_task.api.submit_bulk_course_email(request, course_id, email.id)  # pylint: disable=E1101
+
+    response_payload = {'course_id': course_id}
+    return JsonResponse(response_payload)
+
+
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
diff --git a/lms/djangoapps/instructor/views/api_urls.py b/lms/djangoapps/instructor/views/api_urls.py
index 07af69558f..79cdcf7e69 100644
--- a/lms/djangoapps/instructor/views/api_urls.py
+++ b/lms/djangoapps/instructor/views/api_urls.py
@@ -2,7 +2,6 @@
 Instructor API endpoint urls.
 """
 
-
 from django.conf.urls import patterns, url
 
 urlpatterns = patterns('',  # nopep8
@@ -34,4 +33,6 @@ urlpatterns = patterns('',  # nopep8
         'instructor.views.api.update_forum_role_membership', name="update_forum_role_membership"),
     url(r'^proxy_legacy_analytics$',
         'instructor.views.api.proxy_legacy_analytics', name="proxy_legacy_analytics"),
+    url(r'^send_email$',
+        'instructor.views.api.send_email', name="send_email")
 )
diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py
index 35f7257902..53921a4d70 100644
--- a/lms/djangoapps/instructor/views/instructor_dashboard.py
+++ b/lms/djangoapps/instructor/views/instructor_dashboard.py
@@ -11,13 +11,18 @@ from django.utils.html import escape
 from django.http import Http404
 from django.conf import settings
 
+from xmodule_modifiers import wrap_xmodule
+from xmodule.html_module import HtmlDescriptor
+from xmodule.modulestore import MONGO_MODULESTORE_TYPE
+from xmodule.modulestore.django import modulestore
+from xblock.field_data import DictFieldData
+from xblock.fields import ScopeIds
 from courseware.access import has_access
 from courseware.courses import get_course_by_id
 from django_comment_client.utils import has_forum_access
 from django_comment_common.models import FORUM_ROLE_ADMINISTRATOR
-from xmodule.modulestore.django import modulestore
 from student.models import CourseEnrollment
-
+from bulk_email.models import CourseAuthorization
 
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
@@ -25,6 +30,7 @@ def instructor_dashboard_2(request, course_id):
     """ Display the instructor dashboard for a course. """
 
     course = get_course_by_id(course_id, depth=None)
+    is_studio_course = (modulestore().get_modulestore_type(course_id) == MONGO_MODULESTORE_TYPE)
 
     access = {
         'admin': request.user.is_staff,
@@ -47,12 +53,15 @@ def instructor_dashboard_2(request, course_id):
     ]
 
     enrollment_count = sections[0]['enrollment_count']
-
     disable_buttons = False
     max_enrollment_for_buttons = settings.MITX_FEATURES.get("MAX_ENROLLMENT_INSTR_BUTTONS")
     if max_enrollment_for_buttons is not None:
         disable_buttons = enrollment_count > max_enrollment_for_buttons
 
+    # Gate access by feature flag & by course-specific authorization
+    if settings.MITX_FEATURES['ENABLE_INSTRUCTOR_EMAIL'] and \
+       is_studio_course and CourseAuthorization.instructor_email_enabled(course_id):
+        sections.append(_section_send_email(course_id, access, course))
 
     context = {
         'course': course,
@@ -131,6 +140,7 @@ def _section_student_admin(course_id, access):
         'section_display_name': _('Student Admin'),
         'access': access,
         'get_student_progress_url_url': reverse('get_student_progress_url', kwargs={'course_id': course_id}),
+        'enrollment_url': reverse('students_update_enrollment', kwargs={'course_id': course_id}),
         'reset_student_attempts_url': reverse('reset_student_attempts', kwargs={'course_id': course_id}),
         'rescore_problem_url': reverse('rescore_problem', kwargs={'course_id': course_id}),
         'list_instructor_tasks_url': reverse('list_instructor_tasks', kwargs={'course_id': course_id}),
@@ -150,6 +160,22 @@ def _section_data_download(course_id):
     return section_data
 
 
+def _section_send_email(course_id, access, course):
+    """ Provide data for the corresponding bulk email section """
+    html_module = HtmlDescriptor(course.system, DictFieldData({'data': ''}), ScopeIds(None, None, None, None))
+    fragment = course.system.render(html_module, 'studio_view')
+    fragment = wrap_xmodule('xmodule_edit.html', html_module, 'studio_view', fragment, None)
+    email_editor = fragment.content
+    section_data = {
+        'section_key': 'send_email',
+        'section_display_name': _('Email'),
+        'access': access,
+        'send_email': reverse('send_email', kwargs={'course_id': course_id}),
+        'editor': email_editor
+    }
+    return section_data
+
+
 def _section_analytics(course_id):
     """ Provide data for the corresponding dashboard section """
     section_data = {
diff --git a/lms/djangoapps/instructor/views/legacy.py b/lms/djangoapps/instructor/views/legacy.py
index 6d7e75baa4..0279c49d23 100644
--- a/lms/djangoapps/instructor/views/legacy.py
+++ b/lms/djangoapps/instructor/views/legacy.py
@@ -30,6 +30,7 @@ from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.html_module import HtmlDescriptor
 
+from bulk_email.models import CourseEmail, CourseAuthorization
 from courseware import grades
 from courseware.access import (has_access, get_access_group_name,
                                course_beta_test_group_name)
@@ -46,7 +47,8 @@ from instructor_task.api import (get_running_instructor_tasks,
                                  get_instructor_task_history,
                                  submit_rescore_problem_for_all_students,
                                  submit_rescore_problem_for_student,
-                                 submit_reset_problem_attempts_for_all_students)
+                                 submit_reset_problem_attempts_for_all_students,
+                                 submit_bulk_course_email)
 from instructor_task.views import get_task_completion_info
 from mitxmako.shortcuts import render_to_response
 from psychometrics import psychoanalyze
@@ -58,11 +60,6 @@ from xblock.field_data import DictFieldData
 from xblock.fields import ScopeIds
 from django.utils.translation import ugettext as _u
 
-from bulk_email.models import CourseEmail
-from html_to_text import html_to_text
-from bulk_email import tasks
-
-
 log = logging.getLogger(__name__)
 
 # internal commands for managing forum roles:
@@ -721,29 +718,24 @@ def instructor_dashboard(request, course_id):
         email_to_option = request.POST.get("to_option")
         email_subject = request.POST.get("subject")
         html_message = request.POST.get("message")
-        text_message = html_to_text(html_message)
 
-        email = CourseEmail(
-            course_id=course_id,
-            sender=request.user,
-            to_option=email_to_option,
-            subject=email_subject,
-            html_message=html_message,
-            text_message=text_message
-        )
+        # Create the CourseEmail object.  This is saved immediately, so that
+        # any transaction that has been pending up to this point will also be
+        # committed.
+        email = CourseEmail.create(course_id, request.user, email_to_option, email_subject, html_message)
 
-        email.save()
-
-        tasks.delegate_email_batches.delay(
-            email.id,
-            request.user.id
-        )
+        # Submit the task, so that the correct InstructorTask object gets created (for monitoring purposes)
+        submit_bulk_course_email(request, course_id, email.id)  # pylint: disable=E1101
 
         if email_to_option == "all":
             email_msg = '<div class="msg msg-confirm"><p class="copy">Your email was successfully queued for sending. Please note that for large public classes (~10k), it may take 1-2 hours to send all emails.</p></div>'
         else:
             email_msg = '<div class="msg msg-confirm"><p class="copy">Your email was successfully queued for sending.</p></div>'
 
+    elif "Show Background Email Task History" in action:
+        message, datatable = get_background_task_table(course_id, task_type='bulk_course_email')
+        msg += message
+
     #----------------------------------------
     # psychometrics
 
@@ -809,25 +801,27 @@ def instructor_dashboard(request, course_id):
     else:
         instructor_tasks = None
 
-    # determine if this is a studio-backed course so we can 1) provide a link to edit this course in studio
-    # 2) enable course email
+    # determine if this is a studio-backed course so we can provide a link to edit this course in studio
     is_studio_course = modulestore().get_modulestore_type(course_id) == MONGO_MODULESTORE_TYPE
 
-    email_editor = None
-    # HTML editor for email
-    if idash_mode == 'Email' and is_studio_course:
-        html_module = HtmlDescriptor(course.system, DictFieldData({'data': html_message}), ScopeIds(None, None, None, None))
-        fragment = course.system.render(html_module, None, 'studio_view')
-        fragment = wrap_xmodule('xmodule_edit.html', html_module, 'studio_view', fragment, None)
-        email_editor = fragment.content
-
     studio_url = None
     if is_studio_course:
         studio_url = get_cms_course_link_by_id(course_id)
 
-    # Flag for whether or not we display the email tab (depending upon
-    # what backing store this course using (Mongo vs. XML))
-    if settings.MITX_FEATURES['ENABLE_INSTRUCTOR_EMAIL'] and is_studio_course:
+    email_editor = None
+    # HTML editor for email
+    if idash_mode == 'Email' and is_studio_course:
+        html_module = HtmlDescriptor(course.system, DictFieldData({'data': html_message}), ScopeIds(None, None, None, None))
+        fragment = course.system.render(html_module, 'studio_view')
+        fragment = wrap_xmodule('xmodule_edit.html', html_module, 'studio_view', fragment, None)
+        email_editor = fragment.content
+
+    # Enable instructor email only if the following conditions are met:
+    # 1. Feature flag is on
+    # 2. We have explicitly enabled email for the given course via django-admin
+    # 3. It is NOT an XML course
+    if settings.MITX_FEATURES['ENABLE_INSTRUCTOR_EMAIL'] and \
+       CourseAuthorization.instructor_email_enabled(course_id) and is_studio_course:
         show_email_tab = True
 
     # display course stats only if there is no other table to display:
@@ -878,6 +872,7 @@ def instructor_dashboard(request, course_id):
 
     return render_to_response('courseware/instructor_dashboard.html', context)
 
+
 def _do_remote_gradebook(user, course, action, args=None, files=None):
     '''
     Perform remote gradebook action.  Returns msg, datatable.
@@ -1528,7 +1523,7 @@ def dump_grading_context(course):
     return msg
 
 
-def get_background_task_table(course_id, problem_url, student=None):
+def get_background_task_table(course_id, problem_url=None, student=None, task_type=None):
     """
     Construct the "datatable" structure to represent background task history.
 
@@ -1539,14 +1534,16 @@ def get_background_task_table(course_id, problem_url, student=None):
     Returns a tuple of (msg, datatable), where the msg is a possible error message,
     and the datatable is the datatable to be used for display.
     """
-    history_entries = get_instructor_task_history(course_id, problem_url, student)
+    history_entries = get_instructor_task_history(course_id, problem_url, student, task_type)
     datatable = {}
     msg = ""
     # first check to see if there is any history at all
     # (note that we don't have to check that the arguments are valid; it
     # just won't find any entries.)
     if (history_entries.count()) == 0:
-        if student is not None:
+        if problem_url is None:
+            msg += '<font color="red">Failed to find any background tasks for course "{course}".</font>'.format(course=course_id)
+        elif student is not None:
             template = '<font color="red">Failed to find any background tasks for course "{course}", module "{problem}" and student "{student}".</font>'
             msg += template.format(course=course_id, problem=problem_url, student=student.username)
         else:
@@ -1583,7 +1580,9 @@ def get_background_task_table(course_id, problem_url, student=None):
                    task_message]
             datatable['data'].append(row)
 
-        if student is not None:
+        if problem_url is None:
+            datatable['title'] = "{course_id}".format(course_id=course_id)
+        elif student is not None:
             datatable['title'] = "{course_id} > {location} > {student}".format(course_id=course_id,
                                                                                location=problem_url,
                                                                                student=student.username)
diff --git a/lms/djangoapps/instructor_task/api.py b/lms/djangoapps/instructor_task/api.py
index bd3c5e033a..7521a8eb3a 100644
--- a/lms/djangoapps/instructor_task/api.py
+++ b/lms/djangoapps/instructor_task/api.py
@@ -6,6 +6,7 @@ already been submitted, filtered either by running state or input
 arguments.
 
 """
+import hashlib
 
 from celery.states import READY_STATES
 
@@ -14,11 +15,13 @@ from xmodule.modulestore.django import modulestore
 from instructor_task.models import InstructorTask
 from instructor_task.tasks import (rescore_problem,
                                    reset_problem_attempts,
-                                   delete_problem_state)
+                                   delete_problem_state,
+                                   send_bulk_course_email)
 
 from instructor_task.api_helper import (check_arguments_for_rescoring,
                                         encode_problem_and_student_input,
                                         submit_task)
+from bulk_email.models import CourseEmail
 
 
 def get_running_instructor_tasks(course_id):
@@ -34,14 +37,18 @@ def get_running_instructor_tasks(course_id):
     return instructor_tasks.order_by('-id')
 
 
-def get_instructor_task_history(course_id, problem_url, student=None):
+def get_instructor_task_history(course_id, problem_url=None, student=None, task_type=None):
     """
     Returns a query of InstructorTask objects of historical tasks for a given course,
-    that match a particular problem and optionally a student.
+    that optionally match a particular problem, a student, and/or a task type.
     """
-    _, task_key = encode_problem_and_student_input(problem_url, student)
+    instructor_tasks = InstructorTask.objects.filter(course_id=course_id)
+    if problem_url is not None or student is not None:
+        _, task_key = encode_problem_and_student_input(problem_url, student)
+        instructor_tasks = instructor_tasks.filter(task_key=task_key)
+    if task_type is not None:
+        instructor_tasks = instructor_tasks.filter(task_type=task_type)
 
-    instructor_tasks = InstructorTask.objects.filter(course_id=course_id, task_key=task_key)
     return instructor_tasks.order_by('-id')
 
 
@@ -162,3 +169,40 @@ def submit_delete_problem_state_for_all_students(request, course_id, problem_url
     task_class = delete_problem_state
     task_input, task_key = encode_problem_and_student_input(problem_url)
     return submit_task(request, task_type, task_class, course_id, task_input, task_key)
+
+
+def submit_bulk_course_email(request, course_id, email_id):
+    """
+    Request to have bulk email sent as a background task.
+
+    The specified CourseEmail object will be sent be updated for all students who have enrolled
+    in a course.  Parameters are the `course_id` and the `email_id`, the id of the CourseEmail object.
+
+    AlreadyRunningError is raised if the same recipients are already being emailed with the same
+    CourseEmail object.
+
+    This method makes sure the InstructorTask entry is committed.
+    When called from any view that is wrapped by TransactionMiddleware,
+    and thus in a "commit-on-success" transaction, an autocommit buried within here
+    will cause any pending transaction to be committed by a successful
+    save here.  Any future database operations will take place in a
+    separate transaction.
+    """
+    # Assume that the course is defined, and that the user has already been verified to have
+    # appropriate access to the course. But make sure that the email exists.
+    # We also pull out the To argument here, so that is displayed in
+    # the InstructorTask status.
+    email_obj = CourseEmail.objects.get(id=email_id)
+    to_option = email_obj.to_option
+
+    task_type = 'bulk_course_email'
+    task_class = send_bulk_course_email
+    # Pass in the to_option as a separate argument, even though it's (currently)
+    # in the CourseEmail.  That way it's visible in the progress status.
+    # (At some point in the future, we might take the recipient out of the CourseEmail,
+    # so that the same saved email can be sent to different recipients, as it is tested.)
+    task_input = {'email_id': email_id, 'to_option': to_option}
+    task_key_stub = "{email_id}_{to_option}".format(email_id=email_id, to_option=to_option)
+    # create the key value by using MD5 hash:
+    task_key = hashlib.md5(task_key_stub).hexdigest()
+    return submit_task(request, task_type, task_class, course_id, task_input, task_key)
diff --git a/lms/djangoapps/instructor_task/api_helper.py b/lms/djangoapps/instructor_task/api_helper.py
index 2795fd08c1..37a9852caa 100644
--- a/lms/djangoapps/instructor_task/api_helper.py
+++ b/lms/djangoapps/instructor_task/api_helper.py
@@ -58,13 +58,14 @@ def _reserve_task(course_id, task_type, task_key, task_input, requester):
     return InstructorTask.create(course_id, task_type, task_key, task_input, requester)
 
 
-def _get_xmodule_instance_args(request):
+def _get_xmodule_instance_args(request, task_id):
     """
     Calculate parameters needed for instantiating xmodule instances.
 
     The `request_info` will be passed to a tracking log function, to provide information
     about the source of the task request.   The `xqueue_callback_url_prefix` is used to
     permit old-style xqueue callbacks directly to the appropriate module in the LMS.
+    The `task_id` is also passed to the tracking log function.
     """
     request_info = {'username': request.user.username,
                     'ip': request.META['REMOTE_ADDR'],
@@ -74,6 +75,7 @@ def _get_xmodule_instance_args(request):
 
     xmodule_instance_args = {'xqueue_callback_url_prefix': get_xqueue_callback_url_prefix(request),
                              'request_info': request_info,
+                             'task_id': task_id,
                              }
     return xmodule_instance_args
 
@@ -88,10 +90,16 @@ def _update_instructor_task(instructor_task, task_result):
     is usually not saved.  In general, tasks that have finished (either with
     success or failure) should have their entries updated by the task itself,
     so are not updated here.  Tasks that are still running are not updated
-    while they run.  So the one exception to the no-save rule are tasks that
+    and saved while they run.  The one exception to the no-save rule are tasks that
     are in a "revoked" state.  This may mean that the task never had the
     opportunity to update the InstructorTask entry.
 
+    Tasks that are in progress and have subtasks doing the processing do not look
+    to the task's AsyncResult object.  When subtasks are running, the
+    InstructorTask object itself is updated with the subtasks' progress,
+    not any AsyncResult object.  In this case, the InstructorTask is
+    not updated at all.
+
     Calculates json to store in "task_output" field of the `instructor_task`,
     as well as updating the task_state.
 
@@ -108,11 +116,21 @@ def _update_instructor_task(instructor_task, task_result):
     returned_result = task_result.result
     result_traceback = task_result.traceback
 
-    # Assume we don't always update the InstructorTask entry if we don't have to:
+    # Assume we don't always save the InstructorTask entry if we don't have to,
+    # but that in most cases we will update the InstructorTask in-place with its
+    # current progress.
+    entry_needs_updating = True
     entry_needs_saving = False
     task_output = None
 
-    if result_state in [PROGRESS, SUCCESS]:
+    if instructor_task.task_state == PROGRESS and len(instructor_task.subtasks) > 0:
+        # This happens when running subtasks:  the result object is marked with SUCCESS,
+        # meaning that the subtasks have successfully been defined.  However, the InstructorTask
+        # will be marked as in PROGRESS, until the last subtask completes and marks it as SUCCESS.
+        # We want to ignore the parent SUCCESS if subtasks are still running, and just trust the
+        # contents of the InstructorTask.
+        entry_needs_updating = False
+    elif result_state in [PROGRESS, SUCCESS]:
         # construct a status message directly from the task result's result:
         # it needs to go back with the entry passed in.
         log.info("background task (%s), state %s:  result: %s", task_id, result_state, returned_result)
@@ -134,12 +152,13 @@ def _update_instructor_task(instructor_task, task_result):
     # save progress and state into the entry, even if it's not being saved:
     # when celery is run in "ALWAYS_EAGER" mode, progress needs to go back
     # with the entry passed in.
-    instructor_task.task_state = result_state
-    if task_output is not None:
-        instructor_task.task_output = task_output
+    if entry_needs_updating:
+        instructor_task.task_state = result_state
+        if task_output is not None:
+            instructor_task.task_output = task_output
 
-    if entry_needs_saving:
-        instructor_task.save()
+        if entry_needs_saving:
+            instructor_task.save()
 
 
 def get_updated_instructor_task(task_id):
@@ -175,7 +194,7 @@ def get_status_from_instructor_task(instructor_task):
       'in_progress': boolean indicating if task is still running.
       'task_progress': dict containing progress information.  This includes:
           'attempted': number of attempts made
-          'updated': number of attempts that "succeeded"
+          'succeeded': number of attempts that "succeeded"
           'total': number of possible subtasks to attempt
           'action_name': user-visible verb to use in status messages.  Should be past-tense.
           'duration_ms': how long the task has (or had) been running.
@@ -214,7 +233,7 @@ def check_arguments_for_rescoring(course_id, problem_url):
 
 def encode_problem_and_student_input(problem_url, student=None):
     """
-    Encode problem_url and optional student into task_key and task_input values.
+    Encode optional problem_url and optional student into task_key and task_input values.
 
     `problem_url` is full URL of the problem.
     `student` is the user object of the student
@@ -257,7 +276,7 @@ def submit_task(request, task_type, task_class, course_id, task_input, task_key)
 
     # submit task:
     task_id = instructor_task.task_id
-    task_args = [instructor_task.id, _get_xmodule_instance_args(request)]
+    task_args = [instructor_task.id, _get_xmodule_instance_args(request, task_id)]  # pylint: disable=E1101
     task_class.apply_async(task_args, task_id=task_id)
 
     return instructor_task
diff --git a/lms/djangoapps/instructor_task/migrations/0002_add_subtask_field.py b/lms/djangoapps/instructor_task/migrations/0002_add_subtask_field.py
new file mode 100644
index 0000000000..845dffd856
--- /dev/null
+++ b/lms/djangoapps/instructor_task/migrations/0002_add_subtask_field.py
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'InstructorTask.subtasks'
+        db.add_column('instructor_task_instructortask', 'subtasks',
+                      self.gf('django.db.models.fields.TextField')(default='', blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'InstructorTask.subtasks'
+        db.delete_column('instructor_task_instructortask', 'subtasks')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'instructor_task.instructortask': {
+            'Meta': {'object_name': 'InstructorTask'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'requester': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'subtasks': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'task_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'task_input': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'task_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'task_output': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True'}),
+            'task_state': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'db_index': 'True'}),
+            'task_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['instructor_task']
\ No newline at end of file
diff --git a/lms/djangoapps/instructor_task/models.py b/lms/djangoapps/instructor_task/models.py
index b28a9a3d83..8d6376fae3 100644
--- a/lms/djangoapps/instructor_task/models.py
+++ b/lms/djangoapps/instructor_task/models.py
@@ -56,6 +56,7 @@ class InstructorTask(models.Model):
     requester = models.ForeignKey(User, db_index=True)
     created = models.DateTimeField(auto_now_add=True, null=True)
     updated = models.DateTimeField(auto_now=True)
+    subtasks = models.TextField(blank=True)  # JSON dictionary
 
     def __repr__(self):
         return 'InstructorTask<%r>' % ({
diff --git a/lms/djangoapps/instructor_task/subtasks.py b/lms/djangoapps/instructor_task/subtasks.py
new file mode 100644
index 0000000000..175cf084a5
--- /dev/null
+++ b/lms/djangoapps/instructor_task/subtasks.py
@@ -0,0 +1,270 @@
+"""
+This module contains celery task functions for handling the management of subtasks.
+"""
+from time import time
+import json
+
+from celery.utils.log import get_task_logger
+from celery.states import SUCCESS, READY_STATES
+
+from django.db import transaction
+
+from instructor_task.models import InstructorTask, PROGRESS, QUEUING
+
+TASK_LOG = get_task_logger(__name__)
+
+
+def create_subtask_status(task_id, succeeded=0, failed=0, skipped=0, retried_nomax=0, retried_withmax=0, state=None):
+    """
+    Create and return a dict for tracking the status of a subtask.
+
+    Subtask status keys are:
+
+      'task_id' : id of subtask.  This is used to pass task information across retries.
+      'attempted' : number of attempts -- should equal succeeded plus failed
+      'succeeded' : number that succeeded in processing
+      'skipped' : number that were not processed.
+      'failed' : number that failed during processing
+      'retried_nomax' : number of times the subtask has been retried for conditions that
+          should not have a maximum count applied
+      'retried_withmax' : number of times the subtask has been retried for conditions that
+          should have a maximum count applied
+      'state' : celery state of the subtask (e.g. QUEUING, PROGRESS, RETRY, FAILURE, SUCCESS)
+
+    Object must be JSON-serializable, so that it can be passed as an argument
+    to tasks.
+
+    In future, we may want to include specific error information
+    indicating the reason for failure.
+    Also, we should count up "not attempted" separately from attempted/failed.
+    """
+    attempted = succeeded + failed
+    current_result = {
+        'task_id': task_id,
+        'attempted': attempted,
+        'succeeded': succeeded,
+        'skipped': skipped,
+        'failed': failed,
+        'retried_nomax': retried_nomax,
+        'retried_withmax': retried_withmax,
+        'state': state if state is not None else QUEUING,
+    }
+    return current_result
+
+
+def increment_subtask_status(subtask_result, succeeded=0, failed=0, skipped=0, retried_nomax=0, retried_withmax=0, state=None):
+    """
+    Update the result of a subtask with additional results.
+
+    Create and return a dict for tracking the status of a subtask.
+
+    Keys for input `subtask_result` and returned subtask_status are:
+
+      'task_id' : id of subtask.  This is used to pass task information across retries.
+      'attempted' : number of attempts -- should equal succeeded plus failed
+      'succeeded' : number that succeeded in processing
+      'skipped' : number that were not processed.
+      'failed' : number that failed during processing
+      'retried_nomax' : number of times the subtask has been retried for conditions that
+          should not have a maximum count applied
+      'retried_withmax' : number of times the subtask has been retried for conditions that
+          should have a maximum count applied
+      'state' : celery state of the subtask (e.g. QUEUING, PROGRESS, RETRY, FAILURE, SUCCESS)
+
+    Kwarg arguments are incremented to the corresponding key in `subtask_result`.
+    The exception is for `state`, which if specified is used to override the existing value.
+    """
+    new_result = dict(subtask_result)
+    new_result['attempted'] += (succeeded + failed)
+    new_result['succeeded'] += succeeded
+    new_result['failed'] += failed
+    new_result['skipped'] += skipped
+    new_result['retried_nomax'] += retried_nomax
+    new_result['retried_withmax'] += retried_withmax
+    if state is not None:
+        new_result['state'] = state
+
+    return new_result
+
+
+def initialize_subtask_info(entry, action_name, total_num, subtask_id_list):
+    """
+    Store initial subtask information to InstructorTask object.
+
+    The InstructorTask's "task_output" field is initialized.  This is a JSON-serialized dict.
+    Counters for 'attempted', 'succeeded', 'failed', 'skipped' keys are initialized to zero,
+    as is the 'duration_ms' value.  A 'start_time' is stored for later duration calculations,
+    and the total number of "things to do" is set, so the user can be told how much needs to be
+    done overall.  The `action_name` is also stored, to help with constructing more readable
+    task_progress messages.
+
+    The InstructorTask's "subtasks" field is also initialized.  This is also a JSON-serialized dict.
+    Keys include 'total', 'succeeded', 'retried', 'failed', which are counters for the number of
+    subtasks.  'Total' is set here to the total number, while the other three are initialized to zero.
+    Once the counters for 'succeeded' and 'failed' match the 'total', the subtasks are done and
+    the InstructorTask's "status" will be changed to SUCCESS.
+
+    The "subtasks" field also contains a 'status' key, that contains a dict that stores status
+    information for each subtask.  The value for each subtask (keyed by its task_id)
+    is its subtask status, as defined by create_subtask_status().
+
+    This information needs to be set up in the InstructorTask before any of the subtasks start
+    running.  If not, there is a chance that the subtasks could complete before the parent task
+    is done creating subtasks.  Doing so also simplifies the save() here, as it avoids the need
+    for locking.
+
+    Monitoring code should assume that if an InstructorTask has subtask information, that it should
+    rely on the status stored in the InstructorTask object, rather than status stored in the
+    corresponding AsyncResult.
+    """
+    task_progress = {
+        'action_name': action_name,
+        'attempted': 0,
+        'failed': 0,
+        'skipped': 0,
+        'succeeded': 0,
+        'total': total_num,
+        'duration_ms': int(0),
+        'start_time': time()
+    }
+    entry.task_output = InstructorTask.create_output_for_success(task_progress)
+    entry.task_state = PROGRESS
+
+    # Write out the subtasks information.
+    num_subtasks = len(subtask_id_list)
+    # Note that may not be necessary to store initial value with all those zeroes!
+    subtask_status = {subtask_id: create_subtask_status(subtask_id) for subtask_id in subtask_id_list}
+    subtask_dict = {
+        'total': num_subtasks,
+        'succeeded': 0,
+        'failed': 0,
+        'status': subtask_status
+    }
+    entry.subtasks = json.dumps(subtask_dict)
+
+    # and save the entry immediately, before any subtasks actually start work:
+    entry.save_now()
+    return task_progress
+
+
+def check_subtask_is_valid(entry_id, current_task_id):
+    """
+    Confirms that the current subtask is known to the InstructorTask.
+
+    This may happen if a task that spawns subtasks is called twice with
+    the same task_id and InstructorTask entry_id.  The set of subtasks
+    that are recorded in the InstructorTask from the first call get clobbered
+    by the the second set of subtasks.  So when the first set of subtasks
+    actually run, they won't be found in the InstructorTask.
+
+    Raises a ValueError exception if not.
+    """
+    entry = InstructorTask.objects.get(pk=entry_id)
+    if len(entry.subtasks) == 0:
+        format_str = "Unexpected task_id '{}': unable to find email subtasks of instructor task '{}'"
+        msg = format_str.format(current_task_id, entry)
+        TASK_LOG.warning(msg)
+        raise ValueError(msg)
+
+    subtask_dict = json.loads(entry.subtasks)
+    subtask_status_info = subtask_dict['status']
+    if current_task_id not in subtask_status_info:
+        format_str = "Unexpected task_id '{}': unable to find status for email subtask of instructor task '{}'"
+        msg = format_str.format(current_task_id, entry)
+        TASK_LOG.warning(msg)
+        raise ValueError(msg)
+
+
+@transaction.commit_manually
+def update_subtask_status(entry_id, current_task_id, new_subtask_status):
+    """
+    Update the status of the subtask in the parent InstructorTask object tracking its progress.
+
+    Uses select_for_update to lock the InstructorTask object while it is being updated.
+    The operation is surrounded by a try/except/else that permit the manual transaction to be
+    committed on completion, or rolled back on error.
+
+    The InstructorTask's "task_output" field is updated.  This is a JSON-serialized dict.
+    Accumulates values for 'attempted', 'succeeded', 'failed', 'skipped' from `new_subtask_status`
+    into the corresponding values in the InstructorTask's task_output.  Also updates the 'duration_ms'
+    value with the current interval since the original InstructorTask started.  Note that this
+    value is only approximate, since the subtask may be running on a different server than the
+    original task, so is subject to clock skew.
+
+    The InstructorTask's "subtasks" field is also updated.  This is also a JSON-serialized dict.
+    Keys include 'total', 'succeeded', 'retried', 'failed', which are counters for the number of
+    subtasks.  'Total' is expected to have been set at the time the subtasks were created.
+    The other three counters are incremented depending on the value of `status`.  Once the counters
+    for 'succeeded' and 'failed' match the 'total', the subtasks are done and the InstructorTask's
+    "status" is changed to SUCCESS.
+
+    The "subtasks" field also contains a 'status' key, that contains a dict that stores status
+    information for each subtask.  At the moment, the value for each subtask (keyed by its task_id)
+    is the value of `status`, but could be expanded in future to store information about failure
+    messages, progress made, etc.
+    """
+    TASK_LOG.info("Preparing to update status for email subtask %s for instructor task %d with status %s",
+                  current_task_id, entry_id, new_subtask_status)
+
+    try:
+        entry = InstructorTask.objects.select_for_update().get(pk=entry_id)
+        subtask_dict = json.loads(entry.subtasks)
+        subtask_status_info = subtask_dict['status']
+        if current_task_id not in subtask_status_info:
+            # unexpected error -- raise an exception
+            format_str = "Unexpected task_id '{}': unable to update status for email subtask of instructor task '{}'"
+            msg = format_str.format(current_task_id, entry_id)
+            TASK_LOG.warning(msg)
+            raise ValueError(msg)
+
+        # Update status:
+        subtask_status_info[current_task_id] = new_subtask_status
+
+        # Update the parent task progress.
+        # Set the estimate of duration, but only if it
+        # increases.  Clock skew between time() returned by different machines
+        # may result in non-monotonic values for duration.
+        task_progress = json.loads(entry.task_output)
+        start_time = task_progress['start_time']
+        prev_duration = task_progress['duration_ms']
+        new_duration = int((time() - start_time) * 1000)
+        task_progress['duration_ms'] = max(prev_duration, new_duration)
+
+        # Update counts only when subtask is done.
+        # In future, we can make this more responsive by updating status
+        # between retries, by comparing counts that change from previous
+        # retry.
+        new_state = new_subtask_status['state']
+        if new_subtask_status is not None and new_state in READY_STATES:
+            for statname in ['attempted', 'succeeded', 'failed', 'skipped']:
+                task_progress[statname] += new_subtask_status[statname]
+
+        # Figure out if we're actually done (i.e. this is the last task to complete).
+        # This is easier if we just maintain a counter, rather than scanning the
+        # entire new_subtask_status dict.
+        if new_state == SUCCESS:
+            subtask_dict['succeeded'] += 1
+        elif new_state in READY_STATES:
+            subtask_dict['failed'] += 1
+        num_remaining = subtask_dict['total'] - subtask_dict['succeeded'] - subtask_dict['failed']
+
+        # If we're done with the last task, update the parent status to indicate that.
+        # At present, we mark the task as having succeeded.  In future, we should see
+        # if there was a catastrophic failure that occurred, and figure out how to
+        # report that here.
+        if num_remaining <= 0:
+            entry.task_state = SUCCESS
+        entry.subtasks = json.dumps(subtask_dict)
+        entry.task_output = InstructorTask.create_output_for_success(task_progress)
+
+        TASK_LOG.info("Task output updated to %s for email subtask %s of instructor task %d",
+                      entry.task_output, current_task_id, entry_id)
+        TASK_LOG.debug("about to save....")
+        entry.save()
+    except Exception:
+        TASK_LOG.exception("Unexpected error while updating InstructorTask.")
+        transaction.rollback()
+        raise
+    else:
+        TASK_LOG.debug("about to commit....")
+        transaction.commit()
diff --git a/lms/djangoapps/instructor_task/tasks.py b/lms/djangoapps/instructor_task/tasks.py
index b045de470a..f30ffe3af2 100644
--- a/lms/djangoapps/instructor_task/tasks.py
+++ b/lms/djangoapps/instructor_task/tasks.py
@@ -19,14 +19,21 @@ a problem URL and optionally a student.  These are used to set up the initial va
 of the query for traversing StudentModule objects.
 
 """
+from django.utils.translation import ugettext_noop
 from celery import task
-from instructor_task.tasks_helper import (update_problem_module_state,
-                                          rescore_problem_module_state,
-                                          reset_attempts_module_state,
-                                          delete_problem_module_state)
+from functools import partial
+from instructor_task.tasks_helper import (
+    run_main_task,
+    BaseInstructorTask,
+    perform_module_state_update,
+    rescore_problem_module_state,
+    reset_attempts_module_state,
+    delete_problem_module_state,
+)
+from bulk_email.tasks import perform_delegate_email_batches
 
 
-@task
+@task(base=BaseInstructorTask)  # pylint: disable=E1102
 def rescore_problem(entry_id, xmodule_instance_args):
     """Rescores a problem in a course, for all students or one specific student.
 
@@ -45,15 +52,19 @@ def rescore_problem(entry_id, xmodule_instance_args):
     `xmodule_instance_args` provides information needed by _get_module_instance_for_task()
     to instantiate an xmodule instance.
     """
-    action_name = 'rescored'
-    update_fcn = rescore_problem_module_state
-    filter_fcn = lambda(modules_to_update): modules_to_update.filter(state__contains='"done": true')
-    return update_problem_module_state(entry_id,
-                                       update_fcn, action_name, filter_fcn=filter_fcn,
-                                       xmodule_instance_args=xmodule_instance_args)
+    # Translators: This is a past-tense verb that is inserted into task progress messages as {action}.
+    action_name = ugettext_noop('rescored')
+    update_fcn = partial(rescore_problem_module_state, xmodule_instance_args)
+
+    def filter_fcn(modules_to_update):
+        """Filter that matches problems which are marked as being done"""
+        return modules_to_update.filter(state__contains='"done": true')
+
+    visit_fcn = partial(perform_module_state_update, update_fcn, filter_fcn)
+    return run_main_task(entry_id, visit_fcn, action_name)
 
 
-@task
+@task(base=BaseInstructorTask)  # pylint: disable=E1102
 def reset_problem_attempts(entry_id, xmodule_instance_args):
     """Resets problem attempts to zero for a particular problem for all students in a course.
 
@@ -68,14 +79,14 @@ def reset_problem_attempts(entry_id, xmodule_instance_args):
     `xmodule_instance_args` provides information needed by _get_module_instance_for_task()
     to instantiate an xmodule instance.
     """
-    action_name = 'reset'
-    update_fcn = reset_attempts_module_state
-    return update_problem_module_state(entry_id,
-                                       update_fcn, action_name, filter_fcn=None,
-                                       xmodule_instance_args=xmodule_instance_args)
+    # Translators: This is a past-tense verb that is inserted into task progress messages as {action}.
+    action_name = ugettext_noop('reset')
+    update_fcn = partial(reset_attempts_module_state, xmodule_instance_args)
+    visit_fcn = partial(perform_module_state_update, update_fcn, None)
+    return run_main_task(entry_id, visit_fcn, action_name)
 
 
-@task
+@task(base=BaseInstructorTask)  # pylint: disable=E1102
 def delete_problem_state(entry_id, xmodule_instance_args):
     """Deletes problem state entirely for all students on a particular problem in a course.
 
@@ -90,8 +101,29 @@ def delete_problem_state(entry_id, xmodule_instance_args):
     `xmodule_instance_args` provides information needed by _get_module_instance_for_task()
     to instantiate an xmodule instance.
     """
-    action_name = 'deleted'
-    update_fcn = delete_problem_module_state
-    return update_problem_module_state(entry_id,
-                                       update_fcn, action_name, filter_fcn=None,
-                                       xmodule_instance_args=xmodule_instance_args)
+    # Translators: This is a past-tense verb that is inserted into task progress messages as {action}.
+    action_name = ugettext_noop('deleted')
+    update_fcn = partial(delete_problem_module_state, xmodule_instance_args)
+    visit_fcn = partial(perform_module_state_update, update_fcn, None)
+    return run_main_task(entry_id, visit_fcn, action_name)
+
+
+@task(base=BaseInstructorTask)  # pylint: disable=E1102
+def send_bulk_course_email(entry_id, _xmodule_instance_args):
+    """Sends emails to recipients enrolled in a course.
+
+    `entry_id` is the id value of the InstructorTask entry that corresponds to this task.
+    The entry contains the `course_id` that identifies the course, as well as the
+    `task_input`, which contains task-specific input.
+
+    The task_input should be a dict with the following entries:
+
+      'email_id': the full URL to the problem to be rescored.  (required)
+
+    `_xmodule_instance_args` provides information needed by _get_module_instance_for_task()
+    to instantiate an xmodule instance.  This is unused here.
+    """
+    # Translators: This is a past-tense verb that is inserted into task progress messages as {action}.
+    action_name = ugettext_noop('emailed')
+    visit_fcn = perform_delegate_email_batches
+    return run_main_task(entry_id, visit_fcn, action_name)
diff --git a/lms/djangoapps/instructor_task/tasks_helper.py b/lms/djangoapps/instructor_task/tasks_helper.py
index 4f2d37a212..cf828edb5b 100644
--- a/lms/djangoapps/instructor_task/tasks_helper.py
+++ b/lms/djangoapps/instructor_task/tasks_helper.py
@@ -3,19 +3,15 @@ This file contains tasks that are designed to perform background operations on t
 running state of a course.
 
 """
-
 import json
 from time import time
-from sys import exc_info
-from traceback import format_exc
 
-from celery import current_task
+from celery import Task, current_task
 from celery.utils.log import get_task_logger
-from celery.signals import worker_process_init
 from celery.states import SUCCESS, FAILURE
 
 from django.contrib.auth.models import User
-from django.db import transaction
+from django.db import transaction, reset_queries
 from dogapi import dog_stats_api
 
 from xmodule.modulestore.django import modulestore
@@ -33,6 +29,96 @@ TASK_LOG = get_task_logger(__name__)
 # define value to use when no task_id is provided:
 UNKNOWN_TASK_ID = 'unknown-task_id'
 
+# define values for update functions to use to return status to perform_module_state_update
+UPDATE_STATUS_SUCCEEDED = 'succeeded'
+UPDATE_STATUS_FAILED = 'failed'
+UPDATE_STATUS_SKIPPED = 'skipped'
+
+
+class BaseInstructorTask(Task):
+    """
+    Base task class for use with InstructorTask models.
+
+    Permits updating information about task in corresponding InstructorTask for monitoring purposes.
+
+    Assumes that the entry_id of the InstructorTask model is the first argument to the task.
+
+    The `entry_id` is the primary key for the InstructorTask entry representing the task.  This class
+    updates the entry on success and failure of the task it wraps.  It is setting the entry's value
+    for task_state based on what Celery would set it to once the task returns to Celery:
+    FAILURE if an exception is encountered, and SUCCESS if it returns normally.
+    Other arguments are pass-throughs to perform_module_state_update, and documented there.
+    """
+    abstract = True
+
+    def on_success(self, task_progress, task_id, args, kwargs):
+        """
+        Update InstructorTask object corresponding to this task with info about success.
+
+        Updates task_output and task_state.  But it shouldn't actually do anything
+        if the task is only creating subtasks to actually do the work.
+
+        Assumes `task_progress` is a dict containing the task's result, with the following keys:
+
+          'attempted': number of attempts made
+          'succeeded': number of attempts that "succeeded"
+          'skipped': number of attempts that "skipped"
+          'failed': number of attempts that "failed"
+          'total': number of possible subtasks to attempt
+          'action_name': user-visible verb to use in status messages.  Should be past-tense.
+              Pass-through of input `action_name`.
+          'duration_ms': how long the task has (or had) been running.
+
+        This is JSON-serialized and stored in the task_output column of the InstructorTask entry.
+
+        """
+        TASK_LOG.debug('Task %s: success returned with progress: %s', task_id, task_progress)
+        # We should be able to find the InstructorTask object to update
+        # based on the task_id here, without having to dig into the
+        # original args to the task.  On the other hand, the entry_id
+        # is the first value passed to all such args, so we'll use that.
+        # And we assume that it exists, else we would already have had a failure.
+        entry_id = args[0]
+        entry = InstructorTask.objects.get(pk=entry_id)
+        # Check to see if any subtasks had been defined as part of this task.
+        # If not, then we know that we're done.  (If so, let the subtasks
+        # handle updating task_state themselves.)
+        if len(entry.subtasks) == 0:
+            entry.task_output = InstructorTask.create_output_for_success(task_progress)
+            entry.task_state = SUCCESS
+            entry.save_now()
+
+    def on_failure(self, exc, task_id, args, kwargs, einfo):
+        """
+        Update InstructorTask object corresponding to this task with info about failure.
+
+        Fetches and updates exception and traceback information on failure.
+
+        If an exception is raised internal to the task, it is caught by celery and provided here.
+        The information is recorded in the InstructorTask object as a JSON-serialized dict
+        stored in the task_output column.  It contains the following keys:
+
+               'exception':  type of exception object
+               'message': error message from exception object
+               'traceback': traceback information (truncated if necessary)
+
+        Note that there is no way to record progress made within the task (e.g. attempted,
+        succeeded, etc.) when such failures occur.
+        """
+        TASK_LOG.debug('Task %s: failure returned', task_id)
+        entry_id = args[0]
+        try:
+            entry = InstructorTask.objects.get(pk=entry_id)
+        except InstructorTask.DoesNotExist:
+            # if the InstructorTask object does not exist, then there's no point
+            # trying to update it.
+            TASK_LOG.error("Task (%s) has no InstructorTask object for id %s", task_id, entry_id)
+        else:
+            TASK_LOG.warning("Task (%s) failed: %s %s", task_id, einfo.exception, einfo.traceback)
+            entry.task_output = InstructorTask.create_output_for_failure(einfo.exception, einfo.traceback)
+            entry.task_state = FAILURE
+            entry.save_now()
+
 
 class UpdateProblemModuleStateError(Exception):
     """
@@ -45,12 +131,80 @@ class UpdateProblemModuleStateError(Exception):
 
 
 def _get_current_task():
-    """Stub to make it easier to test without actually running Celery"""
+    """
+    Stub to make it easier to test without actually running Celery.
+
+    This is a wrapper around celery.current_task, which provides access
+    to the top of the stack of Celery's tasks.  When running tests, however,
+    it doesn't seem to work to mock current_task directly, so this wrapper
+    is used to provide a hook to mock in tests, while providing the real
+    `current_task` in production.
+    """
     return current_task
 
 
-def _perform_module_state_update(course_id, module_state_key, student_identifier, update_fcn, action_name, filter_fcn,
-                                 xmodule_instance_args):
+def run_main_task(entry_id, task_fcn, action_name):
+    """
+    Applies the `task_fcn` to the arguments defined in `entry_id` InstructorTask.
+
+    Arguments passed to `task_fcn` are:
+
+     `entry_id` : the primary key for the InstructorTask entry representing the task.
+     `course_id` : the id for the course.
+     `task_input` : dict containing task-specific arguments, JSON-decoded from InstructorTask's task_input.
+     `action_name` : past-tense verb to use for constructing status messages.
+
+    If no exceptions are raised, the `task_fcn` should return a dict containing
+    the task's result with the following keys:
+
+          'attempted': number of attempts made
+          'succeeded': number of attempts that "succeeded"
+          'skipped': number of attempts that "skipped"
+          'failed': number of attempts that "failed"
+          'total': number of possible subtasks to attempt
+          'action_name': user-visible verb to use in status messages.
+              Should be past-tense.  Pass-through of input `action_name`.
+          'duration_ms': how long the task has (or had) been running.
+
+    """
+
+    # get the InstructorTask to be updated.  If this fails, then let the exception return to Celery.
+    # There's no point in catching it here.
+    entry = InstructorTask.objects.get(pk=entry_id)
+
+    # get inputs to use in this task from the entry:
+    task_id = entry.task_id
+    course_id = entry.course_id
+    task_input = json.loads(entry.task_input)
+
+    # construct log message:
+    fmt = 'task "{task_id}": course "{course_id}" input "{task_input}"'
+    task_info_string = fmt.format(task_id=task_id, course_id=course_id, task_input=task_input)
+
+    TASK_LOG.info('Starting update (nothing %s yet): %s', action_name, task_info_string)
+
+    # Check that the task_id submitted in the InstructorTask matches the current task
+    # that is running.
+    request_task_id = _get_current_task().request.id
+    if task_id != request_task_id:
+        fmt = 'Requested task did not match actual task "{actual_id}": {task_info}'
+        message = fmt.format(actual_id=request_task_id, task_info=task_info_string)
+        TASK_LOG.error(message)
+        raise ValueError(message)
+
+    # Now do the work:
+    with dog_stats_api.timer('instructor_tasks.time.overall', tags=['action:{name}'.format(name=action_name)]):
+        task_progress = task_fcn(entry_id, course_id, task_input, action_name)
+
+    # Release any queries that the connection has been hanging onto:
+    reset_queries()
+
+    # log and exit, returning task_progress info as task result:
+    TASK_LOG.info('Finishing %s: final: %s', task_info_string, task_progress)
+    return task_progress
+
+
+def perform_module_state_update(update_fcn, filter_fcn, _entry_id, course_id, task_input, action_name):
     """
     Performs generic update by visiting StudentModule instances with the update_fcn provided.
 
@@ -71,8 +225,10 @@ def _perform_module_state_update(course_id, module_state_key, student_identifier
     The return value is a dict containing the task's results, with the following keys:
 
           'attempted': number of attempts made
-          'updated': number of attempts that "succeeded"
-          'total': number of possible subtasks to attempt
+          'succeeded': number of attempts that "succeeded"
+          'skipped': number of attempts that "skipped"
+          'failed': number of attempts that "failed"
+          'total': number of possible updates to attempt
           'action_name': user-visible verb to use in status messages.  Should be past-tense.
               Pass-through of input `action_name`.
           'duration_ms': how long the task has (or had) been running.
@@ -85,6 +241,9 @@ def _perform_module_state_update(course_id, module_state_key, student_identifier
     # get start time for task:
     start_time = time()
 
+    module_state_key = task_input.get('problem_url')
+    student_identifier = task_input.get('student')
+
     # find the problem descriptor:
     module_descriptor = modulestore().get_instance(course_id, module_state_key)
 
@@ -92,8 +251,8 @@ def _perform_module_state_update(course_id, module_state_key, student_identifier
     modules_to_update = StudentModule.objects.filter(course_id=course_id,
                                                      module_state_key=module_state_key)
 
-    # give the option of rescoring an individual student. If not specified,
-    # then rescores all students who have responded to a problem so far
+    # give the option of updating an individual student. If not specified,
+    # then updates all students who have responded to a problem so far
     student = None
     if student_identifier is not None:
         # if an identifier is supplied, then look for the student,
@@ -110,8 +269,10 @@ def _perform_module_state_update(course_id, module_state_key, student_identifier
         modules_to_update = filter_fcn(modules_to_update)
 
     # perform the main loop
-    num_updated = 0
     num_attempted = 0
+    num_succeeded = 0
+    num_skipped = 0
+    num_failed = 0
     num_total = modules_to_update.count()
 
     def get_task_progress():
@@ -119,7 +280,9 @@ def _perform_module_state_update(course_id, module_state_key, student_identifier
         current_time = time()
         progress = {'action_name': action_name,
                     'attempted': num_attempted,
-                    'updated': num_updated,
+                    'succeeded': num_succeeded,
+                    'skipped': num_skipped,
+                    'failed': num_failed,
                     'total': num_total,
                     'duration_ms': int((current_time - start_time) * 1000),
                     }
@@ -132,10 +295,17 @@ def _perform_module_state_update(course_id, module_state_key, student_identifier
         # There is no try here:  if there's an error, we let it throw, and the task will
         # be marked as FAILED, with a stack trace.
         with dog_stats_api.timer('instructor_tasks.module.time.step', tags=['action:{name}'.format(name=action_name)]):
-            if update_fcn(module_descriptor, module_to_update, xmodule_instance_args):
+            update_status = update_fcn(module_descriptor, module_to_update)
+            if update_status == UPDATE_STATUS_SUCCEEDED:
                 # If the update_fcn returns true, then it performed some kind of work.
                 # Logging of failures is left to the update_fcn itself.
-                num_updated += 1
+                num_succeeded += 1
+            elif update_status == UPDATE_STATUS_FAILED:
+                num_failed += 1
+            elif update_status == UPDATE_STATUS_SKIPPED:
+                num_skipped += 1
+            else:
+                raise UpdateProblemModuleStateError("Unexpected update_status returned: {}".format(update_status))
 
         # update task status:
         task_progress = get_task_progress()
@@ -144,103 +314,32 @@ def _perform_module_state_update(course_id, module_state_key, student_identifier
     return task_progress
 
 
-def update_problem_module_state(entry_id, update_fcn, action_name, filter_fcn,
-                                xmodule_instance_args):
-    """
-    Performs generic update by visiting StudentModule instances with the update_fcn provided.
-
-    The `entry_id` is the primary key for the InstructorTask entry representing the task.  This function
-    updates the entry on success and failure of the _perform_module_state_update function it
-    wraps.  It is setting the entry's value for task_state based on what Celery would set it to once
-    the task returns to Celery:  FAILURE if an exception is encountered, and SUCCESS if it returns normally.
-    Other arguments are pass-throughs to _perform_module_state_update, and documented there.
-
-    If no exceptions are raised, a dict containing the task's result is returned, with the following keys:
-
-          'attempted': number of attempts made
-          'updated': number of attempts that "succeeded"
-          'total': number of possible subtasks to attempt
-          'action_name': user-visible verb to use in status messages.  Should be past-tense.
-              Pass-through of input `action_name`.
-          'duration_ms': how long the task has (or had) been running.
-
-    Before returning, this is also JSON-serialized and stored in the task_output column of the InstructorTask entry.
-
-    If an exception is raised internally, it is caught and recorded in the InstructorTask entry.
-    This is also a JSON-serialized dict, stored in the task_output column, containing the following keys:
-
-           'exception':  type of exception object
-           'message': error message from exception object
-           'traceback': traceback information (truncated if necessary)
-
-    Once the exception is caught, it is raised again and allowed to pass up to the
-    task-running level, so that it can also set the failure modes and capture the error trace in the
-    result object that Celery creates.
-
-    """
-
-    # get the InstructorTask to be updated.  If this fails, then let the exception return to Celery.
-    # There's no point in catching it here.
-    entry = InstructorTask.objects.get(pk=entry_id)
-
-    # get inputs to use in this task from the entry:
-    task_id = entry.task_id
-    course_id = entry.course_id
-    task_input = json.loads(entry.task_input)
-    module_state_key = task_input.get('problem_url')
-    student_ident = task_input['student'] if 'student' in task_input else None
-
-    fmt = 'Starting to update problem modules as task "{task_id}": course "{course_id}" problem "{state_key}": nothing {action} yet'
-    TASK_LOG.info(fmt.format(task_id=task_id, course_id=course_id, state_key=module_state_key, action=action_name))
-
-    # add task_id to xmodule_instance_args, so that it can be output with tracking info:
-    if xmodule_instance_args is not None:
-        xmodule_instance_args['task_id'] = task_id
-
-    # Now that we have an entry we can try to catch failures:
-    task_progress = None
-    try:
-        # Check that the task_id submitted in the InstructorTask matches the current task
-        # that is running.
-        request_task_id = _get_current_task().request.id
-        if task_id != request_task_id:
-            fmt = 'Requested task "{task_id}" did not match actual task "{actual_id}"'
-            message = fmt.format(task_id=task_id, course_id=course_id, state_key=module_state_key, actual_id=request_task_id)
-            TASK_LOG.error(message)
-            raise UpdateProblemModuleStateError(message)
-
-        # Now do the work:
-        with dog_stats_api.timer('instructor_tasks.module.time.overall', tags=['action:{name}'.format(name=action_name)]):
-            task_progress = _perform_module_state_update(course_id, module_state_key, student_ident, update_fcn,
-                                                         action_name, filter_fcn, xmodule_instance_args)
-        # If we get here, we assume we've succeeded, so update the InstructorTask entry in anticipation.
-        # But we do this within the try, in case creating the task_output causes an exception to be
-        # raised.
-        entry.task_output = InstructorTask.create_output_for_success(task_progress)
-        entry.task_state = SUCCESS
-        entry.save_now()
-
-    except Exception:
-        # try to write out the failure to the entry before failing
-        _, exception, traceback = exc_info()
-        traceback_string = format_exc(traceback) if traceback is not None else ''
-        TASK_LOG.warning("background task (%s) failed: %s %s", task_id, exception, traceback_string)
-        entry.task_output = InstructorTask.create_output_for_failure(exception, traceback_string)
-        entry.task_state = FAILURE
-        entry.save_now()
-        raise
-
-    # log and exit, returning task_progress info as task result:
-    fmt = 'Finishing task "{task_id}": course "{course_id}" problem "{state_key}": final: {progress}'
-    TASK_LOG.info(fmt.format(task_id=task_id, course_id=course_id, state_key=module_state_key, progress=task_progress))
-    return task_progress
-
-
 def _get_task_id_from_xmodule_args(xmodule_instance_args):
     """Gets task_id from `xmodule_instance_args` dict, or returns default value if missing."""
     return xmodule_instance_args.get('task_id', UNKNOWN_TASK_ID) if xmodule_instance_args is not None else UNKNOWN_TASK_ID
 
 
+def _get_xqueue_callback_url_prefix(xmodule_instance_args):
+    """Gets prefix to use when constructing xqueue_callback_url."""
+    return xmodule_instance_args.get('xqueue_callback_url_prefix', '') if xmodule_instance_args is not None else ''
+
+
+def _get_track_function_for_task(student, xmodule_instance_args=None, source_page='x_module_task'):
+    """
+    Make a tracking function that logs what happened.
+
+    For insertion into ModuleSystem, and used by CapaModule, which will
+    provide the event_type (as string) and event (as dict) as arguments.
+    The request_info and task_info (and page) are provided here.
+    """
+    # get request-related tracking information from args passthrough, and supplement with task-specific
+    # information:
+    request_info = xmodule_instance_args.get('request_info', {}) if xmodule_instance_args is not None else {}
+    task_info = {'student': student.username, 'task_id': _get_task_id_from_xmodule_args(xmodule_instance_args)}
+
+    return lambda event_type, event: task_track(request_info, task_info, event_type, event, page=source_page)
+
+
 def _get_module_instance_for_task(course_id, student, module_descriptor, xmodule_instance_args=None,
                                   grade_bucket_type=None):
     """
@@ -277,7 +376,7 @@ def _get_module_instance_for_task(course_id, student, module_descriptor, xmodule
 
 
 @transaction.autocommit
-def rescore_problem_module_state(module_descriptor, student_module, xmodule_instance_args=None):
+def rescore_problem_module_state(xmodule_instance_args, module_descriptor, student_module):
     '''
     Takes an XModule descriptor and a corresponding StudentModule object, and
     performs rescoring on the student's problem submission.
@@ -310,28 +409,31 @@ def rescore_problem_module_state(module_descriptor, student_module, xmodule_inst
         raise UpdateProblemModuleStateError(msg)
 
     result = instance.rescore_problem()
+    instance.save()
     if 'success' not in result:
         # don't consider these fatal, but false means that the individual call didn't complete:
         TASK_LOG.warning(u"error processing rescore call for course {course}, problem {loc} and student {student}: "
                          "unexpected response {msg}".format(msg=result, course=course_id, loc=module_state_key, student=student))
-        return False
+        return UPDATE_STATUS_FAILED
     elif result['success'] not in ['correct', 'incorrect']:
         TASK_LOG.warning(u"error processing rescore call for course {course}, problem {loc} and student {student}: "
                          "{msg}".format(msg=result['success'], course=course_id, loc=module_state_key, student=student))
-        return False
+        return UPDATE_STATUS_FAILED
     else:
         TASK_LOG.debug(u"successfully processed rescore call for course {course}, problem {loc} and student {student}: "
                        "{msg}".format(msg=result['success'], course=course_id, loc=module_state_key, student=student))
-        return True
+        return UPDATE_STATUS_SUCCEEDED
 
 
 @transaction.autocommit
-def reset_attempts_module_state(_module_descriptor, student_module, xmodule_instance_args=None):
+def reset_attempts_module_state(xmodule_instance_args, _module_descriptor, student_module):
     """
     Resets problem attempts to zero for specified `student_module`.
 
-    Always returns true, indicating success, if it doesn't raise an exception due to database error.
+    Returns a status of UPDATE_STATUS_SUCCEEDED if a problem has non-zero attempts
+    that are being reset, and UPDATE_STATUS_SKIPPED otherwise.
     """
+    update_status = UPDATE_STATUS_SKIPPED
     problem_state = json.loads(student_module.state) if student_module.state else {}
     if 'attempts' in problem_state:
         old_number_of_attempts = problem_state["attempts"]
@@ -342,26 +444,24 @@ def reset_attempts_module_state(_module_descriptor, student_module, xmodule_inst
             student_module.save()
             # get request-related tracking information from args passthrough,
             # and supplement with task-specific information:
-            request_info = xmodule_instance_args.get('request_info', {}) if xmodule_instance_args is not None else {}
-            task_info = {"student": student_module.student.username, "task_id": _get_task_id_from_xmodule_args(xmodule_instance_args)}
+            track_function = _get_track_function_for_task(student_module.student, xmodule_instance_args)
             event_info = {"old_attempts": old_number_of_attempts, "new_attempts": 0}
-            task_track(request_info, task_info, 'problem_reset_attempts', event_info, page='x_module_task')
+            track_function('problem_reset_attempts', event_info)
+            update_status = UPDATE_STATUS_SUCCEEDED
 
-    # consider the reset to be successful, even if no update was performed.  (It's just "optimized".)
-    return True
+    return update_status
 
 
 @transaction.autocommit
-def delete_problem_module_state(_module_descriptor, student_module, xmodule_instance_args=None):
+def delete_problem_module_state(xmodule_instance_args, _module_descriptor, student_module):
     """
     Delete the StudentModule entry.
 
-    Always returns true, indicating success, if it doesn't raise an exception due to database error.
+    Always returns UPDATE_STATUS_SUCCEEDED, indicating success, if it doesn't raise an exception due to database error.
     """
     student_module.delete()
     # get request-related tracking information from args passthrough,
     # and supplement with task-specific information:
-    request_info = xmodule_instance_args.get('request_info', {}) if xmodule_instance_args is not None else {}
-    task_info = {"student": student_module.student.username, "task_id": _get_task_id_from_xmodule_args(xmodule_instance_args)}
-    task_track(request_info, task_info, 'problem_delete_state', {}, page='x_module_task')
-    return True
+    track_function = _get_track_function_for_task(student_module.student, xmodule_instance_args)
+    track_function('problem_delete_state', {})
+    return UPDATE_STATUS_SUCCEEDED
diff --git a/lms/djangoapps/instructor_task/tests/test_api.py b/lms/djangoapps/instructor_task/tests/test_api.py
index 1e40c51c4b..aa34e51872 100644
--- a/lms/djangoapps/instructor_task/tests/test_api.py
+++ b/lms/djangoapps/instructor_task/tests/test_api.py
@@ -6,16 +6,21 @@ from xmodule.modulestore.exceptions import ItemNotFoundError
 
 from courseware.tests.factories import UserFactory
 
-from instructor_task.api import (get_running_instructor_tasks,
-                                 get_instructor_task_history,
-                                 submit_rescore_problem_for_all_students,
-                                 submit_rescore_problem_for_student,
-                                 submit_reset_problem_attempts_for_all_students,
-                                 submit_delete_problem_state_for_all_students)
+from bulk_email.models import CourseEmail, SEND_TO_ALL
+from instructor_task.api import (
+    get_running_instructor_tasks,
+    get_instructor_task_history,
+    submit_rescore_problem_for_all_students,
+    submit_rescore_problem_for_student,
+    submit_reset_problem_attempts_for_all_students,
+    submit_delete_problem_state_for_all_students,
+    submit_bulk_course_email,
+)
 
 from instructor_task.api_helper import AlreadyRunningError
 from instructor_task.models import InstructorTask, PROGRESS
 from instructor_task.tests.test_base import (InstructorTaskTestCase,
+                                             InstructorTaskCourseTestCase,
                                              InstructorTaskModuleTestCase,
                                              TEST_COURSE_ID)
 
@@ -42,12 +47,28 @@ class InstructorTaskReportTest(InstructorTaskTestCase):
             expected_ids.append(self._create_success_entry().task_id)
             expected_ids.append(self._create_progress_entry().task_id)
         task_ids = [instructor_task.task_id for instructor_task
-                    in get_instructor_task_history(TEST_COURSE_ID, self.problem_url)]
+                    in get_instructor_task_history(TEST_COURSE_ID, problem_url=self.problem_url)]
         self.assertEquals(set(task_ids), set(expected_ids))
+        # make the same call using explicit task_type:
+        task_ids = [instructor_task.task_id for instructor_task
+                    in get_instructor_task_history(
+                        TEST_COURSE_ID,
+                        problem_url=self.problem_url,
+                        task_type='rescore_problem'
+                    )]
+        self.assertEquals(set(task_ids), set(expected_ids))
+        # make the same call using a non-existent task_type:
+        task_ids = [instructor_task.task_id for instructor_task
+                    in get_instructor_task_history(
+                        TEST_COURSE_ID,
+                        problem_url=self.problem_url,
+                        task_type='dummy_type'
+                    )]
+        self.assertEquals(set(task_ids), set())
 
 
-class InstructorTaskSubmitTest(InstructorTaskModuleTestCase):
-    """Tests API methods that involve the submission of background tasks."""
+class InstructorTaskModuleSubmitTest(InstructorTaskModuleTestCase):
+    """Tests API methods that involve the submission of module-based background tasks."""
 
     def setUp(self):
         self.initialize_course()
@@ -136,3 +157,29 @@ class InstructorTaskSubmitTest(InstructorTaskModuleTestCase):
 
     def test_submit_delete_all(self):
         self._test_submit_task(submit_delete_problem_state_for_all_students)
+
+
+class InstructorTaskCourseSubmitTest(InstructorTaskCourseTestCase):
+    """Tests API methods that involve the submission of course-based background tasks."""
+
+    def setUp(self):
+        self.initialize_course()
+        self.student = UserFactory.create(username="student", email="student@edx.org")
+        self.instructor = UserFactory.create(username="instructor", email="instructor@edx.org")
+
+    def _define_course_email(self):
+        """Create CourseEmail object for testing."""
+        course_email = CourseEmail.create(self.course.id, self.instructor, SEND_TO_ALL, "Test Subject", "<p>This is a test message</p>")
+        return course_email.id  # pylint: disable=E1101
+
+    def test_submit_bulk_email_all(self):
+        email_id = self._define_course_email()
+        instructor_task = submit_bulk_course_email(self.create_task_request(self.instructor), self.course.id, email_id)
+
+        # test resubmitting, by updating the existing record:
+        instructor_task = InstructorTask.objects.get(id=instructor_task.id)  # pylint: disable=E1101
+        instructor_task.task_state = PROGRESS
+        instructor_task.save()
+
+        with self.assertRaises(AlreadyRunningError):
+            instructor_task = submit_bulk_course_email(self.create_task_request(self.instructor), self.course.id, email_id)
diff --git a/lms/djangoapps/instructor_task/tests/test_base.py b/lms/djangoapps/instructor_task/tests/test_base.py
index 2c1fe02bd8..e0abfdf51f 100644
--- a/lms/djangoapps/instructor_task/tests/test_base.py
+++ b/lms/djangoapps/instructor_task/tests/test_base.py
@@ -88,7 +88,7 @@ class InstructorTaskTestCase(TestCase):
     def _create_progress_entry(self, student=None, task_state=PROGRESS):
         """Creates a InstructorTask entry representing a task in progress."""
         progress = {'attempted': 3,
-                    'updated': 2,
+                    'succeeded': 2,
                     'total': 5,
                     'action_name': 'rescored',
                     }
@@ -96,10 +96,10 @@ class InstructorTaskTestCase(TestCase):
 
 
 @override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
-class InstructorTaskModuleTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
+class InstructorTaskCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
     """
     Base test class for InstructorTask-related tests that require
-    the setup of a course and problem in order to access StudentModule state.
+    the setup of a course.
     """
     course = None
     current_user = None
@@ -120,6 +120,7 @@ class InstructorTaskModuleTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase)
         # add a sequence to the course to which the problems can be added
         self.problem_section = ItemFactory.create(parent_location=chapter.location,
                                                   category='sequential',
+                                                  metadata={'graded': True, 'format': 'Homework'},
                                                   display_name=TEST_SECTION_NAME)
 
     @staticmethod
@@ -130,12 +131,12 @@ class InstructorTaskModuleTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase)
     def login_username(self, username):
         """Login the user, given the `username`."""
         if self.current_user != username:
-            self.login(InstructorTaskModuleTestCase.get_user_email(username), "test")
+            self.login(InstructorTaskCourseTestCase.get_user_email(username), "test")
             self.current_user = username
 
     def _create_user(self, username, is_staff=False):
         """Creates a user and enrolls them in the test course."""
-        email = InstructorTaskModuleTestCase.get_user_email(username)
+        email = InstructorTaskCourseTestCase.get_user_email(username)
         thisuser = UserFactory.create(username=username, email=email, is_staff=is_staff)
         CourseEnrollmentFactory.create(user=thisuser, course_id=self.course.id)
         return thisuser
@@ -148,6 +149,31 @@ class InstructorTaskModuleTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase)
         """Creates a student for the test course."""
         return self._create_user(username, is_staff=False)
 
+    @staticmethod
+    def get_task_status(task_id):
+        """Use api method to fetch task status, using mock request."""
+        mock_request = Mock()
+        mock_request.REQUEST = {'task_id': task_id}
+        response = instructor_task_status(mock_request)
+        status = json.loads(response.content)
+        return status
+
+    def create_task_request(self, requester_username):
+        """Generate request that can be used for submitting tasks"""
+        request = Mock()
+        request.user = User.objects.get(username=requester_username)
+        request.get_host = Mock(return_value="testhost")
+        request.META = {'REMOTE_ADDR': '0:0:0:0', 'SERVER_NAME': 'testhost'}
+        request.is_secure = Mock(return_value=False)
+        return request
+
+
+@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+class InstructorTaskModuleTestCase(InstructorTaskCourseTestCase):
+    """
+    Base test class for InstructorTask-related tests that require
+    the setup of a course and problem in order to access StudentModule state.
+    """
     @staticmethod
     def problem_location(problem_url_name):
         """
@@ -191,21 +217,3 @@ class InstructorTaskModuleTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase)
                                          module_type=descriptor.location.category,
                                          module_state_key=descriptor.location.url(),
                                          )
-
-    @staticmethod
-    def get_task_status(task_id):
-        """Use api method to fetch task status, using mock request."""
-        mock_request = Mock()
-        mock_request.REQUEST = {'task_id': task_id}
-        response = instructor_task_status(mock_request)
-        status = json.loads(response.content)
-        return status
-
-    def create_task_request(self, requester_username):
-        """Generate request that can be used for submitting tasks"""
-        request = Mock()
-        request.user = User.objects.get(username=requester_username)
-        request.get_host = Mock(return_value="testhost")
-        request.META = {'REMOTE_ADDR': '0:0:0:0', 'SERVER_NAME': 'testhost'}
-        request.is_secure = Mock(return_value=False)
-        return request
diff --git a/lms/djangoapps/instructor_task/tests/test_integration.py b/lms/djangoapps/instructor_task/tests/test_integration.py
index fb8cd44169..b36467c16f 100644
--- a/lms/djangoapps/instructor_task/tests/test_integration.py
+++ b/lms/djangoapps/instructor_task/tests/test_integration.py
@@ -227,7 +227,7 @@ class TestRescoringTask(TestIntegrationTask):
         self.assertEqual(task_input['problem_url'], InstructorTaskModuleTestCase.problem_location(problem_url_name))
         status = json.loads(instructor_task.task_output)
         self.assertEqual(status['attempted'], 1)
-        self.assertEqual(status['updated'], 0)
+        self.assertEqual(status['succeeded'], 0)
         self.assertEqual(status['total'], 1)
 
     def define_code_response_problem(self, problem_url_name):
diff --git a/lms/djangoapps/instructor_task/tests/test_tasks.py b/lms/djangoapps/instructor_task/tests/test_tasks.py
index 090c114720..5aa5dbcb80 100644
--- a/lms/djangoapps/instructor_task/tests/test_tasks.py
+++ b/lms/djangoapps/instructor_task/tests/test_tasks.py
@@ -7,24 +7,22 @@ paths actually work.
 """
 import json
 from uuid import uuid4
-from unittest import skip
 
-from mock import Mock, patch
+from mock import Mock, MagicMock, patch
 
 from celery.states import SUCCESS, FAILURE
 
 from xmodule.modulestore.exceptions import ItemNotFoundError
 
-from courseware.model_data import StudentModule
+from courseware.models import StudentModule
 from courseware.tests.factories import StudentModuleFactory
-from student.tests.factories import UserFactory
+from student.tests.factories import UserFactory, CourseEnrollmentFactory
 
 from instructor_task.models import InstructorTask
 from instructor_task.tests.test_base import InstructorTaskModuleTestCase
 from instructor_task.tests.factories import InstructorTaskFactory
 from instructor_task.tasks import rescore_problem, reset_problem_attempts, delete_problem_state
-from instructor_task.tasks_helper import UpdateProblemModuleStateError, update_problem_module_state
-
+from instructor_task.tasks_helper import UpdateProblemModuleStateError
 
 PROBLEM_URL_NAME = "test_urlname"
 
@@ -34,20 +32,24 @@ class TestTaskFailure(Exception):
 
 
 class TestInstructorTasks(InstructorTaskModuleTestCase):
+
     def setUp(self):
         super(InstructorTaskModuleTestCase, self).setUp()
         self.initialize_course()
         self.instructor = self.create_instructor('instructor')
         self.problem_url = InstructorTaskModuleTestCase.problem_location(PROBLEM_URL_NAME)
 
-    def _create_input_entry(self, student_ident=None):
+    def _create_input_entry(self, student_ident=None, use_problem_url=True, course_id=None):
         """Creates a InstructorTask entry for testing."""
         task_id = str(uuid4())
-        task_input = {'problem_url': self.problem_url}
+        task_input = {}
+        if use_problem_url:
+            task_input['problem_url'] = self.problem_url
         if student_ident is not None:
             task_input['student'] = student_ident
 
-        instructor_task = InstructorTaskFactory.create(course_id=self.course.id,
+        course_id = course_id or self.course.id
+        instructor_task = InstructorTaskFactory.create(course_id=course_id,
                                                        requester=self.instructor,
                                                        task_input=json.dumps(task_input),
                                                        task_key='dummy value',
@@ -62,7 +64,7 @@ class TestInstructorTasks(InstructorTaskModuleTestCase):
                 'request_info': {},
                 }
 
-    def _run_task_with_mock_celery(self, task_function, entry_id, task_id, expected_failure_message=None):
+    def _run_task_with_mock_celery(self, task_class, entry_id, task_id, expected_failure_message=None):
         """Submit a task and mock how celery provides a current_task."""
         self.current_task = Mock()
         self.current_task.request = Mock()
@@ -70,70 +72,52 @@ class TestInstructorTasks(InstructorTaskModuleTestCase):
         self.current_task.update_state = Mock()
         if expected_failure_message is not None:
             self.current_task.update_state.side_effect = TestTaskFailure(expected_failure_message)
+        task_args = [entry_id, self._get_xmodule_instance_args()]
+
         with patch('instructor_task.tasks_helper._get_current_task') as mock_get_task:
             mock_get_task.return_value = self.current_task
-            return task_function(entry_id, self._get_xmodule_instance_args())
+            return task_class.apply(task_args, task_id=task_id).get()
 
-    def _test_missing_current_task(self, task_function):
-        """Check that a task_function fails when celery doesn't provide a current_task."""
+    def _test_missing_current_task(self, task_class):
+        """Check that a task_class fails when celery doesn't provide a current_task."""
         task_entry = self._create_input_entry()
-        with self.assertRaises(UpdateProblemModuleStateError):
-            task_function(task_entry.id, self._get_xmodule_instance_args())
+        with self.assertRaises(ValueError):
+            task_class(task_entry.id, self._get_xmodule_instance_args())
 
-    def test_rescore_missing_current_task(self):
-        self._test_missing_current_task(rescore_problem)
+    def _test_undefined_course(self, task_class):
+        """Run with celery, but with no course defined."""
+        task_entry = self._create_input_entry(course_id="bogus/course/id")
+        with self.assertRaises(ItemNotFoundError):
+            self._run_task_with_mock_celery(task_class, task_entry.id, task_entry.task_id)
 
-    def test_reset_missing_current_task(self):
-        self._test_missing_current_task(reset_problem_attempts)
-
-    def test_delete_missing_current_task(self):
-        self._test_missing_current_task(delete_problem_state)
-
-    def _test_undefined_problem(self, task_function):
+    def _test_undefined_problem(self, task_class):
         """Run with celery, but no problem defined."""
         task_entry = self._create_input_entry()
         with self.assertRaises(ItemNotFoundError):
-            self._run_task_with_mock_celery(task_function, task_entry.id, task_entry.task_id)
+            self._run_task_with_mock_celery(task_class, task_entry.id, task_entry.task_id)
 
-    def test_rescore_undefined_problem(self):
-        self._test_undefined_problem(rescore_problem)
-
-    def test_reset_undefined_problem(self):
-        self._test_undefined_problem(reset_problem_attempts)
-
-    def test_delete_undefined_problem(self):
-        self._test_undefined_problem(delete_problem_state)
-
-    def _test_run_with_task(self, task_function, action_name, expected_num_updated):
+    def _test_run_with_task(self, task_class, action_name, expected_num_succeeded, expected_num_skipped=0):
         """Run a task and check the number of StudentModules processed."""
         task_entry = self._create_input_entry()
-        status = self._run_task_with_mock_celery(task_function, task_entry.id, task_entry.task_id)
+        status = self._run_task_with_mock_celery(task_class, task_entry.id, task_entry.task_id)
         # check return value
-        self.assertEquals(status.get('attempted'), expected_num_updated)
-        self.assertEquals(status.get('updated'), expected_num_updated)
-        self.assertEquals(status.get('total'), expected_num_updated)
+        self.assertEquals(status.get('attempted'), expected_num_succeeded + expected_num_skipped)
+        self.assertEquals(status.get('succeeded'), expected_num_succeeded)
+        self.assertEquals(status.get('skipped'), expected_num_skipped)
+        self.assertEquals(status.get('total'), expected_num_succeeded + expected_num_skipped)
         self.assertEquals(status.get('action_name'), action_name)
-        self.assertGreater('duration_ms', 0)
+        self.assertGreater(status.get('duration_ms'), 0)
         # compare with entry in table:
         entry = InstructorTask.objects.get(id=task_entry.id)
         self.assertEquals(json.loads(entry.task_output), status)
         self.assertEquals(entry.task_state, SUCCESS)
 
-    def _test_run_with_no_state(self, task_function, action_name):
+    def _test_run_with_no_state(self, task_class, action_name):
         """Run with no StudentModules defined for the current problem."""
         self.define_option_problem(PROBLEM_URL_NAME)
-        self._test_run_with_task(task_function, action_name, 0)
+        self._test_run_with_task(task_class, action_name, 0)
 
-    def test_rescore_with_no_state(self):
-        self._test_run_with_no_state(rescore_problem, 'rescored')
-
-    def test_reset_with_no_state(self):
-        self._test_run_with_no_state(reset_problem_attempts, 'reset')
-
-    def test_delete_with_no_state(self):
-        self._test_run_with_no_state(delete_problem_state, 'deleted')
-
-    def _create_students_with_state(self, num_students, state=None):
+    def _create_students_with_state(self, num_students, state=None, grade=0, max_grade=1):
         """Create students, a problem, and StudentModule objects for testing"""
         self.define_option_problem(PROBLEM_URL_NAME)
         students = [
@@ -141,9 +125,12 @@ class TestInstructorTasks(InstructorTaskModuleTestCase):
             for i in xrange(num_students)
         ]
         for student in students:
+            CourseEnrollmentFactory.create(course_id=self.course.id, user=student)
             StudentModuleFactory.create(course_id=self.course.id,
                                         module_state_key=self.problem_url,
                                         student=student,
+                                        grade=grade,
+                                        max_grade=max_grade,
                                         state=state)
         return students
 
@@ -156,6 +143,185 @@ class TestInstructorTasks(InstructorTaskModuleTestCase):
             state = json.loads(module.state)
             self.assertEquals(state['attempts'], num_attempts)
 
+    def _test_run_with_failure(self, task_class, expected_message):
+        """Run a task and trigger an artificial failure with the given message."""
+        task_entry = self._create_input_entry()
+        self.define_option_problem(PROBLEM_URL_NAME)
+        with self.assertRaises(TestTaskFailure):
+            self._run_task_with_mock_celery(task_class, task_entry.id, task_entry.task_id, expected_message)
+        # compare with entry in table:
+        entry = InstructorTask.objects.get(id=task_entry.id)
+        self.assertEquals(entry.task_state, FAILURE)
+        output = json.loads(entry.task_output)
+        self.assertEquals(output['exception'], 'TestTaskFailure')
+        self.assertEquals(output['message'], expected_message)
+
+    def _test_run_with_long_error_msg(self, task_class):
+        """
+        Run with an error message that is so long it will require
+        truncation (as well as the jettisoning of the traceback).
+        """
+        task_entry = self._create_input_entry()
+        self.define_option_problem(PROBLEM_URL_NAME)
+        expected_message = "x" * 1500
+        with self.assertRaises(TestTaskFailure):
+            self._run_task_with_mock_celery(task_class, task_entry.id, task_entry.task_id, expected_message)
+        # compare with entry in table:
+        entry = InstructorTask.objects.get(id=task_entry.id)
+        self.assertEquals(entry.task_state, FAILURE)
+        self.assertGreater(1023, len(entry.task_output))
+        output = json.loads(entry.task_output)
+        self.assertEquals(output['exception'], 'TestTaskFailure')
+        self.assertEquals(output['message'], expected_message[:len(output['message']) - 3] + "...")
+        self.assertTrue('traceback' not in output)
+
+    def _test_run_with_short_error_msg(self, task_class):
+        """
+        Run with an error message that is short enough to fit
+        in the output, but long enough that the traceback won't.
+        Confirm that the traceback is truncated.
+        """
+        task_entry = self._create_input_entry()
+        self.define_option_problem(PROBLEM_URL_NAME)
+        expected_message = "x" * 900
+        with self.assertRaises(TestTaskFailure):
+            self._run_task_with_mock_celery(task_class, task_entry.id, task_entry.task_id, expected_message)
+        # compare with entry in table:
+        entry = InstructorTask.objects.get(id=task_entry.id)
+        self.assertEquals(entry.task_state, FAILURE)
+        self.assertGreater(1023, len(entry.task_output))
+        output = json.loads(entry.task_output)
+        self.assertEquals(output['exception'], 'TestTaskFailure')
+        self.assertEquals(output['message'], expected_message)
+        self.assertEquals(output['traceback'][-3:], "...")
+
+
+class TestRescoreInstructorTask(TestInstructorTasks):
+    """Tests problem-rescoring instructor task."""
+
+    def test_rescore_missing_current_task(self):
+        self._test_missing_current_task(rescore_problem)
+
+    def test_rescore_undefined_course(self):
+        self._test_undefined_course(rescore_problem)
+
+    def test_rescore_undefined_problem(self):
+        self._test_undefined_problem(rescore_problem)
+
+    def test_rescore_with_no_state(self):
+        self._test_run_with_no_state(rescore_problem, 'rescored')
+
+    def test_rescore_with_failure(self):
+        self._test_run_with_failure(rescore_problem, 'We expected this to fail')
+
+    def test_rescore_with_long_error_msg(self):
+        self._test_run_with_long_error_msg(rescore_problem)
+
+    def test_rescore_with_short_error_msg(self):
+        self._test_run_with_short_error_msg(rescore_problem)
+
+    def test_rescoring_unrescorable(self):
+        input_state = json.dumps({'done': True})
+        num_students = 1
+        self._create_students_with_state(num_students, input_state)
+        task_entry = self._create_input_entry()
+        mock_instance = MagicMock()
+        del mock_instance.rescore_problem
+        with patch('instructor_task.tasks_helper.get_module_for_descriptor_internal') as mock_get_module:
+            mock_get_module.return_value = mock_instance
+            with self.assertRaises(UpdateProblemModuleStateError):
+                self._run_task_with_mock_celery(rescore_problem, task_entry.id, task_entry.task_id)
+        # check values stored in table:
+        entry = InstructorTask.objects.get(id=task_entry.id)
+        output = json.loads(entry.task_output)
+        self.assertEquals(output['exception'], "UpdateProblemModuleStateError")
+        self.assertEquals(output['message'], "Specified problem does not support rescoring.")
+        self.assertGreater(len(output['traceback']), 0)
+
+    def test_rescoring_success(self):
+        input_state = json.dumps({'done': True})
+        num_students = 10
+        self._create_students_with_state(num_students, input_state)
+        task_entry = self._create_input_entry()
+        mock_instance = Mock()
+        mock_instance.rescore_problem = Mock(return_value={'success': 'correct'})
+        with patch('instructor_task.tasks_helper.get_module_for_descriptor_internal') as mock_get_module:
+            mock_get_module.return_value = mock_instance
+            self._run_task_with_mock_celery(rescore_problem, task_entry.id, task_entry.task_id)
+        # check return value
+        entry = InstructorTask.objects.get(id=task_entry.id)
+        output = json.loads(entry.task_output)
+        self.assertEquals(output.get('attempted'), num_students)
+        self.assertEquals(output.get('succeeded'), num_students)
+        self.assertEquals(output.get('total'), num_students)
+        self.assertEquals(output.get('action_name'), 'rescored')
+        self.assertGreater(output.get('duration_ms'), 0)
+
+    def test_rescoring_bad_result(self):
+        # Confirm that rescoring does not succeed if "success" key is not an expected value.
+        input_state = json.dumps({'done': True})
+        num_students = 10
+        self._create_students_with_state(num_students, input_state)
+        task_entry = self._create_input_entry()
+        mock_instance = Mock()
+        mock_instance.rescore_problem = Mock(return_value={'success': 'bogus'})
+        with patch('instructor_task.tasks_helper.get_module_for_descriptor_internal') as mock_get_module:
+            mock_get_module.return_value = mock_instance
+            self._run_task_with_mock_celery(rescore_problem, task_entry.id, task_entry.task_id)
+        # check return value
+        entry = InstructorTask.objects.get(id=task_entry.id)
+        output = json.loads(entry.task_output)
+        self.assertEquals(output.get('attempted'), num_students)
+        self.assertEquals(output.get('succeeded'), 0)
+        self.assertEquals(output.get('total'), num_students)
+        self.assertEquals(output.get('action_name'), 'rescored')
+        self.assertGreater(output.get('duration_ms'), 0)
+
+    def test_rescoring_missing_result(self):
+        # Confirm that rescoring does not succeed if "success" key is not returned.
+        input_state = json.dumps({'done': True})
+        num_students = 10
+        self._create_students_with_state(num_students, input_state)
+        task_entry = self._create_input_entry()
+        mock_instance = Mock()
+        mock_instance.rescore_problem = Mock(return_value={'bogus': 'value'})
+        with patch('instructor_task.tasks_helper.get_module_for_descriptor_internal') as mock_get_module:
+            mock_get_module.return_value = mock_instance
+            self._run_task_with_mock_celery(rescore_problem, task_entry.id, task_entry.task_id)
+        # check return value
+        entry = InstructorTask.objects.get(id=task_entry.id)
+        output = json.loads(entry.task_output)
+        self.assertEquals(output.get('attempted'), num_students)
+        self.assertEquals(output.get('succeeded'), 0)
+        self.assertEquals(output.get('total'), num_students)
+        self.assertEquals(output.get('action_name'), 'rescored')
+        self.assertGreater(output.get('duration_ms'), 0)
+
+
+class TestResetAttemptsInstructorTask(TestInstructorTasks):
+    """Tests instructor task that resets problem attempts."""
+
+    def test_reset_missing_current_task(self):
+        self._test_missing_current_task(reset_problem_attempts)
+
+    def test_reset_undefined_course(self):
+        self._test_undefined_course(reset_problem_attempts)
+
+    def test_reset_undefined_problem(self):
+        self._test_undefined_problem(reset_problem_attempts)
+
+    def test_reset_with_no_state(self):
+        self._test_run_with_no_state(reset_problem_attempts, 'reset')
+
+    def test_reset_with_failure(self):
+        self._test_run_with_failure(reset_problem_attempts, 'We expected this to fail')
+
+    def test_reset_with_long_error_msg(self):
+        self._test_run_with_long_error_msg(reset_problem_attempts)
+
+    def test_reset_with_short_error_msg(self):
+        self._test_run_with_short_error_msg(reset_problem_attempts)
+
     def test_reset_with_some_state(self):
         initial_attempts = 3
         input_state = json.dumps({'attempts': initial_attempts})
@@ -168,23 +334,17 @@ class TestInstructorTasks(InstructorTaskModuleTestCase):
         # check that entries were reset
         self._assert_num_attempts(students, 0)
 
-    def test_delete_with_some_state(self):
-        # This will create StudentModule entries -- we don't have to worry about
-        # the state inside them.
+    def test_reset_with_zero_attempts(self):
+        initial_attempts = 0
+        input_state = json.dumps({'attempts': initial_attempts})
         num_students = 10
-        students = self._create_students_with_state(num_students)
-        # check that entries were created correctly
-        for student in students:
-            StudentModule.objects.get(course_id=self.course.id,
-                                      student=student,
-                                      module_state_key=self.problem_url)
-        self._test_run_with_task(delete_problem_state, 'deleted', num_students)
-        # confirm that no state can be found anymore:
-        for student in students:
-            with self.assertRaises(StudentModule.DoesNotExist):
-                StudentModule.objects.get(course_id=self.course.id,
-                                          student=student,
-                                          module_state_key=self.problem_url)
+        students = self._create_students_with_state(num_students, input_state)
+        # check that entries were set correctly
+        self._assert_num_attempts(students, initial_attempts)
+        # run the task
+        self._test_run_with_task(reset_problem_attempts, 'reset', 0, expected_num_skipped=num_students)
+        # check that entries were reset
+        self._assert_num_attempts(students, 0)
 
     def _test_reset_with_student(self, use_email):
         """Run a reset task for one student, with several StudentModules for the problem defined."""
@@ -209,10 +369,11 @@ class TestInstructorTasks(InstructorTaskModuleTestCase):
         status = self._run_task_with_mock_celery(reset_problem_attempts, task_entry.id, task_entry.task_id)
         # check return value
         self.assertEquals(status.get('attempted'), 1)
-        self.assertEquals(status.get('updated'), 1)
+        self.assertEquals(status.get('succeeded'), 1)
         self.assertEquals(status.get('total'), 1)
         self.assertEquals(status.get('action_name'), 'reset')
-        self.assertGreater('duration_ms', 0)
+        self.assertGreater(status.get('duration_ms'), 0)
+
         # compare with entry in table:
         entry = InstructorTask.objects.get(id=task_entry.id)
         self.assertEquals(json.loads(entry.task_output), status)
@@ -234,144 +395,45 @@ class TestInstructorTasks(InstructorTaskModuleTestCase):
     def test_reset_with_student_email(self):
         self._test_reset_with_student(True)
 
-    def _test_run_with_failure(self, task_function, expected_message):
-        """Run a task and trigger an artificial failure with give message."""
-        task_entry = self._create_input_entry()
-        self.define_option_problem(PROBLEM_URL_NAME)
-        with self.assertRaises(TestTaskFailure):
-            self._run_task_with_mock_celery(task_function, task_entry.id, task_entry.task_id, expected_message)
-        # compare with entry in table:
-        entry = InstructorTask.objects.get(id=task_entry.id)
-        self.assertEquals(entry.task_state, FAILURE)
-        output = json.loads(entry.task_output)
-        self.assertEquals(output['exception'], 'TestTaskFailure')
-        self.assertEquals(output['message'], expected_message)
 
-    def test_rescore_with_failure(self):
-        self._test_run_with_failure(rescore_problem, 'We expected this to fail')
+class TestDeleteStateInstructorTask(TestInstructorTasks):
+    """Tests instructor task that deletes problem state."""
 
-    def test_reset_with_failure(self):
-        self._test_run_with_failure(reset_problem_attempts, 'We expected this to fail')
+    def test_delete_missing_current_task(self):
+        self._test_missing_current_task(delete_problem_state)
+
+    def test_delete_undefined_course(self):
+        self._test_undefined_course(delete_problem_state)
+
+    def test_delete_undefined_problem(self):
+        self._test_undefined_problem(delete_problem_state)
+
+    def test_delete_with_no_state(self):
+        self._test_run_with_no_state(delete_problem_state, 'deleted')
 
     def test_delete_with_failure(self):
         self._test_run_with_failure(delete_problem_state, 'We expected this to fail')
 
-    def _test_run_with_long_error_msg(self, task_function):
-        """
-        Run with an error message that is so long it will require
-        truncation (as well as the jettisoning of the traceback).
-        """
-        task_entry = self._create_input_entry()
-        self.define_option_problem(PROBLEM_URL_NAME)
-        expected_message = "x" * 1500
-        with self.assertRaises(TestTaskFailure):
-            self._run_task_with_mock_celery(task_function, task_entry.id, task_entry.task_id, expected_message)
-        # compare with entry in table:
-        entry = InstructorTask.objects.get(id=task_entry.id)
-        self.assertEquals(entry.task_state, FAILURE)
-        self.assertGreater(1023, len(entry.task_output))
-        output = json.loads(entry.task_output)
-        self.assertEquals(output['exception'], 'TestTaskFailure')
-        self.assertEquals(output['message'], expected_message[:len(output['message']) - 3] + "...")
-        self.assertTrue('traceback' not in output)
-
-    def test_rescore_with_long_error_msg(self):
-        self._test_run_with_long_error_msg(rescore_problem)
-
-    def test_reset_with_long_error_msg(self):
-        self._test_run_with_long_error_msg(reset_problem_attempts)
-
     def test_delete_with_long_error_msg(self):
         self._test_run_with_long_error_msg(delete_problem_state)
 
-    def _test_run_with_short_error_msg(self, task_function):
-        """
-        Run with an error message that is short enough to fit
-        in the output, but long enough that the traceback won't.
-        Confirm that the traceback is truncated.
-        """
-        task_entry = self._create_input_entry()
-        self.define_option_problem(PROBLEM_URL_NAME)
-        expected_message = "x" * 900
-        with self.assertRaises(TestTaskFailure):
-            self._run_task_with_mock_celery(task_function, task_entry.id, task_entry.task_id, expected_message)
-        # compare with entry in table:
-        entry = InstructorTask.objects.get(id=task_entry.id)
-        self.assertEquals(entry.task_state, FAILURE)
-        self.assertGreater(1023, len(entry.task_output))
-        output = json.loads(entry.task_output)
-        self.assertEquals(output['exception'], 'TestTaskFailure')
-        self.assertEquals(output['message'], expected_message)
-        self.assertEquals(output['traceback'][-3:], "...")
-
-    def test_rescore_with_short_error_msg(self):
-        self._test_run_with_short_error_msg(rescore_problem)
-
-    def test_reset_with_short_error_msg(self):
-        self._test_run_with_short_error_msg(reset_problem_attempts)
-
     def test_delete_with_short_error_msg(self):
         self._test_run_with_short_error_msg(delete_problem_state)
 
-    def test_successful_result_too_long(self):
-        # while we don't expect the existing tasks to generate output that is too
-        # long, we can test the framework will handle such an occurrence.
-        task_entry = self._create_input_entry()
-        self.define_option_problem(PROBLEM_URL_NAME)
-        action_name = 'x' * 1000
-        update_fcn = lambda(_module_descriptor, _student_module, _xmodule_instance_args): True
-        task_function = (lambda entry_id, xmodule_instance_args:
-                         update_problem_module_state(entry_id,
-                                                     update_fcn, action_name, filter_fcn=None,
-                                                     xmodule_instance_args=None))
-
-        with self.assertRaises(ValueError):
-            self._run_task_with_mock_celery(task_function, task_entry.id, task_entry.task_id)
-        # compare with entry in table:
-        entry = InstructorTask.objects.get(id=task_entry.id)
-        self.assertEquals(entry.task_state, FAILURE)
-        self.assertGreater(1023, len(entry.task_output))
-        output = json.loads(entry.task_output)
-        self.assertEquals(output['exception'], 'ValueError')
-        self.assertTrue("Length of task output is too long" in output['message'])
-        self.assertTrue('traceback' not in output)
-
-    @skip
-    def test_rescoring_unrescorable(self):
-        # TODO: this test needs to have Mako templates initialized
-        # to make sure that the creation of an XModule works.
-        input_state = json.dumps({'done': True})
-        num_students = 1
-        self._create_students_with_state(num_students, input_state)
-        task_entry = self._create_input_entry()
-        with self.assertRaises(UpdateProblemModuleStateError):
-            self._run_task_with_mock_celery(rescore_problem, task_entry.id, task_entry.task_id)
-        # check values stored in table:
-        entry = InstructorTask.objects.get(id=task_entry.id)
-        output = json.loads(entry.task_output)
-        self.assertEquals(output['exception'], "UpdateProblemModuleStateError")
-        self.assertEquals(output['message'], "Specified problem does not support rescoring.")
-        self.assertGreater(len(output['traceback']), 0)
-
-    @skip
-    def test_rescoring_success(self):
-        # TODO: this test needs to have Mako templates initialized
-        # to make sure that the creation of an XModule works.
-        input_state = json.dumps({'done': True})
+    def test_delete_with_some_state(self):
+        # This will create StudentModule entries -- we don't have to worry about
+        # the state inside them.
         num_students = 10
-        self._create_students_with_state(num_students, input_state)
-        task_entry = self._create_input_entry()
-        mock_instance = Mock()
-        mock_instance.rescore_problem = Mock({'success': 'correct'})
-        # TODO: figure out why this mock is not working....
-        with patch('courseware.module_render.get_module_for_descriptor_internal') as mock_get_module:
-            mock_get_module.return_value = mock_instance
-            self._run_task_with_mock_celery(rescore_problem, task_entry.id, task_entry.task_id)
-        # check return value
-        entry = InstructorTask.objects.get(id=task_entry.id)
-        output = json.loads(entry.task_output)
-        self.assertEquals(output.get('attempted'), num_students)
-        self.assertEquals(output.get('updated'), num_students)
-        self.assertEquals(output.get('total'), num_students)
-        self.assertEquals(output.get('action_name'), 'rescored')
-        self.assertGreater('duration_ms', 0)
+        students = self._create_students_with_state(num_students)
+        # check that entries were created correctly
+        for student in students:
+            StudentModule.objects.get(course_id=self.course.id,
+                                      student=student,
+                                      module_state_key=self.problem_url)
+        self._test_run_with_task(delete_problem_state, 'deleted', num_students)
+        # confirm that no state can be found anymore:
+        for student in students:
+            with self.assertRaises(StudentModule.DoesNotExist):
+                StudentModule.objects.get(course_id=self.course.id,
+                                          student=student,
+                                          module_state_key=self.problem_url)
diff --git a/lms/djangoapps/instructor_task/tests/test_views.py b/lms/djangoapps/instructor_task/tests/test_views.py
index 41de314abd..5dd1e4fd14 100644
--- a/lms/djangoapps/instructor_task/tests/test_views.py
+++ b/lms/djangoapps/instructor_task/tests/test_views.py
@@ -68,8 +68,10 @@ class InstructorTaskReportTest(InstructorTaskTestCase):
         self.assertEquals(output['task_id'], task_id)
         self.assertEquals(output['task_state'], FAILURE)
         self.assertFalse(output['in_progress'])
-        expected_progress = {'exception': TEST_FAILURE_EXCEPTION,
-                             'message': TEST_FAILURE_MESSAGE}
+        expected_progress = {
+            'exception': TEST_FAILURE_EXCEPTION,
+            'message': TEST_FAILURE_MESSAGE,
+        }
         self.assertEquals(output['task_progress'], expected_progress)
 
     def test_get_status_from_success(self):
@@ -83,13 +85,70 @@ class InstructorTaskReportTest(InstructorTaskTestCase):
         self.assertEquals(output['task_id'], task_id)
         self.assertEquals(output['task_state'], SUCCESS)
         self.assertFalse(output['in_progress'])
-        expected_progress = {'attempted': 3,
-                             'updated': 2,
-                             'total': 5,
-                             'action_name': 'rescored'}
+        expected_progress = {
+            'attempted': 3,
+            'succeeded': 2,
+            'total': 5,
+            'action_name': 'rescored',
+        }
         self.assertEquals(output['task_progress'], expected_progress)
 
-    def _test_get_status_from_result(self, task_id, mock_result):
+    def test_get_status_from_legacy_success(self):
+        # get status for a task that had already succeeded, back at a time
+        # when 'updated' was used instead of the preferred 'succeeded'.
+        legacy_progress = {
+            'attempted': 3,
+            'updated': 2,
+            'total': 5,
+            'action_name': 'rescored',
+        }
+        instructor_task = self._create_entry(task_state=SUCCESS, task_output=legacy_progress)
+        task_id = instructor_task.task_id
+        response = self._get_instructor_task_status(task_id)
+        output = json.loads(response.content)
+        self.assertEquals(output['message'], "Problem rescored for 2 of 3 students (out of 5)")
+        self.assertEquals(output['succeeded'], False)
+        self.assertEquals(output['task_id'], task_id)
+        self.assertEquals(output['task_state'], SUCCESS)
+        self.assertFalse(output['in_progress'])
+        self.assertEquals(output['task_progress'], legacy_progress)
+
+    def _create_email_subtask_entry(self, total=5, attempted=3, succeeded=2, skipped=0, task_state=PROGRESS):
+        """Create an InstructorTask with subtask defined and email argument."""
+        progress = {'attempted': attempted,
+                    'succeeded': succeeded,
+                    'skipped': skipped,
+                    'total': total,
+                    'action_name': 'emailed',
+                    }
+        instructor_task = self._create_entry(task_state=task_state, task_output=progress)
+        instructor_task.subtasks = {}
+        instructor_task.task_input = json.dumps({'email_id': 134})
+        instructor_task.save()
+        return instructor_task
+
+    def test_get_status_from_subtasks(self):
+        # get status for a task that is in progress, with updates
+        # from subtasks.
+        instructor_task = self._create_email_subtask_entry(skipped=1)
+        task_id = instructor_task.task_id
+        response = self._get_instructor_task_status(task_id)
+        output = json.loads(response.content)
+        self.assertEquals(output['message'], "Progress: emailed 2 of 3 so far (skipping 1) (out of 5)")
+        self.assertEquals(output['succeeded'], False)
+        self.assertEquals(output['task_id'], task_id)
+        self.assertEquals(output['task_state'], PROGRESS)
+        self.assertTrue(output['in_progress'])
+        expected_progress = {
+            'attempted': 3,
+            'succeeded': 2,
+            'skipped': 1,
+            'total': 5,
+            'action_name': 'emailed',
+        }
+        self.assertEquals(output['task_progress'], expected_progress)
+
+    def _test_get_status_from_result(self, task_id, mock_result=None):
         """
         Provides mock result to caller of instructor_task_status, and returns resulting output.
         """
@@ -120,10 +179,12 @@ class InstructorTaskReportTest(InstructorTaskTestCase):
         mock_result = Mock()
         mock_result.task_id = task_id
         mock_result.state = PROGRESS
-        mock_result.result = {'attempted': 5,
-                              'updated': 4,
-                              'total': 10,
-                              'action_name': 'rescored'}
+        mock_result.result = {
+            'attempted': 5,
+            'succeeded': 4,
+            'total': 10,
+            'action_name': 'rescored',
+        }
         output = self._test_get_status_from_result(task_id, mock_result)
         self.assertEquals(output['message'], "Progress: rescored 4 of 5 so far (out of 10)")
         self.assertEquals(output['succeeded'], False)
@@ -145,9 +206,11 @@ class InstructorTaskReportTest(InstructorTaskTestCase):
         self.assertEquals(output['succeeded'], False)
         self.assertEquals(output['task_state'], FAILURE)
         self.assertFalse(output['in_progress'])
-        expected_progress = {'exception': 'NotImplementedError',
-                             'message': "This task later failed.",
-                             'traceback': "random traceback"}
+        expected_progress = {
+            'exception': 'NotImplementedError',
+            'message': "This task later failed.",
+            'traceback': "random traceback",
+        }
         self.assertEquals(output['task_progress'], expected_progress)
 
     def test_update_progress_to_revoked(self):
@@ -165,7 +228,7 @@ class InstructorTaskReportTest(InstructorTaskTestCase):
         expected_progress = {'message': "Task revoked before running"}
         self.assertEquals(output['task_progress'], expected_progress)
 
-    def _get_output_for_task_success(self, attempted, updated, total, student=None):
+    def _get_output_for_task_success(self, attempted, succeeded, total, student=None):
         """returns the task_id and the result returned by instructor_task_status()."""
         # view task entry for task in progress
         instructor_task = self._create_progress_entry(student)
@@ -173,23 +236,38 @@ class InstructorTaskReportTest(InstructorTaskTestCase):
         mock_result = Mock()
         mock_result.task_id = task_id
         mock_result.state = SUCCESS
-        mock_result.result = {'attempted': attempted,
-                              'updated': updated,
-                              'total': total,
-                              'action_name': 'rescored'}
+        mock_result.result = {
+            'attempted': attempted,
+            'succeeded': succeeded,
+            'total': total,
+            'action_name': 'rescored',
+        }
         output = self._test_get_status_from_result(task_id, mock_result)
         return output
 
+    def _get_email_output_for_task_success(self, attempted, succeeded, total, skipped=0):
+        """returns the result returned by instructor_task_status()."""
+        instructor_task = self._create_email_subtask_entry(
+            total=total,
+            attempted=attempted,
+            succeeded=succeeded,
+            skipped=skipped,
+            task_state=SUCCESS,
+        )
+        return self._test_get_status_from_result(instructor_task.task_id)
+
     def test_update_progress_to_success(self):
         output = self._get_output_for_task_success(10, 8, 10)
         self.assertEquals(output['message'], "Problem rescored for 8 of 10 students")
         self.assertEquals(output['succeeded'], False)
         self.assertEquals(output['task_state'], SUCCESS)
         self.assertFalse(output['in_progress'])
-        expected_progress = {'attempted': 10,
-                             'updated': 8,
-                             'total': 10,
-                             'action_name': 'rescored'}
+        expected_progress = {
+            'attempted': 10,
+            'succeeded': 8,
+            'total': 10,
+            'action_name': 'rescored',
+        }
         self.assertEquals(output['task_progress'], expected_progress)
 
     def test_success_messages(self):
@@ -225,6 +303,47 @@ class InstructorTaskReportTest(InstructorTaskTestCase):
         self.assertTrue("Problem successfully rescored for student" in output['message'])
         self.assertTrue(output['succeeded'])
 
+    def test_email_success_messages(self):
+        output = self._get_email_output_for_task_success(0, 0, 10)
+        self.assertEqual(output['message'], "Unable to find any recipients to be emailed (out of 10)")
+        self.assertFalse(output['succeeded'])
+
+        output = self._get_email_output_for_task_success(10, 0, 10)
+        self.assertEqual(output['message'], "Message failed to be emailed for any of 10 recipients ")
+        self.assertFalse(output['succeeded'])
+
+        output = self._get_email_output_for_task_success(10, 8, 10)
+        self.assertEqual(output['message'], "Message emailed for 8 of 10 recipients")
+        self.assertFalse(output['succeeded'])
+
+        output = self._get_email_output_for_task_success(9, 8, 10)
+        self.assertEqual(output['message'], "Message emailed for 8 of 9 recipients (out of 10)")
+        self.assertFalse(output['succeeded'])
+
+        output = self._get_email_output_for_task_success(10, 10, 10)
+        self.assertEqual(output['message'], "Message successfully emailed for 10 recipients")
+        self.assertTrue(output['succeeded'])
+
+        output = self._get_email_output_for_task_success(0, 0, 10, skipped=3)
+        self.assertEqual(output['message'], "Unable to find any recipients to be emailed (skipping 3) (out of 10)")
+        self.assertFalse(output['succeeded'])
+
+        output = self._get_email_output_for_task_success(10, 0, 10, skipped=3)
+        self.assertEqual(output['message'], "Message failed to be emailed for any of 10 recipients  (skipping 3)")
+        self.assertFalse(output['succeeded'])
+
+        output = self._get_email_output_for_task_success(10, 8, 10, skipped=3)
+        self.assertEqual(output['message'], "Message emailed for 8 of 10 recipients (skipping 3)")
+        self.assertFalse(output['succeeded'])
+
+        output = self._get_email_output_for_task_success(9, 8, 10, skipped=3)
+        self.assertEqual(output['message'], "Message emailed for 8 of 9 recipients (skipping 3) (out of 10)")
+        self.assertFalse(output['succeeded'])
+
+        output = self._get_email_output_for_task_success(10, 10, 10, skipped=3)
+        self.assertEqual(output['message'], "Message successfully emailed for 10 recipients (skipping 3)")
+        self.assertTrue(output['succeeded'])
+
     def test_get_info_for_queuing_task(self):
         # get status for a task that is still running:
         instructor_task = self._create_entry()
@@ -262,4 +381,4 @@ class InstructorTaskReportTest(InstructorTaskTestCase):
         instructor_task.task_input = "{ bad"
         succeeded, message = get_task_completion_info(instructor_task)
         self.assertFalse(succeeded)
-        self.assertEquals(message, "Problem rescored for 2 of 3 students (out of 5)")
+        self.assertEquals(message, "Status: rescored 2 of 3 (out of 5)")
diff --git a/lms/djangoapps/instructor_task/views.py b/lms/djangoapps/instructor_task/views.py
index 40f128d08e..9a23841425 100644
--- a/lms/djangoapps/instructor_task/views.py
+++ b/lms/djangoapps/instructor_task/views.py
@@ -3,6 +3,7 @@ import json
 import logging
 
 from django.http import HttpResponse
+from django.utils.translation import ugettext as _
 
 from celery.states import FAILURE, REVOKED, READY_STATES
 
@@ -40,7 +41,7 @@ def instructor_task_status(request):
 
     Status is returned as a JSON-serialized dict, wrapped as the content of a HTTPResponse.
 
-    The task_id can be specified to this view in one of three ways:
+    The task_id can be specified to this view in one of two ways:
 
     * by making a request containing 'task_id' as a parameter with a single value
       Returns a dict containing status information for the specified task_id
@@ -65,7 +66,7 @@ def instructor_task_status(request):
       'in_progress': boolean indicating if task is still running.
       'task_progress': dict containing progress information.  This includes:
           'attempted': number of attempts made
-          'updated': number of attempts that "succeeded"
+          'succeeded': number of attempts that "succeeded"
           'total': number of possible subtasks to attempt
           'action_name': user-visible verb to use in status messages.  Should be past-tense.
           'duration_ms': how long the task has (or had) been running.
@@ -105,68 +106,118 @@ def get_task_completion_info(instructor_task):
     succeeded = False
 
     if instructor_task.task_state not in STATES_WITH_STATUS:
-        return (succeeded, "No status information available")
+        return (succeeded, _("No status information available"))
 
     # we're more surprised if there is no output for a completed task, but just warn:
     if instructor_task.task_output is None:
-        log.warning("No task_output information found for instructor_task {0}".format(instructor_task.task_id))
-        return (succeeded, "No status information available")
+        log.warning(_("No task_output information found for instructor_task {0}").format(instructor_task.task_id))
+        return (succeeded, _("No status information available"))
 
     try:
         task_output = json.loads(instructor_task.task_output)
     except ValueError:
-        fmt = "No parsable task_output information found for instructor_task {0}: {1}"
+        fmt = _("No parsable task_output information found for instructor_task {0}: {1}")
         log.warning(fmt.format(instructor_task.task_id, instructor_task.task_output))
-        return (succeeded, "No parsable status information available")
+        return (succeeded, _("No parsable status information available"))
 
     if instructor_task.task_state in [FAILURE, REVOKED]:
-        return (succeeded, task_output.get('message', 'No message provided'))
+        return (succeeded, task_output.get('message', _('No message provided')))
 
-    if any([key not in task_output for key in ['action_name', 'attempted', 'updated', 'total']]):
-        fmt = "Invalid task_output information found for instructor_task {0}: {1}"
+    if any([key not in task_output for key in ['action_name', 'attempted', 'total']]):
+        fmt = _("Invalid task_output information found for instructor_task {0}: {1}")
         log.warning(fmt.format(instructor_task.task_id, instructor_task.task_output))
-        return (succeeded, "No progress status information available")
+        return (succeeded, _("No progress status information available"))
 
-    action_name = task_output['action_name']
+    action_name = _(task_output['action_name'])
     num_attempted = task_output['attempted']
-    num_updated = task_output['updated']
     num_total = task_output['total']
 
+    # In earlier versions of this code, the key 'updated' was used instead of
+    # (the more general) 'succeeded'.  In order to support history that may contain
+    # output with the old key, we check for values with both the old and the current
+    # key, and simply sum them.
+    num_succeeded = task_output.get('updated', 0) + task_output.get('succeeded', 0)
+    num_skipped = task_output.get('skipped', 0)
+
     student = None
+    problem_url = None
+    email_id = None
     try:
         task_input = json.loads(instructor_task.task_input)
     except ValueError:
-        fmt = "No parsable task_input information found for instructor_task {0}: {1}"
+        fmt = _("No parsable task_input information found for instructor_task {0}: {1}")
         log.warning(fmt.format(instructor_task.task_id, instructor_task.task_input))
     else:
         student = task_input.get('student')
+        problem_url = task_input.get('problem_url')
+        email_id = task_input.get('email_id')
 
     if instructor_task.task_state == PROGRESS:
         # special message for providing progress updates:
-        msg_format = "Progress: {action} {updated} of {attempted} so far"
-    elif student is not None:
+        # Translators: {action} is a past-tense verb that is localized separately. {attempted} and {succeeded} are counts.
+        msg_format = _("Progress: {action} {succeeded} of {attempted} so far")
+    elif student is not None and problem_url is not None:
+        # this reports on actions on problems for a particular student:
         if num_attempted == 0:
-            msg_format = "Unable to find submission to be {action} for student '{student}'"
-        elif num_updated == 0:
-            msg_format = "Problem failed to be {action} for student '{student}'"
+            # Translators: {action} is a past-tense verb that is localized separately. {student} is a student identifier.
+            msg_format = _("Unable to find submission to be {action} for student '{student}'")
+        elif num_succeeded == 0:
+            # Translators: {action} is a past-tense verb that is localized separately. {student} is a student identifier.
+            msg_format = _("Problem failed to be {action} for student '{student}'")
         else:
             succeeded = True
-            msg_format = "Problem successfully {action} for student '{student}'"
-    elif num_attempted == 0:
-        msg_format = "Unable to find any students with submissions to be {action}"
-    elif num_updated == 0:
-        msg_format = "Problem failed to be {action} for any of {attempted} students"
-    elif num_updated == num_attempted:
-        succeeded = True
-        msg_format = "Problem successfully {action} for {attempted} students"
-    else:  # num_updated < num_attempted
-        msg_format = "Problem {action} for {updated} of {attempted} students"
+            # Translators: {action} is a past-tense verb that is localized separately. {student} is a student identifier.
+            msg_format = _("Problem successfully {action} for student '{student}'")
+    elif student is None and problem_url is not None:
+        # this reports on actions on problems for all students:
+        if num_attempted == 0:
+            # Translators: {action} is a past-tense verb that is localized separately.
+            msg_format = _("Unable to find any students with submissions to be {action}")
+        elif num_succeeded == 0:
+            # Translators: {action} is a past-tense verb that is localized separately. {attempted} is a count.
+            msg_format = _("Problem failed to be {action} for any of {attempted} students")
+        elif num_succeeded == num_attempted:
+            succeeded = True
+            # Translators: {action} is a past-tense verb that is localized separately. {attempted} is a count.
+            msg_format = _("Problem successfully {action} for {attempted} students")
+        else:  # num_succeeded < num_attempted
+            # Translators: {action} is a past-tense verb that is localized separately. {succeeded} and {attempted} are counts.
+            msg_format = _("Problem {action} for {succeeded} of {attempted} students")
+    elif email_id is not None:
+        # this reports on actions on bulk emails
+        if num_attempted == 0:
+            # Translators: {action} is a past-tense verb that is localized separately.
+            msg_format = _("Unable to find any recipients to be {action}")
+        elif num_succeeded == 0:
+            # Translators: {action} is a past-tense verb that is localized separately. {attempted} is a count.
+            msg_format = _("Message failed to be {action} for any of {attempted} recipients ")
+        elif num_succeeded == num_attempted:
+            succeeded = True
+            # Translators: {action} is a past-tense verb that is localized separately. {attempted} is a count.
+            msg_format = _("Message successfully {action} for {attempted} recipients")
+        else:  # num_succeeded < num_attempted
+            # Translators: {action} is a past-tense verb that is localized separately. {succeeded} and {attempted} are counts.
+            msg_format = _("Message {action} for {succeeded} of {attempted} recipients")
+    else:
+        # provide a default:
+        # Translators: {action} is a past-tense verb that is localized separately. {succeeded} and {attempted} are counts.
+        msg_format = _("Status: {action} {succeeded} of {attempted}")
+
+    if num_skipped > 0:
+        # Translators: {skipped} is a count.  This message is appended to task progress status messages.
+        msg_format += _(" (skipping {skipped})")
 
     if student is None and num_attempted != num_total:
-        msg_format += " (out of {total})"
+        # Translators: {total} is a count.  This message is appended to task progress status messages.
+        msg_format += _(" (out of {total})")
 
     # Update status in task result object itself:
-    message = msg_format.format(action=action_name, updated=num_updated,
-                                attempted=num_attempted, total=num_total,
-                                student=student)
+    message = msg_format.format(
+        action=action_name,
+        succeeded=num_succeeded,
+        attempted=num_attempted,
+        total=num_total,
+        skipped=num_skipped,
+        student=student
+    )
     return (succeeded, message)
diff --git a/lms/djangoapps/open_ended_grading/open_ended_notifications.py b/lms/djangoapps/open_ended_grading/open_ended_notifications.py
index 00b9f7e866..3074e12540 100644
--- a/lms/djangoapps/open_ended_grading/open_ended_notifications.py
+++ b/lms/djangoapps/open_ended_grading/open_ended_notifications.py
@@ -13,8 +13,6 @@ from xmodule.x_module import ModuleSystem
 from mitxmako.shortcuts import render_to_string
 import datetime
 
-from xblock.field_data import DictFieldData
-
 log = logging.getLogger(__name__)
 
 NOTIFICATION_CACHE_TIME = 300
@@ -70,7 +68,6 @@ def peer_grading_notifications(course, user):
         get_module = None,
         render_template=render_to_string,
         replace_urls=None,
-        xmodule_field_data=DictFieldData({}),
     )
     peer_gs = peer_grading_service.PeerGradingService(settings.OPEN_ENDED_GRADING_INTERFACE, system)
     pending_grading = False
@@ -132,7 +129,6 @@ def combined_notifications(course, user):
         get_module = None,
         render_template=render_to_string,
         replace_urls=None,
-        xmodule_field_data=DictFieldData({})
     )
     #Initialize controller query service using our mock system
     controller_qs = ControllerQueryService(settings.OPEN_ENDED_GRADING_INTERFACE, system)
diff --git a/lms/djangoapps/open_ended_grading/staff_grading_service.py b/lms/djangoapps/open_ended_grading/staff_grading_service.py
index dacf52b39e..55ff2b1371 100644
--- a/lms/djangoapps/open_ended_grading/staff_grading_service.py
+++ b/lms/djangoapps/open_ended_grading/staff_grading_service.py
@@ -9,8 +9,6 @@ from xmodule.open_ended_grading_classes.grading_service_module import GradingSer
 from django.conf import settings
 from django.http import HttpResponse, Http404
 
-from xblock.field_data import DictFieldData
-
 from courseware.access import has_access
 from util.json_request import expect_json
 from xmodule.course_module import CourseDescriptor
@@ -76,7 +74,6 @@ class StaffGradingService(GradingService):
             get_module = None,
             render_template=render_to_string,
             replace_urls=None,
-            xmodule_field_data=DictFieldData({})
         )
         super(StaffGradingService, self).__init__(config)
         self.url = config['url'] + config['staff_grading']
diff --git a/lms/djangoapps/open_ended_grading/tests.py b/lms/djangoapps/open_ended_grading/tests.py
index 65a1ce68cc..7b804d8342 100644
--- a/lms/djangoapps/open_ended_grading/tests.py
+++ b/lms/djangoapps/open_ended_grading/tests.py
@@ -16,6 +16,7 @@ from xmodule.open_ended_grading_classes import peer_grading_service, controller_
 from xmodule import peer_grading_module
 from xmodule.modulestore.django import modulestore
 from xmodule.x_module import ModuleSystem
+from xmodule.error_module import ErrorDescriptor
 from xblock.fields import ScopeIds
 
 from open_ended_grading import staff_grading_service, views, utils
@@ -251,13 +252,14 @@ class TestPeerGradingService(ModuleStoreTestCase, LoginEnrollmentTestCase):
             get_module=None,
             render_template=render_to_string,
             replace_urls=None,
-            xmodule_field_data=lambda d: d._field_data,
             s3_interface=test_util_open_ended.S3_INTERFACE,
             open_ended_grading_interface=test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
             mixins=settings.XBLOCK_MIXINS,
+            error_descriptor_class=ErrorDescriptor,
         )
         self.descriptor = peer_grading_module.PeerGradingDescriptor(self.system, field_data, ScopeIds(None, None, None, None))
-        self.peer_module = self.descriptor.xmodule(self.system)
+        self.descriptor.xmodule_runtime = self.system
+        self.peer_module = self.descriptor
         self.peer_module.peer_gs = self.mock_service
         self.logout()
 
diff --git a/lms/djangoapps/open_ended_grading/utils.py b/lms/djangoapps/open_ended_grading/utils.py
index 3ad85544f2..786b328fcf 100644
--- a/lms/djangoapps/open_ended_grading/utils.py
+++ b/lms/djangoapps/open_ended_grading/utils.py
@@ -36,7 +36,6 @@ system = ModuleSystem(
     get_module=None,
     render_template=render_to_string,
     replace_urls=None,
-    xmodule_field_data=DictFieldData({}),
 )
 
 
diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py
index 8b5801ce23..9f2f0866db 100644
--- a/lms/envs/acceptance.py
+++ b/lms/envs/acceptance.py
@@ -74,6 +74,14 @@ DATABASES = {
     }
 }
 
+TRACKING_BACKENDS.update({
+    'mongo': {
+        'ENGINE': 'track.backends.mongodb.MongoBackend'
+    }
+})
+
+DEFAULT_BULK_FROM_EMAIL = "test@test.org"
+
 # Forums are disabled in test.py to speed up unit tests, but we do not have
 # per-test control for acceptance tests
 MITX_FEATURES['ENABLE_DISCUSSION_SERVICE'] = True
@@ -88,6 +96,9 @@ MITX_FEATURES['AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING'] = True
 # Enable fake payment processing page
 MITX_FEATURES['ENABLE_PAYMENT_FAKE'] = True
 
+# Enable email on the instructor dash
+MITX_FEATURES['ENABLE_INSTRUCTOR_EMAIL'] = True
+
 # Configure the payment processor to use the fake processing page
 # Since both the fake payment page and the shoppingcart app are using
 # the same settings, we can generate this randomly and guarantee
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 86d3d539bd..ee56c6490a 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -17,18 +17,20 @@ from .common import *
 from logsettings import get_logger_config
 import os
 
-# specified as an environment variable.  Typically this is set
-# in the service's upstart script and corresponds exactly to the service name.
-# Service variants apply config differences via env and auth JSON files,
-# the names of which correspond to the variant.
+
+# SERVICE_VARIANT specifies name of the variant used, which decides what JSON
+# configuration files are read during startup.
 SERVICE_VARIANT = os.environ.get('SERVICE_VARIANT', None)
 
-# when not variant is specified we attempt to load an unvaried
-# config set.
-CONFIG_PREFIX = ""
+# CONFIG_ROOT specifies the directory where the JSON configuration
+# files are expected to be found. If not specified, use the project
+# directory.
+CONFIG_ROOT = os.environ.get('CONFIG_ROOT', ENV_ROOT)
 
-if SERVICE_VARIANT:
-    CONFIG_PREFIX = SERVICE_VARIANT + "."
+# CONFIG_PREFIX specifies the prefix of the JSON configuration files,
+# based on the service variant. If no variant is use, don't use a
+# prefix.
+CONFIG_PREFIX = SERVICE_VARIANT + "." if SERVICE_VARIANT else ""
 
 
 ################################ ALWAYS THE SAME ##############################
@@ -96,7 +98,7 @@ CELERY_QUEUES = {
 ########################## NON-SECURE ENV CONFIG ##############################
 # Things like server locations, ports, etc.
 
-with open(ENV_ROOT / CONFIG_PREFIX + "env.json") as env_file:
+with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file:
     ENV_TOKENS = json.load(env_file)
 
 PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', PLATFORM_NAME)
@@ -107,8 +109,6 @@ EMAIL_FILE_PATH = ENV_TOKENS.get('EMAIL_FILE_PATH', None)
 EMAIL_HOST = ENV_TOKENS.get('EMAIL_HOST', 'localhost')  # django default is localhost
 EMAIL_PORT = ENV_TOKENS.get('EMAIL_PORT', 25)  # django default is 25
 EMAIL_USE_TLS = ENV_TOKENS.get('EMAIL_USE_TLS', False)  # django default is False
-EMAILS_PER_TASK = ENV_TOKENS.get('EMAILS_PER_TASK', 100)
-EMAILS_PER_QUERY = ENV_TOKENS.get('EMAILS_PER_QUERY', 1000)
 SITE_NAME = ENV_TOKENS['SITE_NAME']
 SESSION_ENGINE = ENV_TOKENS.get('SESSION_ENGINE', SESSION_ENGINE)
 SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN')
@@ -128,10 +128,9 @@ LOG_DIR = ENV_TOKENS['LOG_DIR']
 
 CACHES = ENV_TOKENS['CACHES']
 
-#Email overrides
+# Email overrides
 DEFAULT_FROM_EMAIL = ENV_TOKENS.get('DEFAULT_FROM_EMAIL', DEFAULT_FROM_EMAIL)
 DEFAULT_FEEDBACK_EMAIL = ENV_TOKENS.get('DEFAULT_FEEDBACK_EMAIL', DEFAULT_FEEDBACK_EMAIL)
-DEFAULT_BULK_FROM_EMAIL = ENV_TOKENS.get('DEFAULT_BULK_FROM_EMAIL', DEFAULT_BULK_FROM_EMAIL)
 ADMINS = ENV_TOKENS.get('ADMINS', ADMINS)
 SERVER_EMAIL = ENV_TOKENS.get('SERVER_EMAIL', SERVER_EMAIL)
 TECH_SUPPORT_EMAIL = ENV_TOKENS.get('TECH_SUPPORT_EMAIL', TECH_SUPPORT_EMAIL)
@@ -141,7 +140,21 @@ PAYMENT_SUPPORT_EMAIL = ENV_TOKENS.get('PAYMENT_SUPPORT_EMAIL', PAYMENT_SUPPORT_
 PAID_COURSE_REGISTRATION_CURRENCY = ENV_TOKENS.get('PAID_COURSE_REGISTRATION_CURRENCY',
                                                    PAID_COURSE_REGISTRATION_CURRENCY)
 
-#Theme overrides
+# Bulk Email overrides
+BULK_EMAIL_DEFAULT_FROM_EMAIL = ENV_TOKENS.get('BULK_EMAIL_DEFAULT_FROM_EMAIL', BULK_EMAIL_DEFAULT_FROM_EMAIL)
+BULK_EMAIL_EMAILS_PER_TASK = ENV_TOKENS.get('BULK_EMAIL_EMAILS_PER_TASK', BULK_EMAIL_EMAILS_PER_TASK)
+BULK_EMAIL_EMAILS_PER_QUERY = ENV_TOKENS.get('BULK_EMAIL_EMAILS_PER_QUERY', BULK_EMAIL_EMAILS_PER_QUERY)
+BULK_EMAIL_DEFAULT_RETRY_DELAY = ENV_TOKENS.get('BULK_EMAIL_DEFAULT_RETRY_DELAY', BULK_EMAIL_DEFAULT_RETRY_DELAY)
+BULK_EMAIL_MAX_RETRIES = ENV_TOKENS.get('BULK_EMAIL_MAX_RETRIES', BULK_EMAIL_MAX_RETRIES)
+BULK_EMAIL_INFINITE_RETRY_CAP = ENV_TOKENS.get('BULK_EMAIL_INFINITE_RETRY_CAP', BULK_EMAIL_INFINITE_RETRY_CAP)
+BULK_EMAIL_LOG_SENT_EMAILS = ENV_TOKENS.get('BULK_EMAIL_LOG_SENT_EMAILS', BULK_EMAIL_LOG_SENT_EMAILS)
+BULK_EMAIL_RETRY_DELAY_BETWEEN_SENDS = ENV_TOKENS.get('BULK_EMAIL_RETRY_DELAY_BETWEEN_SENDS', BULK_EMAIL_RETRY_DELAY_BETWEEN_SENDS)
+# We want Bulk Email running on the high-priority queue, so we define the
+# routing key that points to it.  At the moment, the name is the same.
+# We have to reset the value here, since we have changed the value of the queue name.
+BULK_EMAIL_ROUTING_KEY = HIGH_PRIORITY_QUEUE
+
+# Theme overrides
 THEME_NAME = ENV_TOKENS.get('THEME_NAME', None)
 if not THEME_NAME is None:
     enable_theme(THEME_NAME)
@@ -150,10 +163,10 @@ if not THEME_NAME is None:
 # Marketing link overrides
 MKTG_URL_LINK_MAP.update(ENV_TOKENS.get('MKTG_URL_LINK_MAP', {}))
 
-#Timezone overrides
+# Timezone overrides
 TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE)
 
-#Additional installed apps
+# Additional installed apps
 for app in ENV_TOKENS.get('ADDL_INSTALLED_APPS', []):
     INSTALLED_APPS += (app,)
 
@@ -198,7 +211,7 @@ if "TRACKING_IGNORE_URL_PATTERNS" in ENV_TOKENS:
 ############################## SECURE AUTH ITEMS ###############
 # Secret things: passwords, access keys, etc.
 
-with open(ENV_ROOT / CONFIG_PREFIX + "auth.json") as auth_file:
+with open(CONFIG_ROOT / CONFIG_PREFIX + "auth.json") as auth_file:
     AUTH_TOKENS = json.load(auth_file)
 
 ############### Mixed Related(Secure/Not-Secure) Items ##########
diff --git a/lms/envs/cms/aws.py b/lms/envs/cms/aws.py
index baeaebca1c..62e3ed978b 100644
--- a/lms/envs/cms/aws.py
+++ b/lms/envs/cms/aws.py
@@ -12,3 +12,5 @@ with open(ENV_ROOT / "cms.auth.json") as auth_file:
     CMS_AUTH_TOKENS = json.load(auth_file)
 
 MODULESTORE = CMS_AUTH_TOKENS['MODULESTORE']
+
+HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS = ENVS_TOKENS.get('HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS',{})
diff --git a/lms/envs/cms/dev.py b/lms/envs/cms/dev.py
index 7026d45366..6444ed569d 100644
--- a/lms/envs/cms/dev.py
+++ b/lms/envs/cms/dev.py
@@ -39,6 +39,10 @@ MODULESTORE = {
         'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore',
         'OPTIONS': modulestore_options
     },
+    'draft': {
+        'ENGINE': 'xmodule.modulestore.mongo.DraftMongoModuleStore',
+        'OPTIONS': modulestore_options    
+    },
 }
 
 CONTENTSTORE = {
@@ -58,3 +62,10 @@ INSTALLED_APPS += (
 DEBUG_TOOLBAR_PANELS += (
    'debug_toolbar_mongo.panel.MongoDebugPanel',
    )
+
+# HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS defines, as dictionary of regex's, a set of mappings of HTTP request hostnames to
+# what the 'default' modulestore to use while processing the request
+# for example 'preview.edx.org' should use the draft modulestore
+HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS = {
+    'preview\.': 'draft'
+}
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 22047afb28..db66b821ca 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -114,7 +114,12 @@ MITX_FEATURES = {
     # analytics experiments
     'ENABLE_INSTRUCTOR_ANALYTICS': False,
 
-    'ENABLE_INSTRUCTOR_EMAIL': False,
+    # Enables the LMS bulk email feature for course staff
+    'ENABLE_INSTRUCTOR_EMAIL': True,
+    # If True and ENABLE_INSTRUCTOR_EMAIL: Forces email to be explicitly turned on
+    #   for each course via django-admin interface.
+    # If False and ENABLE_INSTRUCTOR_EMAIL: Email will be turned on by default for all courses.
+    'REQUIRE_COURSE_EMAIL_AUTH': True,
 
     # enable analytics server.
     # WARNING: THIS SHOULD ALWAYS BE SET TO FALSE UNDER NORMAL
@@ -340,7 +345,7 @@ TRACKING_BACKENDS = {
     }
 }
 
-# Backawrds compatibility with ENABLE_SQL_TRACKING_LOGS feature flag.
+# Backwards compatibility with ENABLE_SQL_TRACKING_LOGS feature flag.
 # In the future, adding the backend to TRACKING_BACKENDS enough.
 if MITX_FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
     TRACKING_BACKENDS.update({
@@ -425,12 +430,9 @@ HTTPS = 'on'
 ROOT_URLCONF = 'lms.urls'
 IGNORABLE_404_ENDS = ('favicon.ico')
 
-# Email
+# Platform Email
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 DEFAULT_FROM_EMAIL = 'registration@edx.org'
-DEFAULT_BULK_FROM_EMAIL = 'course-updates@edx.org'
-EMAILS_PER_TASK = 100
-EMAILS_PER_QUERY = 1000
 DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org'
 SERVER_EMAIL = 'devops@edx.org'
 TECH_SUPPORT_EMAIL = 'technical@edx.org'
@@ -454,6 +456,12 @@ FAVICON_PATH = 'images/favicon.ico'
 # Locale/Internationalization
 TIME_ZONE = 'America/New_York'  # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 LANGUAGE_CODE = 'en'  # http://www.i18nguy.com/unicode/language-identifiers.html
+
+# We want i18n to be turned off in production, at least until we have full localizations.
+# Thus we want the Django translation engine to be disabled. Otherwise even without
+# localization files, if the user's browser is set to a language other than us-en,
+# strings like "login" and "password" will be translated and the rest of the page will be
+# in English, which is confusing.
 USE_I18N = False
 USE_L10N = True
 
@@ -579,6 +587,7 @@ MIDDLEWARE_CLASSES = (
     #'django.contrib.auth.middleware.AuthenticationMiddleware',
     'cache_toolbox.middleware.CacheBackedAuthenticationMiddleware',
     'contentserver.middleware.StaticContentServer',
+    'crum.CurrentRequestUserMiddleware',
 
     'django.contrib.messages.middleware.MessageMiddleware',
     'track.middleware.TrackMiddleware',
@@ -805,6 +814,45 @@ CELERY_QUEUES = {
     DEFAULT_PRIORITY_QUEUE: {}
 }
 
+# let logging work as configured:
+CELERYD_HIJACK_ROOT_LOGGER = False
+
+################################ Bulk Email ###################################
+
+# Suffix used to construct 'from' email address for bulk emails.
+# A course-specific identifier is prepended.
+BULK_EMAIL_DEFAULT_FROM_EMAIL = 'no-reply@courseupdates.edx.org'
+
+# Parameters for breaking down course enrollment into subtasks.
+BULK_EMAIL_EMAILS_PER_TASK = 100
+BULK_EMAIL_EMAILS_PER_QUERY = 1000
+
+# Initial delay used for retrying tasks.  Additional retries use
+# longer delays.  Value is in seconds.
+BULK_EMAIL_DEFAULT_RETRY_DELAY = 30
+
+# Maximum number of retries per task for errors that are not related
+# to throttling.
+BULK_EMAIL_MAX_RETRIES = 5
+
+# Maximum number of retries per task for errors that are related to
+# throttling.  If this is not set, then there is no cap on such retries.
+BULK_EMAIL_INFINITE_RETRY_CAP = 1000
+
+# We want Bulk Email running on the high-priority queue, so we define the
+# routing key that points to it.  At the moment, the name is the same.
+BULK_EMAIL_ROUTING_KEY = HIGH_PRIORITY_QUEUE
+
+# Flag to indicate if individual email addresses should be logged as they are sent
+# a bulk email message.
+BULK_EMAIL_LOG_SENT_EMAILS = False
+
+# Delay in seconds to sleep between individual mail messages being sent,
+# when a bulk email task is retried for rate-related reasons.  Choose this
+# value depending on the number of workers that might be sending email in
+# parallel, and what the SES rate is.
+BULK_EMAIL_RETRY_DELAY_BETWEEN_SENDS = 0.02
+
 ################################### APPS ######################################
 INSTALLED_APPS = (
     # Standard ones that are always installed...
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 43b3ef5d15..e873861196 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -16,6 +16,7 @@ from .common import *
 from logsettings import get_logger_config
 
 DEBUG = True
+USE_I18N = True
 TEMPLATE_DEBUG = True
 
 
@@ -28,6 +29,7 @@ MITX_FEATURES['ENABLE_MANUAL_GIT_RELOAD'] = True
 MITX_FEATURES['ENABLE_PSYCHOMETRICS'] = False    # real-time psychometrics (eg item response theory analysis in instructor dashboard)
 MITX_FEATURES['ENABLE_INSTRUCTOR_ANALYTICS'] = True
 MITX_FEATURES['ENABLE_SERVICE_STATUS'] = True
+MITX_FEATURES['ENABLE_INSTRUCTOR_EMAIL'] = True
 MITX_FEATURES['ENABLE_HINTER_INSTRUCTOR_VIEW'] = True
 MITX_FEATURES['ENABLE_INSTRUCTOR_BETA_DASHBOARD'] = True
 MITX_FEATURES['MULTIPLE_ENROLLMENT_ROLES'] = True
diff --git a/lms/lib/comment_client/utils.py b/lms/lib/comment_client/utils.py
index 0ff06fced7..086ffa3aa9 100644
--- a/lms/lib/comment_client/utils.py
+++ b/lms/lib/comment_client/utils.py
@@ -31,18 +31,14 @@ def merge_dict(dic1, dic2):
 def perform_request(method, url, data_or_params=None, *args, **kwargs):
     if data_or_params is None:
         data_or_params = {}
-    data_or_params['api_key'] = settings.API_KEY
+    headers = {'X-Edx-Api-Key': settings.API_KEY}
     try:
         with dog_stats_api.timer('comment_client.request.time'):
             if method in ['post', 'put', 'patch']:
-                response = requests.request(method, url, data=data_or_params, timeout=5)
+                response = requests.request(method, url, data=data_or_params, headers=headers, timeout=5)
             else:
-                response = requests.request(method, url, params=data_or_params, timeout=5)
+                response = requests.request(method, url, params=data_or_params, headers=headers, timeout=5)
     except Exception as err:
-        # remove API key if it is in the params
-        if 'api_key' in data_or_params:
-            log.info('Deleting API key from params')
-            del data_or_params['api_key']
         log.exception("Trying to call {method} on {url} with params {params}".format(
             method=method, url=url, params=data_or_params))
         # Reraise with a single exception type
diff --git a/lms/static/coffee/fixtures/calculator.html b/lms/static/coffee/fixtures/calculator.html
index 61c6f5e153..d0f7d3f652 100644
--- a/lms/static/coffee/fixtures/calculator.html
+++ b/lms/static/coffee/fixtures/calculator.html
@@ -1,17 +1,17 @@
 <ul>
   <li class="calc-main">
-    <a href="#" class="calc">Calculator</a>
+    <a href="#" class="calc" title="Open Calculator" role="button" aria-controls="calculator_wrapper" aria-expanded="false">Open Calculator</a>
     <div id="calculator_wrapper">
       <form id="calculator">
         <div class="input-wrapper">
-          <input type="text" id="calculator_input" />
+          <input type="text" id="calculator_input" tabindex="-1" />
           <div class="help-wrapper">
-            <a href="#">Hints</a>
-            <dl class="help"></dl>
+            <a id="calculator_hint" href="#" role="button" aria-haspopup="true" aria-controls="calculator_input_help" aria-expanded="false" tabindex="-1">Hints</a>
+            <dl id="calculator_input_help" class="help"></dl>
           </div>
         </div>
-        <input id="calculator_button" type="submit" value="="/>
-        <input type="text" id="calculator_output" readonly />
+        <input id="calculator_button" type="submit" title="Calculate" arial-label="Calculate" value="=" tabindex="-1" />
+        <input type="text" id="calculator_output" readonly tabindex="-1" />
       </form>
     </div>
   </li>
diff --git a/lms/static/coffee/spec/calculator_spec.coffee b/lms/static/coffee/spec/calculator_spec.coffee
index 8258d8965a..81034bbd20 100644
--- a/lms/static/coffee/spec/calculator_spec.coffee
+++ b/lms/static/coffee/spec/calculator_spec.coffee
@@ -9,8 +9,10 @@ describe 'Calculator', ->
 
     it 'bind the help button', ->
       # These events are bind by $.hover()
-      expect($('div.help-wrapper a')).toHandleWith 'mouseover', @calculator.helpToggle
-      expect($('div.help-wrapper a')).toHandleWith 'mouseout', @calculator.helpToggle
+      expect($('div.help-wrapper a')).toHandle 'mouseover'
+      expect($('div.help-wrapper a')).toHandle 'mouseout'
+      expect($('div.help-wrapper')).toHandle 'focusin'
+      expect($('div.help-wrapper')).toHandle 'focusout'
 
     it 'prevent default behavior on help button', ->
       $('div.help-wrapper a').click (e) ->
@@ -33,8 +35,8 @@ describe 'Calculator', ->
       # Since the focus is called asynchronously, we need to
       # wait until focus() is called.
       didFocus = false
-      runs -> 
-          spyOn($.fn, 'focus').andCallFake (elementName) -> didFocus = true 
+      runs ->
+          spyOn($.fn, 'focus').andCallFake (elementName) -> didFocus = true
           @calculator.toggle(jQuery.Event("click"))
 
       waitsFor (-> didFocus), "focus() should have been called on the input", 1000
@@ -49,12 +51,14 @@ describe 'Calculator', ->
       @calculator.toggle(jQuery.Event("click"))
       expect($('.calc')).not.toHaveClass('closed')
 
-  describe 'helpToggle', ->
-    it 'toggle the help overlay', ->
-      @calculator.helpToggle()
+  describe 'helpShow', ->
+    it 'show the help overlay', ->
+      @calculator.helpShow()
       expect($('.help')).toHaveClass('shown')
 
-      @calculator.helpToggle()
+  describe 'helpHide', ->
+    it 'show the help overlay', ->
+      @calculator.helpHide()
       expect($('.help')).not.toHaveClass('shown')
 
   describe 'calculate', ->
diff --git a/lms/static/coffee/src/calculator.coffee b/lms/static/coffee/src/calculator.coffee
index 788081ebd6..e8cfea63f3 100644
--- a/lms/static/coffee/src/calculator.coffee
+++ b/lms/static/coffee/src/calculator.coffee
@@ -3,26 +3,70 @@ class @Calculator
     $('.calc').click @toggle
     $('form#calculator').submit(@calculate).submit (e) ->
       e.preventDefault()
-    $('div.help-wrapper a').hover(@helpToggle).click (e) ->
-      e.preventDefault()
+    $('div.help-wrapper a')
+      .hover(
+        $.proxy(@helpShow, @),
+        $.proxy(@helpHide, @)
+      )
+      .click (e) ->
+        e.preventDefault()
+      $('div.help-wrapper')
+        .focusin($.proxy @helpOnFocus, @)
+        .focusout($.proxy @helpOnBlur, @)
 
   toggle: (event) ->
     event.preventDefault()
+    $calc = $('.calc')
+    $calcWrapper = $('#calculator_wrapper')
+    text = gettext('Open Calculator')
+    isExpanded = false
+
     $('div.calc-main').toggleClass 'open'
-    if $('.calc.closed').length
-      $('.calc').attr 'aria-label', 'Open Calculator'
+    if $calc.hasClass('closed')
+      $calcWrapper
+        .find('input, a, dt, dd')
+        .attr 'tabindex', -1
     else
-      $('.calc').attr 'aria-label', 'Close Calculator'
+      text = gettext('Close Calculator')
+      isExpanded = true
+
+      $calcWrapper
+        .find('input, a, dt, dd')
+        .attr 'tabindex', 0
       # TODO: Investigate why doing this without the timeout causes it to jump
       # down to the bottom of the page. I suspect it's because it's putting the
       # focus on the text field before it transitions onto the page.
-      setTimeout (-> $('#calculator_wrapper #calculator_input').focus()), 100
+      setTimeout (-> $calcWrapper.find('#calculator_input').focus()), 100
 
-    $('.calc').toggleClass 'closed'
+    $calc
+      .attr
+        'title': text
+        'aria-expanded': isExpanded
+      .text text
 
-  helpToggle: ->
-    $('.help').toggleClass 'shown'
+    $calc.toggleClass 'closed'
+
+  helpOnFocus: (e) ->
+    e.preventDefault()
+    @isFocusedHelp = true
+    @helpShow()
+
+  helpOnBlur: (e) ->
+    e.preventDefault()
+    @isFocusedHelp = false
+    @helpHide()
+
+  helpShow: ->
+    $('.help').addClass 'shown'
+    $('#calculator_hint').attr 'aria-expanded', true
+
+  helpHide: ->
+    if not @isFocusedHelp
+      $('.help').removeClass 'shown'
+      $('#calculator_hint').attr 'aria-expanded', false
 
   calculate: ->
     $.getWithPrefix '/calculate', { equation: $('#calculator_input').val() }, (data) ->
-      $('#calculator_output').val(data.result)
+      $('#calculator_output')
+        .val(data.result)
+        .focus()
diff --git a/lms/static/coffee/src/instructor_dashboard/analytics.coffee b/lms/static/coffee/src/instructor_dashboard/analytics.coffee
index d53b511e1c..018b7e9c57 100644
--- a/lms/static/coffee/src/instructor_dashboard/analytics.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/analytics.coffee
@@ -1,8 +1,11 @@
-# Analytics Section
+###
+Analytics Section
+
+imports from other modules.
+wrap in (-> ... apply) to defer evaluation
+such that the value can be defined later than this assignment (file load order).
+###
 
-# imports from other modules.
-# wrap in (-> ... apply) to defer evaluation
-# such that the value can be defined later than this assignment (file load order).
 plantTimeout = -> window.InstructorDashboard.util.plantTimeout.apply this, arguments
 std_ajax_err = -> window.InstructorDashboard.util.std_ajax_err.apply this, arguments
 
diff --git a/lms/static/coffee/src/instructor_dashboard/course_info.coffee b/lms/static/coffee/src/instructor_dashboard/course_info.coffee
index d48c7ba873..19f9ce9707 100644
--- a/lms/static/coffee/src/instructor_dashboard/course_info.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/course_info.coffee
@@ -1,10 +1,13 @@
-# Course Info Section
-# This is the implementation of the simplest section
-# of the instructor dashboard.
+###
+Course Info Section
+This is the implementation of the simplest section
+of the instructor dashboard.
+
+imports from other modules.
+wrap in (-> ... apply) to defer evaluation
+such that the value can be defined later than this assignment (file load order).
+###
 
-# imports from other modules.
-# wrap in (-> ... apply) to defer evaluation
-# such that the value can be defined later than this assignment (file load order).
 plantTimeout = -> window.InstructorDashboard.util.plantTimeout.apply this, arguments
 std_ajax_err = -> window.InstructorDashboard.util.std_ajax_err.apply this, arguments
 
diff --git a/lms/static/coffee/src/instructor_dashboard/data_download.coffee b/lms/static/coffee/src/instructor_dashboard/data_download.coffee
index ee9be4254d..b5bbde9182 100644
--- a/lms/static/coffee/src/instructor_dashboard/data_download.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/data_download.coffee
@@ -1,8 +1,11 @@
-# Data Download Section
+###
+Data Download Section
+
+imports from other modules.
+wrap in (-> ... apply) to defer evaluation
+such that the value can be defined later than this assignment (file load order).
+###
 
-# imports from other modules.
-# wrap in (-> ... apply) to defer evaluation
-# such that the value can be defined later than this assignment (file load order).
 plantTimeout = -> window.InstructorDashboard.util.plantTimeout.apply this, arguments
 std_ajax_err = -> window.InstructorDashboard.util.std_ajax_err.apply this, arguments
 
diff --git a/lms/static/coffee/src/instructor_dashboard/instructor_dashboard.coffee b/lms/static/coffee/src/instructor_dashboard/instructor_dashboard.coffee
index a7c803f8ac..c645fcf67e 100644
--- a/lms/static/coffee/src/instructor_dashboard/instructor_dashboard.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/instructor_dashboard.coffee
@@ -1,26 +1,31 @@
-# Instructor Dashboard Tab Manager
-# The instructor dashboard is broken into sections.
-# Only one section is visible at a time,
-#   and is responsible for its own functionality.
-#
-# NOTE: plantTimeout (which is just setTimeout from util.coffee)
-#       is used frequently in the instructor dashboard to isolate
-#       failures. If one piece of code under a plantTimeout fails
-#       then it will not crash the rest of the dashboard.
-#
-# NOTE: The instructor dashboard currently does not
-#       use backbone. Just lots of jquery. This should be fixed.
-#
-# NOTE: Server endpoints in the dashboard are stored in
-#       the 'data-endpoint' attribute of relevant html elements.
-#       The urls are rendered there by a template.
-#
-# NOTE: For an example of what a section object should look like
-#       see course_info.coffee
+###
+Instructor Dashboard Tab Manager
+
+The instructor dashboard is broken into sections.
+
+Only one section is visible at a time,
+  and is responsible for its own functionality.
+
+NOTE: plantTimeout (which is just setTimeout from util.coffee)
+      is used frequently in the instructor dashboard to isolate
+      failures. If one piece of code under a plantTimeout fails
+      then it will not crash the rest of the dashboard.
+
+NOTE: The instructor dashboard currently does not
+      use backbone. Just lots of jquery. This should be fixed.
+
+NOTE: Server endpoints in the dashboard are stored in
+      the 'data-endpoint' attribute of relevant html elements.
+      The urls are rendered there by a template.
+
+NOTE: For an example of what a section object should look like
+      see course_info.coffee
+
+imports from other modules
+wrap in (-> ... apply) to defer evaluation
+such that the value can be defined later than this assignment (file load order).
+###
 
-# imports from other modules
-# wrap in (-> ... apply) to defer evaluation
-# such that the value can be defined later than this assignment (file load order).
 plantTimeout = -> window.InstructorDashboard.util.plantTimeout.apply this, arguments
 std_ajax_err = -> window.InstructorDashboard.util.std_ajax_err.apply this, arguments
 
@@ -156,6 +161,9 @@ setup_instructor_dashboard_sections = (idash_content) ->
   ,
     constructor: window.InstructorDashboard.sections.StudentAdmin
     $element: idash_content.find ".#{CSS_IDASH_SECTION}#student_admin"
+  ,
+    constructor: window.InstructorDashboard.sections.Email
+    $element: idash_content.find ".#{CSS_IDASH_SECTION}#send_email"
   ,
     constructor: window.InstructorDashboard.sections.Analytics
     $element: idash_content.find ".#{CSS_IDASH_SECTION}#analytics"
diff --git a/lms/static/coffee/src/instructor_dashboard/membership.coffee b/lms/static/coffee/src/instructor_dashboard/membership.coffee
index a50cd2c3dd..54b04be5db 100644
--- a/lms/static/coffee/src/instructor_dashboard/membership.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/membership.coffee
@@ -1,8 +1,11 @@
-# Membership Section
+###
+Membership Section
+
+imports from other modules.
+wrap in (-> ... apply) to defer evaluation
+such that the value can be defined later than this assignment (file load order).
+###
 
-# imports from other modules.
-# wrap in (-> ... apply) to defer evaluation
-# such that the value can be defined later than this assignment (file load order).
 plantTimeout = -> window.InstructorDashboard.util.plantTimeout.apply this, arguments
 std_ajax_err = -> window.InstructorDashboard.util.std_ajax_err.apply this, arguments
 
diff --git a/lms/static/coffee/src/instructor_dashboard/send_email.coffee b/lms/static/coffee/src/instructor_dashboard/send_email.coffee
new file mode 100644
index 0000000000..0d1c184ab7
--- /dev/null
+++ b/lms/static/coffee/src/instructor_dashboard/send_email.coffee
@@ -0,0 +1,101 @@
+###
+Email Section
+
+imports from other modules.
+wrap in (-> ... apply) to defer evaluation
+such that the value can be defined later than this assignment (file load order).
+###
+
+plantTimeout = -> window.InstructorDashboard.util.plantTimeout.apply this, arguments
+std_ajax_err = -> window.InstructorDashboard.util.std_ajax_err.apply this, arguments
+
+class SendEmail
+  constructor: (@$container) ->
+    # gather elements
+    @$emailEditor = XModule.loadModule($('.xmodule_edit'));
+    @$send_to = @$container.find("select[name='send_to']'")
+    @$subject = @$container.find("input[name='subject']'")
+    @$btn_send = @$container.find("input[name='send']'")
+    @$task_response = @$container.find(".request-response")
+    @$request_response_error = @$container.find(".request-response-error")
+
+    # attach click handlers
+
+    @$btn_send.click =>
+      if @$subject.val() == ""
+        alert gettext("Your message must have a subject.")
+      else if @$emailEditor.save()['data'] == ""
+        alert gettext("Your message cannot be blank.")
+      else
+        success_message = gettext("Your email was successfully queued for sending.")
+        send_to = @$send_to.val().toLowerCase()
+        if send_to == "myself"
+          send_to = gettext("yourself")
+        else if send_to == "staff"
+          send_to = gettext("everyone who is staff or instructor on this course")
+        else
+          send_to = gettext("ALL (everyone who is enrolled in this course as student, staff, or instructor)")
+          success_message = gettext("Your email was successfully queued for sending.  Please note that for large public classes (~10k), it may take 1-2 hours to send all emails.")
+        subject = gettext(@$subject.val())
+        confirm_message = gettext("You are about to send an email titled \"#{subject}\" to #{send_to}.  Is this OK?")
+        if confirm confirm_message
+
+          send_data =
+            action: 'send'
+            send_to: @$send_to.val()
+            subject: @$subject.val()
+            message: @$emailEditor.save()['data']
+
+          $.ajax
+            type: 'POST'
+            dataType: 'json'
+            url: @$btn_send.data 'endpoint'
+            data: send_data
+            success: (data) => 
+              @display_response success_message
+              
+            error: std_ajax_err => 
+              @fail_with_error gettext('Error sending email.')
+
+        else
+          @$task_response.empty()
+          @$request_response_error.empty()
+              
+  fail_with_error: (msg) ->
+    console.warn msg
+    @$task_response.empty()
+    @$request_response_error.empty()
+    @$request_response_error.text gettext(msg)
+    $(".msg-confirm").css({"display":"none"})
+
+  display_response: (data_from_server) ->
+    @$task_response.empty()
+    @$request_response_error.empty()
+    @$task_response.text(data_from_server)
+    $(".msg-confirm").css({"display":"block"})
+
+
+# Email Section
+class Email
+  # enable subsections.
+  constructor: (@$section) ->
+    # attach self to html
+    # so that instructor_dashboard.coffee can find this object
+    # to call event handlers like 'onClickTitle'
+    @$section.data 'wrapper', @
+
+    # isolate # initialize SendEmail subsection
+    plantTimeout 0, => new SendEmail @$section.find '.send-email'
+
+  # handler for when the section title is clicked.
+  onClickTitle: ->
+
+
+# export for use
+# create parent namespaces if they do not already exist.
+# abort if underscore can not be found.
+if _?
+  _.defaults window, InstructorDashboard: {}
+  _.defaults window.InstructorDashboard, sections: {}
+  _.defaults window.InstructorDashboard.sections,
+    Email: Email
diff --git a/lms/static/coffee/src/instructor_dashboard/student_admin.coffee b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
index 3ae99a9edc..c07069a493 100644
--- a/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
@@ -1,8 +1,11 @@
-# Student Admin Section
+###
+Student Admin Section
+
+imports from other modules.
+wrap in (-> ... apply) to defer evaluation
+such that the value can be defined later than this assignment (file load order).
+###
 
-# imports from other modules.
-# wrap in (-> ... apply) to defer evaluation
-# such that the value can be defined later than this assignment (file load order).
 plantTimeout = -> window.InstructorDashboard.util.plantTimeout.apply this, arguments
 plantInterval = -> window.InstructorDashboard.util.plantInterval.apply this, arguments
 std_ajax_err = -> window.InstructorDashboard.util.std_ajax_err.apply this, arguments
diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index cd87927fc1..d526b5b94e 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -2619,7 +2619,7 @@ body.discussion {
   width: 10px;
   height: 14px;
   padding-right: 3px;
-  color: #aeaeae;
+  color: #666;
 }
 
 .pinned .icon {
@@ -2633,14 +2633,14 @@ body.discussion {
 }
 
 .pinned span {
-  color: #B82066;
+  color: $pink;
   font-style: italic;
   //cursor change is here since pins are read-only for inline discussions.
   cursor: default;
 }
 
 .notpinned span {
-  color: #888;
+  color: #666;
   font-style: italic;
 }
 
@@ -2665,7 +2665,7 @@ display:none;
     
 .notflagged .icon {
   display: block;
-  color: #aeaeae;
+  color: #666;
   float: left;
   margin: 3px;
   width: 10px;
@@ -2676,7 +2676,6 @@ display:none;
 .flagged .icon
 {
   display: block;
-  color: #aeaeae;
   float: left;
   margin: 3px;
   width: 10px;
@@ -2686,11 +2685,11 @@ display:none;
 }
 
 .flagged span {
-  color: #B82066;
+  color: $pink;
   font-style: italic;
 }
 
 .notflagged span {
-  color: #888;
+  color: #666;
   font-style: italic;
 }
diff --git a/lms/static/sass/_shame.scss b/lms/static/sass/_shame.scss
index 1c3da1c0f8..2fc6669fcd 100644
--- a/lms/static/sass/_shame.scss
+++ b/lms/static/sass/_shame.scss
@@ -230,3 +230,15 @@
 footer .references {
   @include footer_references_style;
 }
+
+// ====================
+
+// modal semantic button resetting - overriding the poorly scoped button mixin styling
+.close-modal, button.close-modal {
+  @extend %ui-reset-button;
+
+  &:focus {
+    border: none !important;
+    outline: thin dotted !important;
+  }
+}
diff --git a/lms/static/sass/base/_extends.scss b/lms/static/sass/base/_extends.scss
index 5c87548127..ebd5ae806e 100644
--- a/lms/static/sass/base/_extends.scss
+++ b/lms/static/sass/base/_extends.scss
@@ -84,3 +84,19 @@
     display: none;
   }
 }
+
+// ====================
+
+// needed utility extend for resetting poor basic <button> elem styling
+%ui-reset-button  {
+  border: none !important;
+  box-shadow: none !important;
+  background: transparent !important;
+  text-shadow: none !important;
+  letter-spacing: 0 !important;
+  text-transform: none !important;
+
+  &:focus {
+    // outline: thin dotted !important;
+  }
+}
diff --git a/lms/static/sass/course/instructor/_instructor_2.scss b/lms/static/sass/course/instructor/_instructor_2.scss
index 1a4777d0e0..947c4df41d 100644
--- a/lms/static/sass/course/instructor/_instructor_2.scss
+++ b/lms/static/sass/course/instructor/_instructor_2.scss
@@ -22,8 +22,9 @@
   // system feedback - messages
   .msg {
     border-radius: 1px;
-    padding: 10px 15px;
-    margin-bottom: 20px;
+    padding: $baseline/2 $baseline*0.75;
+    margin-bottom: $baseline;
+    font-weight: 600;
 
     .copy {
       font-weight: 600;
@@ -44,10 +45,8 @@
   .msg-confirm {
     border-top: 2px solid $confirm-color;
     background: tint($confirm-color,95%);
-
-    .copy {
-      color: $confirm-color;
-    }
+    display: none;
+    color: $confirm-color;
   }
 
   // TYPE: confirm
@@ -60,8 +59,6 @@
     }
   }
 
-  // ====================
-
   // inline copy
   .copy-confirm {
     color: $confirm-color;
@@ -78,7 +75,7 @@
   .list-advice {
     list-style: none;
     padding: 0;
-    margin: 20px 0;
+    margin: $baseline 0;
 
     .item {
       font-weight: 600;
@@ -181,7 +178,6 @@ section.instructor-dashboard-content-2 {
   }
 }
 
-
 .instructor-dashboard-wrapper-2 section.idash-section#course_info {
   .course-errors-wrapper {
     margin-top: 2em;
@@ -244,6 +240,24 @@ section.instructor-dashboard-content-2 {
   }
 }
 
+.instructor-dashboard-wrapper-2 section.idash-section#send_email {
+  // form fields
+  .list-fields {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+
+    .field {
+      margin-bottom: $baseline;
+      padding: 0;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+  }
+}
+
 
 .instructor-dashboard-wrapper-2 section.idash-section#membership {
   $half_width: $baseline * 20;
@@ -541,3 +555,7 @@ section.instructor-dashboard-content-2 {
     right: $baseline;
   }
 }
+
+input[name="subject"] {
+  width:600px;
+}
diff --git a/lms/static/sass/course/layout/_calculator.scss b/lms/static/sass/course/layout/_calculator.scss
index 046afbbcf8..b60ae2285b 100644
--- a/lms/static/sass/course/layout/_calculator.scss
+++ b/lms/static/sass/course/layout/_calculator.scss
@@ -117,6 +117,7 @@ div.calc-main {
             height: 35px;
             @include hide-text;
             width: 35px;
+             display: block;
           }
 
           dl {
@@ -124,8 +125,6 @@ div.calc-main {
             border-radius: 3px;
             box-shadow: 0 0 3px #999;
             color: #333;
-            display: none;
-            line-height: lh();
             opacity: 0;
             padding: 10px;
             position: absolute;
@@ -133,10 +132,15 @@ div.calc-main {
             top: -122px;
             @include transition(none);
             width: 600px;
+            height: 0;
+            overflow: hidden;
+            pointer-events: none;
 
             &.shown {
-              display: block;
-              opacity: 1.0;
+              height: auto;
+              opacity: 1;
+              overflow: visible;
+              pointer-events: auto;
             }
 
             dt {
diff --git a/lms/static/sass/views/_verification.scss b/lms/static/sass/views/_verification.scss
index 4aa5f88e8b..43051c887c 100644
--- a/lms/static/sass/views/_verification.scss
+++ b/lms/static/sass/views/_verification.scss
@@ -751,6 +751,7 @@
 
             .action {
               @extend %btn-verify-primary;
+              padding: ($baseline/2) ($baseline*0.75);
             }
           }
         }
@@ -1190,7 +1191,7 @@
     .form-register-choose {
       @include clearfix();
       width: flex-grid(12,12);
-      margin: $baseline 0;
+      margin: ($baseline*2) 0;
 
       .deco-divider {
         width: flex-grid(8,12);
@@ -1210,7 +1211,7 @@
       background: $m-gray-l4;
 
       &:last-child {
-        margin-bottom: none;
+        margin-bottom: 0;
       }
 
       .wrapper-copy, .list-actions {
@@ -1352,12 +1353,13 @@
 
       .field {
         float: left;
-        margin-right: ($baseline/2);
+        margin: 0 ($baseline/2) ($baseline/2) 0;
         padding: ($baseline/2) ($baseline*0.75);
         background: $m-gray-t0;
 
         input {
           width: auto;
+          padding: 0;
         }
 
         &:last-child {
@@ -1796,7 +1798,7 @@
         &:last-child {
           margin-bottom: 0;
           border-bottom: none;
-          padding-bottom: none;
+          padding-bottom: 0;
         }
 
         > .title {
diff --git a/lms/templates/combinedopenended/combined_open_ended_status.html b/lms/templates/combinedopenended/combined_open_ended_status.html
index 866eaccb1c..a74d3f03c0 100644
--- a/lms/templates/combinedopenended/combined_open_ended_status.html
+++ b/lms/templates/combinedopenended/combined_open_ended_status.html
@@ -12,4 +12,5 @@
             </div>
         %endfor
     </section>
+    <div class="hidden">Current Assessment Type: ${current_task_human_name}</div>
 </div>
diff --git a/lms/templates/combinedopenended/openended/open_ended.html b/lms/templates/combinedopenended/openended/open_ended.html
index 52d8042038..3a73ebd6b0 100644
--- a/lms/templates/combinedopenended/openended/open_ended.html
+++ b/lms/templates/combinedopenended/openended/open_ended.html
@@ -1,5 +1,5 @@
 <%! from django.utils.translation import ugettext as _ %>
-<section id="openended_${id}" class="open-ended-child" data-state="${state}" data-child-type="${child_type}">
+<section id="openended_${module_id}" class="open-ended-child" data-state="${state}" data-child-type="${child_type}">
    <div class="error"></div>
    <div class="prompt">
     ${prompt|n}
@@ -7,9 +7,9 @@
     <div class="visibility-control visibility-control-response">
         <div class="inner">
         </div>
-        <span class="section-header section-header-response">${_("Response")}</span>
+        <label class="section-header section-header-response" for="answer_${module_id}">Response</label>
     </div>
-  <textarea rows="${rows}" cols="${cols}" name="answer" class="answer short-form-response" id="input_${id}">${previous_answer|h}</textarea>
+  <textarea rows="${rows}" cols="${cols}" name="answer" class="answer short-form-response" id="answer_${module_id}">${previous_answer|h}</textarea>
 
   <div class="message-wrapper"></div>
   <div class="grader-status">
diff --git a/lms/templates/combinedopenended/openended/open_ended_rubric.html b/lms/templates/combinedopenended/openended/open_ended_rubric.html
index 55194a9318..1d73647ec7 100644
--- a/lms/templates/combinedopenended/openended/open_ended_rubric.html
+++ b/lms/templates/combinedopenended/openended/open_ended_rubric.html
@@ -11,7 +11,7 @@
         % for i in range(len(categories)):
         <% category = categories[i] %>
         <% m = randint(0,1000) %>
-            <span class="rubric-category">${category['description']}</span>
+            <span class="rubric-category" tabindex="${i}">${category['description']}</span>
             <ul class="rubric-list">
                 % for j in range(len(category['options'])):
                 <% option = category['options'][j] %>
diff --git a/lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html b/lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html
index 93b0e7bacd..be8e346adb 100644
--- a/lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html
+++ b/lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html
@@ -1,5 +1,5 @@
 <%! from django.utils.translation import ugettext as _ %>
-<section id="self_assessment_${id}" class="open-ended-child" data-ajax-url="${ajax_url}"
+<section id="self_assessment_${module_id}" class="open-ended-child" data-ajax-url="${ajax_url}"
          data-id="${id}" data-state="${state}" data-allow_reset="${allow_reset}" data-child-type="${child_type}">
     <div class="error"></div>
     <div class="prompt">
@@ -8,10 +8,10 @@
     <div class="visibility-control visibility-control-response">
         <div class="inner">
         </div>
-        <span class="section-header section-header-response">${_("Response")}</span>
+        <label class="section-header section-header-response" for="answer_${module_id}">Response</label>
     </div>
     <div>
-    <textarea name="answer" class="answer short-form-response" cols="70" rows="20">${previous_answer|n}</textarea>
+    <textarea name="answer" class="answer short-form-response" cols="70" rows="20" id="answer_${module_id}">${previous_answer|n}</textarea>
 
     <div class="message-wrapper"></div>
     <div class="grader-status"></div>
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index 2a52b50b09..fd3c741be6 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -14,6 +14,7 @@
     ## all needs to stay together for the Candy.js plugin to work.
     <link rel="stylesheet" href="${static.url('candy_res/candy_full.css')}" />
   % endif
+  ${fragment.head_html()}
 </%block>
 
 <%block name="js_extra">
@@ -150,6 +151,8 @@
   </script>
 % endif
 
+${fragment.foot_html()}
+
 </%block>
 
 % if timer_expiration_duration:
@@ -185,7 +188,7 @@
 % endif
 
     <section class="course-content">
-      ${content}
+      ${fragment.body_html()}
     </section>
   </div>
 </section>
@@ -205,24 +208,23 @@
 
 % if course.show_calculator:
     <div class="calc-main">
-        <a aria-label="${_('Open Calculator')}" href="#" class="calc">${_("Calculator")}</a>
-
+        <a title="${_('Open Calculator')}" href="#" role="button" aria-controls="calculator_wrapper" aria-expanded="false" class="calc">${_("Open Calculator")}</a>
         <div id="calculator_wrapper">
             <form id="calculator">
                 <div class="input-wrapper">
-                    <input type="text" id="calculator_input" title="Calculator Input Field" />
+                    <input type="text" id="calculator_input" title="${_('Calculator Input Field')}" tabindex="-1" />
 
                     <div class="help-wrapper">
-                        <a href="#">${_("Hints")}</a>
-                        <dl class="help">
-                            <dt>${_("Suffixes:")}</dt>
-                            <dd> %kMGTcmunp</dd>
-                            <dt>${_("Operations:")}</dt>
-                            <dd>^ * / + - ()</dd>
-                            <dt>${_("Functions:")}</dt>
-                            <dd>sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs </dd>
-                            <dt>${_("Constants")}</dt>
-                            <dd>e, pi</dd>
+                        <a id="calculator_hint" href="#" role="button" aria-haspopup="true" aria-controls="calculator_input_help" aria-expanded="false" tabindex="-1">${_("Hints")}</a>
+                        <dl id="calculator_input_help" class="help">
+                            <dt tabindex="-1">${_("Suffixes:")}</dt>
+                            <dd tabindex="-1"> %kMGTcmunp</dd>
+                            <dt tabindex="-1">${_("Operations:")}</dt>
+                            <dd tabindex="-1">^ * / + - ()</dd>
+                            <dt tabindex="-1">${_("Functions:")}</dt>
+                            <dd tabindex="-1">sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs </dd>
+                            <dt tabindex="-1">${_("Constants")}</dt>
+                            <dd tabindex="-1">e, pi</dd>
 
                             <!-- Students won't know what parallel means at this time.  Complex numbers aren't well tested in the courseware, so we would prefer to not expose them.  If you read the comments in the source, feel free to use them. If you run into a bug, please let us know. But we can't officially support them right now.
 
@@ -230,8 +232,8 @@
                         </dl>
                     </div>
                 </div>
-                <input id="calculator_button" type="submit" title="Calculate" value="="/>
-                <input type="text" id="calculator_output" title="Calculator Output Field" readonly />
+                <input id="calculator_button" type="submit" title="${_('Calculate')}" value="=" arial-label="${_('Calculate')}" value="=" tabindex="-1" />
+                <input type="text" id="calculator_output" title="${_('Calculator Output Field')}" readonly tabindex="-1" />
             </form>
 
         </div>
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index 4688259274..2d75824cf9 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -15,6 +15,9 @@
   <script type="text/javascript" src="${static.url('js/vendor/tiny_mce/jquery.tinymce.js')}"></script>
   <script type="text/javascript" src="${static.url('js/vendor/CodeMirror/htmlmixed.js')}"></script>
   <script type="text/javascript" src="${static.url('js/vendor/CodeMirror/css.js')}"></script>
+  <script type="text/javascript">
+    (function() {window.baseUrl = "${settings.STATIC_URL}";})(this);
+  </script>
   <%static:js group='module-descriptor-js'/>
 %if instructor_tasks is not None:
   <script type="text/javascript" src="${static.url('js/pending_tasks.js')}"></script>
@@ -198,7 +201,7 @@ function goto( mode)
 
     <p>
     <input type="submit" name="action" value="Download CSV of answer distributions" class="${'is-disabled' if disable_buttons else ''}">
-    <input type="submit" name="action" value="Dump description of graded assignments configuration" class="${'is-disabled' if disable_buttons else ''}">
+    <input type="submit" name="action" value="Dump description of graded assignments configuration">
     </p>
     <hr width="40%" style="align:left">
 
@@ -547,6 +550,13 @@ function goto( mode)
         return true;
       }
     </script>
+
+    <p>These email actions run in the background, and status for active email tasks will appear in a table below.
+       To see status for all bulk email tasks submitted for this course, click on this button:
+    </p>
+    <p>
+      <input type="submit" name="action" value="Show Background Email Task History">
+    </p>
 %endif
 
     </form>
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 725841415a..a7651348f5 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -194,9 +194,11 @@
 </section>
 
 <section id="email-settings-modal" class="modal">
-  <div class="inner-wrapper">
+  <div class="inner-wrapper" role="dialog" aria-labelledby="email-settings-title">
+    <button class="close-modal">&#10005; <span class="sr">${_('Close Modal')}</span></button>
+
     <header>
-      <h2>${_('Email Settings for {course_number}').format(course_number='<span id="email_settings_course_number"></span>')}</h2>
+      <h2 id="email-settings-title">${_('Email Settings for {course_number}').format(course_number='<span id="email_settings_course_number"></span>')}</h2>
       <hr/>
     </header>
 
@@ -207,15 +209,15 @@
         <input type="submit" id="submit" value="${_('Save Settings')}" />
       </div>
     </form>
-    
-    <a href="#" role="button" class="close-modal" title="${_('Close Modal')}">&#10005;</a>
   </div>
 </section>
 
 <section id="unenroll-modal" class="modal unenroll-modal">
-  <div class="inner-wrapper">
+  <div class="inner-wrapper" role="alertdialog" aria-labelledy="unenrollment-modal-title">
+    <button class="close-modal">&#10005; <span class="sr">${_('Close Modal')}</span></button>
+
     <header>
-      <h2>${_('Are you sure you want to unregister from {course_number}?').format(course_number='<span id="unenroll_course_number"></span>')}</h2>
+      <h2 id="unenrollment-modal-title">${_('Are you sure you want to unregister from {course_number}?').format(course_number='<span id="unenroll_course_number"></span>')}</h2>
       <hr/>
     </header>
 
@@ -228,15 +230,15 @@
         <input name="submit" type="submit" value="${_('Unregister')}" />
       </div>
     </form>
-
-    <a href="#" role="button" class="close-modal" title="${_('Close Modal')}">&#10005;</a>
   </div>
 </section>
 
 <section id="password_reset_complete" class="modal">
-  <div class="inner-wrapper">
+  <div class="inner-wrapper" role="dialog" aria-labelledby="password-reset-email">
+    <button class="close-modal">&#10005; <span class="sr">${_('Close Modal')}</span></button>
+
     <header>
-      <h2>${_('Password Reset Email Sent')}</h2>
+      <h2 id="password-reset-email">${_('Password Reset Email Sent')}</h2>
       <hr/>
     </header>
     <div>
@@ -246,12 +248,13 @@
         </section>
       </form>
     </div>
-    <a href="#" role="button" class="close-modal" title="${_('Close Modal')}">&#10005;</a>
   </div>
 </section>
 
 <section id="change_email" class="modal">
-  <div class="inner-wrapper">
+  <div class="inner-wrapper" role="dialog" aria-labelledby="change_email_title">
+    <button class="close-modal">&#10005; <span class="sr">${_('Close Modal')}</span></button>
+
     <header>
       <h2><span id="change_email_title">${_("Change Email")}</span></h2>
       <hr/>
@@ -275,14 +278,15 @@
         </fieldset>
       </form>
     </div>
-    <a href="#" role="button" class="close-modal" title="${_('Close Modal')}">&#10005;</a>
   </div>
 </section>
 
 <section id="apply_name_change" class="modal">
-  <div class="inner-wrapper">
+  <div class="inner-wrapper" role="dialog" aria-labelledby="change-name-title">
+    <button class="close-modal">&#10005; <span class="sr">${_('Close Modal')}</span></button>
+
     <header>
-      <h2>${_("Change your name")}</h2>
+      <h2 id="change-name-title">${_("Change your name")}</h2>
       <hr/>
     </header>
     <div id="change_name_body">
@@ -303,6 +307,5 @@
         </fieldset>
       </form>
     </div>
-    <a href="#" role="button" class="close-modal" title="${_('Close Modal')}">&#10005;</a>
   </div>
 </section>
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index 8dfd46c1a9..30285658ea 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -6,7 +6,7 @@
         <div class="thread-content-wrapper"></div>
         
         <ol class="responses">
-            <li class="loading"><div class="loading-animation"></div></li>
+            <li class="loading"><div class="loading-animation"><span class="sr">Loading content</span></div></li>
         </ol>
         <div class="post-status-closed bottom-post-status" style="display: none">
           ${_("This thread is closed.")}
@@ -48,7 +48,7 @@
       </header>
 
       <div class="post-body">${'<%- body %>'}</div>
-      <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="Report Misuse">
+      <div class="discussion-flag-abuse notflagged" data-role="thread-flag" role="button" aria-pressed="false" tabindex="0">
       <i class="icon icon-flag"></i><span class="flag-label">${_("Report Misuse")}</span></div>
         
         
@@ -129,8 +129,8 @@
         <p class="posted-details" title="${'<%- created_at %>'}">${'<%- created_at %>'}</p>
     </header>
     <div class="response-local"><div class="response-body">${"<%- body %>"}</div>
-    <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="report misuse">                
-      <i class="icon icon-flag"></i><span class="flag-label">Report Misuse</span></div>
+    <div class="discussion-flag-abuse notflagged" data-role="thread-flag" role="button" aria-pressed="false" tabindex="0">
+      <i class="icon icon-flag"></i><span class="flag-label">${_("Report Misuse")}</span></div>
     </div>
     <ul class="moderator-actions response-local">
         <li style="display: none"><a class="action-edit" href="javascript:void(0)"><span class="edit-icon"></span> ${_("Edit")}</a></li>
@@ -154,8 +154,8 @@
 <script type="text/template" id="response-comment-show-template">
   <div id="comment_${'<%- id %>'}">
     <div class="response-body">${'<%- body %>'}</div>
-    <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="Report Misuse">                
-      <i class="icon icon-flag"></i><span class="flag-label"></span></div> 
+    <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="${_('Report Misuse')}" role="button" aria-pressed="false" tabindex="0">
+      <i class="icon icon-flag"></i><span class="sr flag-label">${_("Report Misuse")}</span></div>
     <p class="posted-details">&ndash;posted <span class="timeago" title="${'<%- created_at %>'}">${'<%- created_at %>'}</span> by
         ${"<% if (obj.username) { %>"}
         <a href="${'<%- user_url %>'}" class="profile-link">${'<%- username %>'}</a>
diff --git a/lms/templates/discussion/mustache/_inline_thread.mustache b/lms/templates/discussion/mustache/_inline_thread.mustache
index b52d3924e7..97a0ad6971 100644
--- a/lms/templates/discussion/mustache/_inline_thread.mustache
+++ b/lms/templates/discussion/mustache/_inline_thread.mustache
@@ -2,7 +2,7 @@
     <div class="thread-content-wrapper"></div>
 
     <ol class="responses post-extended-content">
-        <li class="loading"><div class="loading-animation"></div></li>
+        <li class="loading"><div class="loading-animation"><span class="sr">Loading content</span></div></li>
     </ol>
     <form class="local discussion-reply-new post-extended-content"  data-id="{{id}}">
         <h4>Post a response:</h4>
diff --git a/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache b/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
index 40921aeb4e..6b6fafd105 100644
--- a/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
+++ b/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
@@ -4,7 +4,7 @@
     <div class="thread-content-wrapper"></div>
 
     <ol class="responses post-extended-content">
-        <li class="loading"><div class="loading-animation"></div></li>
+        <li class="loading"><div class="loading-animation"><span class="sr">Loading content</span></div></li>
     </ol>
     <form class="local discussion-reply-new post-extended-content"  data-id="{{id}}">
         <h4>Post a response:</h4>
diff --git a/lms/templates/footer.html b/lms/templates/footer.html
index f0414c7a8f..394c679b6f 100644
--- a/lms/templates/footer.html
+++ b/lms/templates/footer.html
@@ -37,7 +37,7 @@
       </nav>
 
       <div class="colophon-about">
-        <img src="${MITX_ROOT_URL}/lms/static/images/header-logo.png" />
+        <img src="${static.url('images/header-logo.png')}" />
 
         <p>${_("{platform_name} is a non-profit created by founding partners {Harvard} and {MIT} whose mission is to bring the best of higher education to students of all ages anywhere in the world, wherever there is Internet access. {platform_name}'s free online MOOCs are interactive and subjects include computer science, public health, and artificial intelligence.").format(platform_name="EdX", Harvard="Harvard", MIT="MIT")}</p>
       </div>
diff --git a/lms/templates/forgot_password_modal.html b/lms/templates/forgot_password_modal.html
index 411b863e00..72ba0f2faa 100644
--- a/lms/templates/forgot_password_modal.html
+++ b/lms/templates/forgot_password_modal.html
@@ -3,6 +3,8 @@
 <%! from django.core.urlresolvers import reverse %>
 <section id="forgot-password-modal" class="modal" role="dialog" aria-label="${_('Password Reset')}">
   <div class="inner-wrapper">
+    <button class="close-modal">&#10005; <span class="sr">${_('Close Modal')}</span></button>
+
     <div id="password-reset">
       <header>
         <h2>${_("Password Reset")}</h2>
@@ -30,10 +32,6 @@
         </div>
       </form>
     </div>
-
-    <a href="#" role="button" class="close-modal" title="${_('Close Modal')}">
-      &#10005;
-    </a>
   </div>
 </section>
 
diff --git a/lms/templates/help_modal.html b/lms/templates/help_modal.html
index f4f1c4ea15..dea4b7e8b9 100644
--- a/lms/templates/help_modal.html
+++ b/lms/templates/help_modal.html
@@ -15,7 +15,7 @@
 <section id="help-modal" class="modal" aria-hidden="true" role="dialog" aria-label='${_("{platform_name} Help").format(platform_name=settings.PLATFORM_NAME)}'>
   <div class="inner-wrapper" id="help_wrapper">
     ## TODO: find a way to refactor this
-    <a href="#" role="button" class="close-modal" tabindex="0" title="${_('Close Modal')}">&#10005;</a>
+    <button class="close-modal "tabindex="0">&#10005; <span class="sr">${_('Close Modal')}</span></button>
 
     <header>
       <h2>${_('{span_start}{platform_name}{span_end} Help').format(span_start='<span class="edx">', span_end='</span>', platform_name=settings.PLATFORM_NAME)}</h2>
@@ -53,7 +53,7 @@ discussion_link = get_discussion_link(course) if course else None
   </div>
 
   <div class="inner-wrapper" id="feedback_form_wrapper">
-    <a href="#" role="button" class="close-modal" title="${_('Close Modal')}">&#10005;</a>
+    <button class="close-modal">&#10005; <span class="sr">${_('Close Modal')}</span></button>
 
     <header></header>
 
@@ -81,7 +81,7 @@ discussion_link = get_discussion_link(course) if course else None
   </div>
 
   <div class="inner-wrapper" id="feedback_success_wrapper" tabindex="0">
-    <a href="#" role="button" class="close-modal" title="${_('Close Modal')}" tabindex="0">&#10005;</a>
+    <button class="close-modal "tabindex="0">&#10005; <span class="sr">${_('Close Modal')}</span></button>
 
     <header>
       <h2>${_('Thank You!')}</h2>
diff --git a/lms/templates/instructor/instructor_dashboard_2/data_download.html b/lms/templates/instructor/instructor_dashboard_2/data_download.html
index db6a616b93..0bf21dd58a 100644
--- a/lms/templates/instructor/instructor_dashboard_2/data_download.html
+++ b/lms/templates/instructor/instructor_dashboard_2/data_download.html
@@ -3,25 +3,9 @@
 
 
 <h2>${_("Data Download")}</h2>
-% if disable_buttons:
-<div class="msg msg-warning">
-	<div class="copy">
-		<p>
-	    ${_("Note: some of these buttons are known to time out for larger "
-			"courses. We have temporarily disabled those features for courses "
-			"with more than {max_enrollment} students. We are urgently working on "
-			"fixing this issue. Thank you for your patience as we continue "
-			"working to improve the platform!").format(
-	        max_enrollment=settings.MITX_FEATURES['MAX_ENROLLMENT_INSTR_BUTTONS']
-	      )}
-		</p>
-	</div>
-</div>
-	<br>
-% endif
 
-<input type="button" name="list-profiles" value="${_("List enrolled students with profile information")}" data-endpoint="${ section_data['get_students_features_url'] }" class="${'is-disabled' if disable_buttons else ''}">
-<input type="button" name="list-profiles" value="CSV" data-csv="true" class="csv ${'is-disabled' if disable_buttons else ''}" data-endpoint="${ section_data['get_students_features_url'] }" >
+<input type="button" name="list-profiles" value="${_("List enrolled students with profile information")}" data-endpoint="${ section_data['get_students_features_url'] }">
+<input type="button" name="list-profiles" value="CSV" data-csv="true">
 <br>
 ## <input type="button" name="list-grades" value="Student grades">
 ## <input type="button" name="list-profiles" value="CSV" data-csv="true" class="csv">
diff --git a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
index c209db0103..527143b65b 100644
--- a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
+++ b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
@@ -31,6 +31,12 @@
   <script type="text/javascript" src="${static.url('js/vendor/slick.grid.js')}"></script>
   <link rel="stylesheet" href="${static.url('css/vendor/slickgrid/smoothness/jquery-ui-1.8.16.custom.css')}">
   <link rel="stylesheet" href="${static.url('css/vendor/slickgrid/slick.grid.css')}">
+  <script type="text/javascript" src="${static.url('js/vendor/CodeMirror/htmlmixed.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/CodeMirror/css.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/codemirror-compressed.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/tiny_mce/tiny_mce.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/tiny_mce/jquery.tinymce.js')}"></script>
+  <%static:js group='module-descriptor-js'/>
 </%block>
 
 ## NOTE that instructor is set as the active page so that the instructor button lights up, even though this is the instructor_2 page.
diff --git a/lms/templates/instructor/instructor_dashboard_2/send_email.html b/lms/templates/instructor/instructor_dashboard_2/send_email.html
new file mode 100644
index 0000000000..0c7354912a
--- /dev/null
+++ b/lms/templates/instructor/instructor_dashboard_2/send_email.html
@@ -0,0 +1,46 @@
+<%! from django.utils.translation import ugettext as _ %>
+<%page args="section_data"/>
+
+<div class="vert-left send-email" id="section-send-email">
+  <h2> ${_("Send Email")} </h2>
+  <div class="request-response msg msg-confirm copy" id="request-response"></div>
+  <ul class="list-fields">
+    <li class="field">
+      <label for="id_to">${_("Send to:")}</label><br/>
+      <select id="id_to" name="send_to">
+        <option value="myself">${_("Myself")}</option>
+        %if to_option == "staff":
+        <option value="staff" selected="selected">${_("Staff and instructors")}</option>
+        %else:
+        <option value="staff">${_("Staff and instructors")}</option>
+          %endif
+          %if to_option == "all":
+            <option value="all" selected="selected">${_("All (students, staff and instructors)")}</option>
+          %else:
+      <option value="all">${_("All (students, staff and instructors)")}</option>
+      %endif
+      </select>
+    </li>
+  <br/>
+  <li class="field">
+    <label for="id_subject">${_("Subject: ")}</label><br/>
+    <input type="text" id="id_subject" name="subject">
+  </li>
+  <li class="field">
+    <label>Message:</label>
+      <div class="email-editor"> 
+      ${ section_data['editor'] } 
+      </div>
+    <input type="hidden" name="message" value="">
+  </li>
+  </ul>
+ <div class="submit-email-action">
+  ${_("Please try not to email students more than once a day. Before sending your email, consider:")}
+  <ul class="list-advice">
+   <li class="item">${_("Have you read over the email to make sure it says everything you want to say?")}</li>
+   <li class="item">${_("Have you sent the email to yourself first to make sure you're happy with how it's displayed?")}</li>
+  </ul>
+ </div>
+  <input type="button" name="send" value="${_("Send Email")}" data-endpoint="${ section_data['send_email'] }" >
+  <div class="request-response-error"></div>
+</div>
diff --git a/lms/templates/login_modal.html b/lms/templates/login_modal.html
index 3052388864..4e88f07678 100644
--- a/lms/templates/login_modal.html
+++ b/lms/templates/login_modal.html
@@ -5,6 +5,8 @@
 
 <section id="login-modal" class="modal login-modal">
   <div class="inner-wrapper">
+    <button class="close-modal">&#10005; <span class="sr">${_('Close Modal')}</span></button>
+
     <header>
       <h2>${_("Log In")}</h2>
       <hr>
@@ -13,15 +15,15 @@
     <form id="login_form" class="login_form" method="post" data-remote="true" action="/login">
       <label for="login_email">${_("E-mail")}</label>
         <input id="login_email" type="email" name="email" placeholder="e.g. yourname@domain.com" />
-      
+
       <label for="login_password">${_("Password")}</label>
-        <input id="login_password" type="password" name="password" placeholder="&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;" />  
-      
+        <input id="login_password" type="password" name="password" placeholder="&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;" />
+
       <label for="login_remember_me" class="remember-me">
         <input id="login_remember_me" type="checkbox" name="remember" value="true" />
         ${_("Remember me")}
       </label>
-      
+
       <div class="submit">
         <input name="submit" type="submit" value="${_('Access My Courses')}">
       </div>
@@ -38,12 +40,6 @@
       </p>
 % endif
     </section>
-
-    <a href="#" role="button" class="close-modal" title="${_('Close Modal')}">
-      <div class="inner">
-        <p>&#10005;</p>
-      </div>
-    </a>
   </div>
 </section>
 
@@ -64,7 +60,7 @@
        $('#login_error').html(json.value).stop().css("display", "block");
      }
    });
-   
+
    // removing close link's default behavior
    $('#login-modal .close-modal').click(function(e) {
     e.preventDefault();
diff --git a/lms/templates/lti.html b/lms/templates/lti.html
index 3d97c8d808..7e6a3eac40 100644
--- a/lms/templates/lti.html
+++ b/lms/templates/lti.html
@@ -1,14 +1,24 @@
-<div id="${element_id}" class="${element_class}">
+<%! import json %>
+<%! from django.utils.translation import ugettext as _ %>
 
-    ## This form will be hidden. Once available on the client, the LTI
-    ## module JavaScript will trigget a "submit" on the form, and the
+<div
+    id="${element_id}"
+    class="${element_class}"
+    data-open_in_a_new_page="${json.dumps(open_in_a_new_page)}"
+>
+
+    ## This form will be hidden.
+    ## If open_in_a_new_page is false then, once available on the client, the
+    ## LTI module JavaScript will trigger a "submit" on the form, and the
     ## result will be rendered to the below iFrame.
+    ## If open_in_a_new_page is true, then link will be shown, and by clicking
+    ## on it, LTI will pop up in new window.
     <form
         action="${launch_url}"
-        name="ltiLaunchForm"
+        name="ltiLaunchForm-${element_id}"
         class="ltiLaunchForm"
         method="post"
-        target="ltiLaunchFrame"
+        target=${"_blank" if open_in_a_new_page else "ltiLaunchFrame-{0}".format(element_id)}
         encType="application/x-www-form-urlencoded"
     >
 
@@ -19,16 +29,29 @@
         <input type="submit" value="Press to Launch" />
     </form>
 
+
+% if launch_url and launch_url !=  'http://www.example.com':
+    % if open_in_a_new_page:
+        <div class="wrapper-lti-link">
+            <h3 class="title">
+                ${display_name} (${_('External resource')})
+            </h3>
+            <p class="lti-link external"><a href="#" class='link_lti_new_window'>
+                ${_('View resource in a new window')}
+                 <i class="icon-external-link"></i>
+            </a></p>
+        </div>
+    % else:
+        ## The result of the form submit will be rendered here.
+        <iframe
+            name="ltiLaunchFrame-${element_id}"
+            class="ltiLaunchFrame"
+            src=""
+        ></iframe>
+    % endif
+% else:
     <h3 class="error_message">
-        Please provide launch_url. Click "Edit", and fill in the
-        required fields.
+        ${_('Please provide launch_url. Click "Edit", and fill in the required fields.')}
     </h3>
-
-    ## The result of the form submit will be rendered here.
-    <iframe
-        name="ltiLaunchFrame"
-        class="ltiLaunchFrame"
-        src=""
-    ></iframe>
-
+%endif
 </div>
diff --git a/lms/templates/main.html b/lms/templates/main.html
index 60658111c8..353141f50b 100644
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -95,6 +95,7 @@
   <%include file="footer.html" />
 % endif
 
+  <script>window.baseUrl = "${settings.STATIC_URL}";</script>
   <%static:js group='application'/>
   <%static:js group='module-js'/>
 
diff --git a/lms/templates/registration/password_reset_complete.html b/lms/templates/registration/password_reset_complete.html
index 6ccb75ed26..bc82938127 100644
--- a/lms/templates/registration/password_reset_complete.html
+++ b/lms/templates/registration/password_reset_complete.html
@@ -44,7 +44,7 @@
 <header class="global">
   <nav>
     <h1 class="logo">
-      <a href="{{MKTG_URL_ROOT}}"><img src="/static/images/header-logo.png"></a>
+      <a href="{{MKTG_URL_ROOT}}"><img src="${static.url('images/header-logo.png')}"></a>
     </h1>
   </nav>
 </header>
diff --git a/lms/templates/registration/password_reset_confirm.html b/lms/templates/registration/password_reset_confirm.html
index 989d7984b4..557f4d9d90 100644
--- a/lms/templates/registration/password_reset_confirm.html
+++ b/lms/templates/registration/password_reset_confirm.html
@@ -48,7 +48,7 @@
 <header class="global">
   <nav>
     <h1 class="logo">
-      <a href="{{MKTG_URL_ROOT}}"><img src="/static/images/header-logo.png"></a>
+      <a href="{{MKTG_URL_ROOT}}"><img src="${static.url('images/header-logo.png')}"></a>
     </h1>
   </nav>
 </header>
diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html
index 0416eea82b..4b13bebb04 100644
--- a/lms/templates/signup_modal.html
+++ b/lms/templates/signup_modal.html
@@ -9,6 +9,8 @@
 
 <section id="signup-modal" class="modal signup-modal">
   <div class="inner-wrapper">
+    <button class="close-modal">&#10005; <span class="sr">${_('Close Modal')}</span></button>
+
     <div id="register">
       <header>
         <h2>${_('Sign Up for {span_start}{platform_name}{span_end}').format(span_start='<span class="edx">', span_end='</span>', platform_name=settings.PLATFORM_NAME)}</h2>
@@ -130,12 +132,6 @@
       % endif
 
     </div>
-
-    <a href="#" role="button" class="close-modal" title="${_('Close Modal')}">
-      <div class="inner">
-        <p>&#10005;</p>
-      </div>
-    </a>
   </div>
 </section>
 
diff --git a/lms/templates/video.html b/lms/templates/video.html
index caf0aaa06f..a32070432d 100644
--- a/lms/templates/video.html
+++ b/lms/templates/video.html
@@ -26,6 +26,19 @@
     data-yt-test-timeout="${yt_test_timeout}"
     data-yt-test-url="${yt_test_url}"
 
+    ## For now, the option "data-autohide-html5" is hard coded. This option
+    ## either enables or disables autohiding of controls and captions on mouse
+    ## inactivity. If set to true, controls and captions will autohide for
+    ## HTML5 sources (non-YouTube) after a period of mouse inactivity over the
+    ## whole video. When the mouse moves (or a key is pressed while any part of
+    ## the video player is focused), the captions and controls will be shown
+    ## once again.
+    ##
+    ## There is no option in the "Advanced Editor" to set this option. However,
+    ## this option will have an effect if changed to "True". The code on
+    ## front-end exists.
+    data-autohide-html5="False"
+
     tabindex="-1"
 >
     <div class="focus_grabber first"></div>
@@ -64,7 +77,7 @@
                             </div>
                         </div>
                         <a href="#" class="add-fullscreen" title="${_('Fill browser')}" role="button" aria-disabled="false">${_('Fill browser')}</a>
-                        <a href="#" class="quality_control" title="${_('HD')}" role="button" aria-disabled="false">${_('HD')}</a>
+                        <a href="#" class="quality_control" title="${_('HD off')}" role="button" aria-disabled="false">${_('HD off')}</a>
 
                         <a href="#" class="hide-subtitles" title="${_('Turn off captions')}" role="button" aria-disabled="false">${_('Turn off captions')}</a>
                     </div>
@@ -76,16 +89,19 @@
     </div>
 
     <div class="focus_grabber last"></div>
-</div>
-
+<ul class="wrapper-downloads">
 % if sources.get('main'):
-    <div class="video-sources">
-        <p>${(_('Download video') + ' <a href="%s">' + _('here') + '</a>.') % sources.get('main')}</p>
-    </div>
+    <li class="video-sources">
+        ${('<a href="%s">' + _('Download video') + '</a>') % sources.get('main')}
+    </li>
 % endif
 
 % if track:
-    <div class="video-tracks">
-        <p>${(_('Download subtitles') + ' <a href="%s">' + _('here') + '</a>.') % track}</p>
-    </div>
+    <li class="video-tracks">
+        ${('<a href="%s">' + _('Download timed transcript') + '</a>') % track}
+    </li>
 % endif
+</ul>
+</div>
+
+
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 8da2504f2e..b2b8e91694 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -98,6 +98,7 @@ django_debug_toolbar
 django-debug-toolbar-mongo
 nose-ignore-docstring
 nose-exclude
+django-crum==0.5
 
 git+https://github.com/mfogel/django-settings-context-processor.git
 
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index 31ee9b3fd5..6491fc9c82 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -15,8 +15,8 @@
 -e git+https://github.com/eventbrite/zendesk.git@d53fe0e81b623f084e91776bcf6369f8b7b63879#egg=zendesk
 
 # Our libraries:
--e git+https://github.com/edx/XBlock.git@8a66ca3#egg=XBlock
+-e git+https://github.com/edx/XBlock.git@cee38a15f#egg=XBlock
 -e git+https://github.com/edx/codejail.git@0a1b468#egg=codejail
--e git+https://github.com/edx/diff-cover.git@v0.2.5#egg=diff_cover
+-e git+https://github.com/edx/diff-cover.git@v0.2.6#egg=diff_cover
 -e git+https://github.com/edx/js-test-tool.git@v0.1.1#egg=js_test_tool
 -e git+https://github.com/edx/django-waffle.git@823a102e48#egg=django-waffle
diff --git a/scripts/release-email-list.sh b/scripts/release-email-list.sh
index 246a449273..2d875e139c 100755
--- a/scripts/release-email-list.sh
+++ b/scripts/release-email-list.sh
@@ -36,15 +36,13 @@ echo
 echo '||Author||Changes||Commit Link||Testing Notes||'
 
 for EMAIL in $RESPONSIBLE; do
-    AUTHORED_BY="$LOG_CMD --author=<${EMAIL}>"
-    COMMITTED_BY="$LOG_CMD --committer=<${EMAIL}>"
-    COMMITTED_NOT_AUTHORED="$COMMITTED_BY $($AUTHORED_BY --format='tformat:^%h')"
+    AUTHORED_BY=$($LOG_CMD --author="<${EMAIL}>" --format='tformat:%h')
+    COMMITTED_BY=$($LOG_CMD --committer="<${EMAIL}>" --format='tformat:%h')
+    ALL_COMMITS=$(for HASH in $AUTHORED_BY $COMMITTED_BY; do echo $HASH; done | sort | uniq)
 
-    $AUTHORED_BY --format="tformat:|$EMAIL|%s|[commit|https://github.com/edx/edx-platform/commit/%h]| |" | head -n 1
-    $AUTHORED_BY --format="tformat:| |%s|[commit|https://github.com/edx/edx-platform/commit/%h]| |" | tail  -n +2
-
-    if [[ $($COMMITTED_NOT_AUTHORED) != "" ]]; then
-        $COMMITTED_NOT_AUTHORED --format="tformat:|$EMAIL|%s|[commit|https://github.com/edx/edx-platform/commit/%h]|Committed, didn't author|" | head -n 1
-        $COMMITTED_NOT_AUTHORED --format="tformat:| |%s|[commit|https://github.com/edx/edx-platform/commit/%h]| |" | tail -n +2
-    fi
+    EMAIL_COL="$EMAIL"
+    for HASH in $ALL_COMMITS; do
+        git log --format="tformat:|$EMAIL_COL|%s|[commit|https://github.com/edx/edx-platform/commit/%h]| |" -n 1 $HASH
+        EMAIL_COL=" "
+    done
 done
\ No newline at end of file