diff --git a/.gitignore b/.gitignore
index b13a128a63..8fb170c30f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,4 +29,5 @@ cover_html/
 .idea/
 .redcar/
 chromedriver.log
+/nbproject
 ghostdriver.log
diff --git a/.pylintrc b/.pylintrc
index ce2f2e3b87..6690bb7df0 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -12,7 +12,7 @@ profile=no
 
 # Add files or directories to the blacklist. They should be base names, not
 # paths.
-ignore=CVS
+ignore=CVS, migrations
 
 # Pickle collected data for later comparisons.
 persistent=yes
@@ -33,7 +33,15 @@ load-plugins=
 # can either give multiple identifier separated by comma (,) or put this option
 # multiple time (only on the command line, not in the configuration file where
 # it should appear only once).
-disable=E1102,W0142
+disable=
+# W0141: Used builtin function 'map'
+# W0142: Used * or ** magic
+# R0201: Method could be a function
+# R0901: Too many ancestors
+# R0902: Too many instance attributes
+# R0903: Too few public methods (1/2)
+# R0904: Too many public methods
+    W0141,W0142,R0201,R0901,R0902,R0903,R0904
 
 
 [REPORTS]
@@ -43,7 +51,7 @@ disable=E1102,W0142
 output-format=text
 
 # Include message's id in output
-include-ids=no
+include-ids=yes
 
 # Put messages in a separate file for each module / package specified on the
 # command line instead of printing them on stdout. Reports (if any) will be
@@ -97,7 +105,7 @@ bad-functions=map,filter,apply,input
 module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
 
 # Regular expression which should only match correct module level names
-const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__)|log|urlpatterns)$
 
 # Regular expression which should only match correct class names
 class-rgx=[A-Z_][a-zA-Z0-9]+$
@@ -106,7 +114,7 @@ class-rgx=[A-Z_][a-zA-Z0-9]+$
 function-rgx=[a-z_][a-z0-9_]{2,30}$
 
 # Regular expression which should only match correct method names
-method-rgx=[a-z_][a-z0-9_]{2,30}$
+method-rgx=([a-z_][a-z0-9_]{2,60}|setUp|set[Uu]pClass|tearDown|tear[Dd]ownClass|assert[A-Z]\w*)$
 
 # Regular expression which should only match correct instance attribute names
 attr-rgx=[a-z_][a-z0-9_]{2,30}$
diff --git a/.ruby-version b/.ruby-version
index dd472cffa2..311baaf3e2 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-1.8.7-p371
\ No newline at end of file
+1.9.3-p374
diff --git a/cms/djangoapps/contentstore/course_info_model.py b/cms/djangoapps/contentstore/course_info_model.py
index 153d13dd13..8c8aed549d 100644
--- a/cms/djangoapps/contentstore/course_info_model.py
+++ b/cms/djangoapps/contentstore/course_info_model.py
@@ -1,7 +1,7 @@
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
-from lxml import html
+from lxml import html, etree
 import re
 from django.http import HttpResponseBadRequest
 import logging
@@ -26,9 +26,9 @@ def get_course_updates(location):
 
     # purely to handle free formed updates not done via editor. Actually kills them, but at least doesn't break.
     try:
-        course_html_parsed = html.fromstring(course_updates.definition['data'])
-    except:
-        course_html_parsed = html.fromstring("<ol></ol>")
+        course_html_parsed = etree.fromstring(course_updates.data)
+    except etree.XMLSyntaxError:
+        course_html_parsed = etree.fromstring("<ol></ol>")
 
     # Confirm that root is <ol>, iterate over <li>, pull out <h2> subs and then rest of val
     course_upd_collection = []
@@ -60,13 +60,13 @@ def update_course_updates(location, update, passed_id=None):
     try:
         course_updates = modulestore('direct').get_item(location)
     except ItemNotFoundError:
-        return HttpResponseBadRequest
+        return HttpResponseBadRequest()
 
     # purely to handle free formed updates not done via editor. Actually kills them, but at least doesn't break.
     try:
-        course_html_parsed = html.fromstring(course_updates.definition['data'])
-    except:
-        course_html_parsed = html.fromstring("<ol></ol>")
+        course_html_parsed = etree.fromstring(course_updates.data)
+    except etree.XMLSyntaxError:
+        course_html_parsed = etree.fromstring("<ol></ol>")
 
     # No try/catch b/c failure generates an error back to client
     new_html_parsed = html.fromstring('<li><h2>' + update['date'] + '</h2>' + update['content'] + '</li>')
@@ -85,13 +85,12 @@ def update_course_updates(location, update, passed_id=None):
             passed_id = course_updates.location.url() + "/" + str(idx)
 
         # update db record
-        course_updates.definition['data'] = html.tostring(course_html_parsed)
-        modulestore('direct').update_item(location, course_updates.definition['data'])
-
-        return {"id": passed_id,
-                "date": update['date'],
-                "content": update['content']}
+        course_updates.data = etree.tostring(course_html_parsed)
+        modulestore('direct').update_item(location, course_updates.data)
 
+        return {"id" : passed_id,
+                "date" : update['date'],
+                "content" :update['content']}
 
 def delete_course_update(location, update, passed_id):
     """
@@ -99,19 +98,19 @@ def delete_course_update(location, update, passed_id):
     Returns the resulting course_updates b/c their ids change.
     """
     if not passed_id:
-        return HttpResponseBadRequest
+        return HttpResponseBadRequest()
 
     try:
         course_updates = modulestore('direct').get_item(location)
     except ItemNotFoundError:
-        return HttpResponseBadRequest
+        return HttpResponseBadRequest()
 
     # TODO use delete_blank_text parser throughout and cache as a static var in a class
     # purely to handle free formed updates not done via editor. Actually kills them, but at least doesn't break.
     try:
-        course_html_parsed = html.fromstring(course_updates.definition['data'])
-    except:
-        course_html_parsed = html.fromstring("<ol></ol>")
+        course_html_parsed = etree.fromstring(course_updates.data)
+    except etree.XMLSyntaxError:
+        course_html_parsed = etree.fromstring("<ol></ol>")
 
     if course_html_parsed.tag == 'ol':
         # ??? Should this use the id in the json or in the url or does it matter?
@@ -122,9 +121,9 @@ def delete_course_update(location, update, passed_id):
             course_html_parsed.remove(element_to_delete)
 
         # update db record
-        course_updates.definition['data'] = html.tostring(course_html_parsed)
+        course_updates.data = etree.tostring(course_html_parsed)
         store = modulestore('direct')
-        store.update_item(location, course_updates.definition['data'])
+        store.update_item(location, course_updates.data)
 
     return get_course_updates(location)
 
diff --git a/cms/djangoapps/contentstore/features/advanced-settings.feature b/cms/djangoapps/contentstore/features/advanced-settings.feature
index 779d44e4b2..af97709ad0 100644
--- a/cms/djangoapps/contentstore/features/advanced-settings.feature
+++ b/cms/djangoapps/contentstore/features/advanced-settings.feature
@@ -2,53 +2,41 @@ Feature: Advanced (manual) course policy
   In order to specify course policy settings for which no custom user interface exists
   I want to be able to manually enter JSON key/value pairs
 
-  Scenario: A course author sees only display_name on a newly created course
+  Scenario: A course author sees default advanced settings
     Given I have opened a new course in Studio
     When I select the Advanced Settings
-    Then I see only the display name
+    Then I see default advanced settings
 
-  @skip-phantom
-  Scenario: Test if there are no policy settings without existing UI controls
+  Scenario: Add new entries, and they appear alphabetically after save
     Given I am on the Advanced Course Settings page in Studio
-    When I delete the display name
-    Then there are no advanced policy settings
-    And I reload the page
-    Then there are no advanced policy settings
-
-  @skip-phantom
-  Scenario: Test cancel editing key name
-    Given I am on the Advanced Course Settings page in Studio
-    When I edit the name of a policy key
-    And I press the "Cancel" notification button
-    Then the policy key name is unchanged
-
-  Scenario: Test editing key name
-    Given I am on the Advanced Course Settings page in Studio
-    When I edit the name of a policy key
-    And I press the "Save" notification button
-    Then the policy key name is changed
+    Then the settings are alphabetized
 
   Scenario: Test cancel editing key value
     Given I am on the Advanced Course Settings page in Studio
     When I edit the value of a policy key
     And I press the "Cancel" notification button
     Then the policy key value is unchanged
+    And I reload the page
+    Then the policy key value is unchanged
 
-  @skip-phantom
   Scenario: Test editing key value
     Given I am on the Advanced Course Settings page in Studio
     When I edit the value of a policy key
     And I press the "Save" notification button
     Then the policy key value is changed
-
-  Scenario: Add new entries, and they appear alphabetically after save
-    Given I am on the Advanced Course Settings page in Studio
-    When I create New Entries
-    Then they are alphabetized
     And I reload the page
-    Then they are alphabetized
+    Then the policy key value is changed
 
   Scenario: Test how multi-line input appears
     Given I am on the Advanced Course Settings page in Studio
-    When I create a JSON object
+    When I create a JSON object as a value
     Then it is displayed as formatted
+    And I reload the page
+    Then it is displayed as formatted
+
+  Scenario: Test automatic quoting of non-JSON values
+    Given I am on the Advanced Course Settings page in Studio
+    When I create a non-JSON value not in quotes
+    Then it is displayed as a string
+    And I reload the page
+    Then it is displayed as a string
diff --git a/cms/djangoapps/contentstore/features/advanced-settings.py b/cms/djangoapps/contentstore/features/advanced-settings.py
index 1024579b45..7e86e94a31 100644
--- a/cms/djangoapps/contentstore/features/advanced-settings.py
+++ b/cms/djangoapps/contentstore/features/advanced-settings.py
@@ -1,6 +1,7 @@
 from lettuce import world, step
 from common import *
 import time
+from terrain.steps import reload_the_page
 from selenium.common.exceptions import WebDriverException
 from selenium.webdriver.support import expected_conditions as EC
 
@@ -11,6 +12,10 @@ http://selenium.googlecode.com/svn/trunk/docs/api/py/webdriver/selenium.webdrive
 """
 from selenium.webdriver.common.keys import Keys
 
+KEY_CSS = '.key input.policy-key'
+VALUE_CSS = 'textarea.json'
+DISPLAY_NAME_KEY = "display_name"
+DISPLAY_NAME_VALUE = '"Robot Super Course"'
 
 ############### ACTIONS ####################
 @step('I select the Advanced Settings$')
@@ -20,7 +25,6 @@ def i_select_advanced_settings(step):
         css_click(expand_icon_css)
     link_css = 'li.nav-course-settings-advanced a'
     css_click(link_css)
-    # world.browser.click_link_by_text('Advanced Settings')
 
 
 @step('I am on the Advanced Course Settings page in Studio$')
@@ -29,35 +33,27 @@ def i_am_on_advanced_course_settings(step):
     step.given('I select the Advanced Settings')
 
 
-# TODO: this is copied from terrain's step.py. Need to figure out how to share that code.
-@step('I reload the page$')
-def reload_the_page(step):
-    world.browser.reload()
-
-
-@step(u'I edit the name of a policy key$')
-def edit_the_name_of_a_policy_key(step):
-    policy_key_css = 'input.policy-key'
-    e = css_find(policy_key_css).first
-    e.type('_new')
-
-
 @step(u'I press the "([^"]*)" notification button$')
 def press_the_notification_button(step, name):
     def is_visible(driver):
-        return EC.visibility_of_element_located((By.CSS_SELECTOR,css,))
-    def is_invisible(driver):
-        return EC.invisibility_of_element_located((By.CSS_SELECTOR,css,))
+        return EC.visibility_of_element_located((By.CSS_SELECTOR, css,))
+
+    #    def is_invisible(driver):
+    #        return EC.invisibility_of_element_located((By.CSS_SELECTOR,css,))
 
     css = 'a.%s-button' % name.lower()
     wait_for(is_visible)
+    time.sleep(float(1))
+    css_click_at(css)
+
+#   is_invisible is not returning a boolean, not working
+#    try:
+#        css_click_at(css)
+#        wait_for(is_invisible)
+#    except WebDriverException, e:
+#        css_click_at(css)
+#        wait_for(is_invisible)
 
-    try:
-        css_click_at(css)
-        wait_for(is_invisible)
-    except WebDriverException, e:
-        css_click_at(css)
-        wait_for(is_invisible)
 
 @step(u'I edit the value of a policy key$')
 def edit_the_value_of_a_policy_key(step):
@@ -65,133 +61,86 @@ def edit_the_value_of_a_policy_key(step):
     It is hard to figure out how to get into the CodeMirror
     area, so cheat and do it from the policy key field :)
     """
-    policy_key_css = 'input.policy-key'
-    e = css_find(policy_key_css).first
+    e = css_find(KEY_CSS)[get_index_of(DISPLAY_NAME_KEY)]
     e._element.send_keys(Keys.TAB, Keys.END, Keys.ARROW_LEFT, ' ', 'X')
 
 
-@step('I delete the display name$')
-def delete_the_display_name(step):
-    delete_entry(0)
-    click_save()
-
-
-@step('create New Entries$')
-def create_new_entries(step):
-    create_entry("z", "apple")
-    create_entry("a", "zebra")
-    click_save()
-
-
-@step('I create a JSON object$')
+@step('I create a JSON object as a value$')
 def create_JSON_object(step):
-    create_entry("json", '{"key": "value", "key_2": "value_2"}')
-    click_save()
+    change_display_name_value(step, '{"key": "value", "key_2": "value_2"}')
+
+
+@step('I create a non-JSON value not in quotes$')
+def create_value_not_in_quotes(step):
+    change_display_name_value(step, 'quote me')
 
 
 ############### RESULTS ####################
-@step('I see only the display name$')
-def i_see_only_display_name(step):
-    assert_policy_entries(["display_name"], ['"Robot Super Course"'])
+@step('I see default advanced settings$')
+def i_see_default_advanced_settings(step):
+    # Test only a few of the existing properties (there are around 34 of them)
+    assert_policy_entries(
+        ["advanced_modules", DISPLAY_NAME_KEY, "show_calculator"], ["[]", DISPLAY_NAME_VALUE, "false"])
 
 
-@step('there are no advanced policy settings$')
-def no_policy_settings(step):
-    keys_css = 'input.policy-key'
-    val_css = 'textarea.json'
-    k = world.browser.is_element_not_present_by_css(keys_css, 5)
-    v = world.browser.is_element_not_present_by_css(val_css, 5)
-    assert_true(k)
-    assert_true(v)
-
-
-@step('they are alphabetized$')
+@step('the settings are alphabetized$')
 def they_are_alphabetized(step):
-    assert_policy_entries(["a", "display_name", "z"], ['"zebra"', '"Robot Super Course"', '"apple"'])
+    key_elements = css_find(KEY_CSS)
+    all_keys = []
+    for key in key_elements:
+        all_keys.append(key.value)
+
+    assert_equal(sorted(all_keys), all_keys, "policy keys were not sorted")
 
 
 @step('it is displayed as formatted$')
 def it_is_formatted(step):
-    assert_policy_entries(["display_name", "json"], ['"Robot Super Course"', '{\n    "key": "value",\n    "key_2": "value_2"\n}'])
+    assert_policy_entries([DISPLAY_NAME_KEY], ['{\n    "key": "value",\n    "key_2": "value_2"\n}'])
 
 
-@step(u'the policy key name is unchanged$')
-def the_policy_key_name_is_unchanged(step):
-    policy_key_css = 'input.policy-key'
-    val = css_find(policy_key_css).first.value
-    assert_equal(val, 'display_name')
-
-
-@step(u'the policy key name is changed$')
-def the_policy_key_name_is_changed(step):
-    policy_key_css = 'input.policy-key'
-    val = css_find(policy_key_css).first.value
-    assert_equal(val, 'display_name_new')
+@step('it is displayed as a string')
+def it_is_formatted(step):
+    assert_policy_entries([DISPLAY_NAME_KEY], ['"quote me"'])
 
 
 @step(u'the policy key value is unchanged$')
 def the_policy_key_value_is_unchanged(step):
-    policy_value_css = 'li.course-advanced-policy-list-item div.value textarea'
-    val = css_find(policy_value_css).first.value
-    assert_equal(val, '"Robot Super Course"')
+    assert_equal(get_display_name_value(), DISPLAY_NAME_VALUE)
 
 
 @step(u'the policy key value is changed$')
-def the_policy_key_value_is_unchanged(step):
-    policy_value_css = 'li.course-advanced-policy-list-item div.value textarea'
-    val = css_find(policy_value_css).first.value
-    assert_equal(val, '"Robot Super Course X"')
+def the_policy_key_value_is_changed(step):
+    assert_equal(get_display_name_value(), '"Robot Super Course X"')
 
 
 ############# HELPERS ###############
-def create_entry(key, value):
-    # Scroll down the page so the button is visible
-    world.scroll_to_bottom()
-    css_click_at('a.new-advanced-policy-item', 10, 10)
-    new_key_css = 'div#__new_advanced_key__ input'
-    new_key_element = css_find(new_key_css).first
-    new_key_element.fill(key)
-#   For some reason have to get the instance for each command 
-#   (get error that it is no longer attached to the DOM)
-#   Have to do all this because Selenium fill does not remove existing text
-    new_value_css = 'div.CodeMirror textarea'
-    css_find(new_value_css).last.fill("")
-    css_find(new_value_css).last._element.send_keys(Keys.DELETE, Keys.DELETE)
-    css_find(new_value_css).last.fill(value)
-    # Add in a TAB key press because intermittently on ubuntu the
-    # last character of "value" above was not getting typed in
-    css_find(new_value_css).last._element.send_keys(Keys.TAB)
-
-
-def delete_entry(index):
-    """ 
-    Delete the nth entry where index is 0-based
-    """
-    css = 'a.delete-button'
-    assert_true(world.browser.is_element_present_by_css(css, 5))
-    delete_buttons = css_find(css)
-    assert_true(len(delete_buttons) > index, "no delete button exists for entry " + str(index))
-    delete_buttons[index].click()
-
-
 def assert_policy_entries(expected_keys, expected_values):
-    assert_entries('.key input.policy-key', expected_keys)
-    assert_entries('textarea.json', expected_values)
+    for counter in range(len(expected_keys)):
+        index = get_index_of(expected_keys[counter])
+        assert_false(index == -1, "Could not find key: " + expected_keys[counter])
+        assert_equal(expected_values[counter], css_find(VALUE_CSS)[index].value, "value is incorrect")
 
 
-def assert_entries(css, expected_values):
-    webElements = css_find(css)
-    assert_equal(len(expected_values), len(webElements))
-#   Sometimes get stale reference if I hold on to the array of elements
-    for counter in range(len(expected_values)):
-        assert_equal(expected_values[counter], css_find(css)[counter].value)
+def get_index_of(expected_key):
+    for counter in range(len(css_find(KEY_CSS))):
+        #   Sometimes get stale reference if I hold on to the array of elements
+        key = css_find(KEY_CSS)[counter].value
+        if key == expected_key:
+            return counter
+
+    return -1
 
 
-def click_save():
-    css = "a.save-button"
-    css_click_at(css)
+def get_display_name_value():
+    index = get_index_of(DISPLAY_NAME_KEY)
+    return css_find(VALUE_CSS)[index].value
 
 
-def fill_last_field(value):
-    newValue = css_find('#__new_advanced_key__ input').first
-    newValue.fill(value)
+def change_display_name_value(step, new_value):
+    e = css_find(KEY_CSS)[get_index_of(DISPLAY_NAME_KEY)]
+    display_name = get_display_name_value()
+    for count in range(len(display_name)):
+        e._element.send_keys(Keys.TAB, Keys.END, Keys.BACK_SPACE)
+        # Must delete "" before typing the JSON value
+    e._element.send_keys(Keys.TAB, Keys.END, Keys.BACK_SPACE, Keys.BACK_SPACE, new_value)
+    press_the_notification_button(step, "Save")
\ No newline at end of file
diff --git a/cms/djangoapps/contentstore/management/commands/delete_course.py b/cms/djangoapps/contentstore/management/commands/delete_course.py
index 789226db1a..fc92205030 100644
--- a/cms/djangoapps/contentstore/management/commands/delete_course.py
+++ b/cms/djangoapps/contentstore/management/commands/delete_course.py
@@ -7,7 +7,7 @@ from xmodule.modulestore.django import modulestore
 from xmodule.contentstore.django import contentstore
 from xmodule.modulestore import Location
 from xmodule.course_module import CourseDescriptor
-from prompt import query_yes_no
+from .prompt import query_yes_no
 
 from auth.authz import _delete_course_group
 
diff --git a/cms/djangoapps/contentstore/module_info_model.py b/cms/djangoapps/contentstore/module_info_model.py
index 7ed4505c94..8ea6add88d 100644
--- a/cms/djangoapps/contentstore/module_info_model.py
+++ b/cms/djangoapps/contentstore/module_info_model.py
@@ -15,10 +15,10 @@ def get_module_info(store, location, parent_location=None, rewrite_static_links=
         template_location = Location(['i4x', 'edx', 'templates', location.category, 'Empty'])
         module = store.clone_item(template_location, location)
 
-    data = module.definition['data']
+    data = module.data
     if rewrite_static_links:
         data = replace_static_urls(
-            module.definition['data'],
+            module.data,
             None,
             course_namespace=Location([
                 module.location.tag,
@@ -32,7 +32,8 @@ def get_module_info(store, location, parent_location=None, rewrite_static_links=
     return {
         'id': module.location.url(),
         'data': data,
-        'metadata': module.metadata
+        # TODO (cpennington): This really shouldn't have to do this much reaching in to get the metadata
+        'metadata': module._model_data._kvs._metadata
     }
 
 
@@ -70,23 +71,23 @@ def set_module_info(store, location, post_data):
     # 'apply' the submitted metadata, so we don't end up deleting system metadata
     if post_data.get('metadata') is not None:
         posted_metadata = post_data['metadata']
-        
+
         # update existing metadata with submitted metadata (which can be partial)
         # IMPORTANT NOTE: if the client passed pack 'null' (None) for a piece of metadata that means 'remove it'
-        for metadata_key in posted_metadata.keys():
-        
+        for metadata_key, value in posted_metadata.items():
+
             # let's strip out any metadata fields from the postback which have been identified as system metadata
             # and therefore should not be user-editable, so we should accept them back from the client
             if metadata_key in module.system_metadata_fields:
                 del posted_metadata[metadata_key]
             elif posted_metadata[metadata_key] is None:
                 # remove both from passed in collection as well as the collection read in from the modulestore
-                if metadata_key in module.metadata:
-                    del module.metadata[metadata_key]
+                if metadata_key in module._model_data:
+                    del module._model_data[metadata_key]
                 del posted_metadata[metadata_key]
-        
-        # overlay the new metadata over the modulestore sourced collection to support partial updates
-        module.metadata.update(posted_metadata)
-        
+            else:
+                module._model_data[metadata_key] = value
+
         # commit to datastore
-        store.update_metadata(location, module.metadata)
+        # TODO (cpennington): This really shouldn't have to do this much reaching in to get the metadata
+        store.update_metadata(location, module._model_data._kvs._metadata)
diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py
index c0ab9ec60e..d04e1a6332 100644
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -6,28 +6,27 @@ from django.conf import settings
 from django.core.urlresolvers import reverse
 from path import path
 from tempdir import mkdtemp_clean
+from datetime import timedelta
 import json
 from fs.osfs import OSFS
 import copy
-from mock import Mock
-from json import dumps, loads
+from json import loads
 
-from student.models import Registration
 from django.contrib.auth.models import User
-from cms.djangoapps.contentstore.utils import get_modulestore
+from contentstore.utils import get_modulestore
 
-from utils import ModuleStoreTestCase, parse_json
+from .utils import ModuleStoreTestCase, parse_json
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 
 from xmodule.modulestore import Location
 from xmodule.modulestore.store_utilities import clone_course
 from xmodule.modulestore.store_utilities import delete_course
-from xmodule.modulestore.django import modulestore, _MODULESTORES
+from xmodule.modulestore.django import modulestore
 from xmodule.contentstore.django import contentstore
 from xmodule.templates import update_templates
 from xmodule.modulestore.xml_exporter import export_to_xml
 from xmodule.modulestore.xml_importer import import_from_xml
-from xmodule.templates import update_templates
+from xmodule.modulestore.inheritance import own_metadata
 
 from xmodule.capa_module import CapaDescriptor
 from xmodule.course_module import CourseDescriptor
@@ -63,7 +62,6 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         self.client = Client()
         self.client.login(username=uname, password=password)
 
-
     def check_edit_unit(self, test_course_name):
         import_from_xml(modulestore(), 'common/test/data/', [test_course_name])
 
@@ -82,8 +80,8 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
     def test_static_tab_reordering(self):
         import_from_xml(modulestore(), 'common/test/data/', ['full'])
 
-        ms = modulestore('direct')
-        course = ms.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None]))
+        module_store = modulestore('direct')
+        course = module_store.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None]))
 
         # reverse the ordering
         reverse_tabs = []
@@ -91,9 +89,9 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
             if tab['type'] == 'static_tab':
                 reverse_tabs.insert(0, 'i4x://edX/full/static_tab/{0}'.format(tab['url_slug']))
 
-        resp = self.client.post(reverse('reorder_static_tabs'), json.dumps({'tabs': reverse_tabs}), "application/json")
+        self.client.post(reverse('reorder_static_tabs'), json.dumps({'tabs': reverse_tabs}), "application/json")
 
-        course = ms.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None]))
+        course = module_store.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None]))
 
         # compare to make sure that the tabs information is in the expected order after the server call
         course_tabs = []
@@ -103,29 +101,61 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
 
         self.assertEqual(reverse_tabs, course_tabs)
 
+    def test_delete(self):
+        import_from_xml(modulestore(), 'common/test/data/', ['full'])
+
+        module_store = modulestore('direct')
+
+        sequential = module_store.get_item(Location(['i4x', 'edX', 'full', 'sequential', 'Administrivia_and_Circuit_Elements', None]))
+
+        chapter = module_store.get_item(Location(['i4x', 'edX', 'full', 'chapter','Week_1', None]))
+
+        # make sure the parent no longer points to the child object which was deleted
+        self.assertTrue(sequential.location.url() in chapter.children)
+
+        self.client.post(reverse('delete_item'),
+            json.dumps({'id': sequential.location.url(), 'delete_children': 'true', 'delete_all_versions': 'true'}),
+            "application/json")
+
+        found = False
+        try:
+            module_store.get_item(Location(['i4x', 'edX', 'full', 'sequential', 'Administrivia_and_Circuit_Elements', None]))
+            found = True
+        except ItemNotFoundError:
+            pass
+
+        self.assertFalse(found)
+
+        chapter = module_store.get_item(Location(['i4x', 'edX', 'full', 'chapter','Week_1', None]))
+
+        # make sure the parent no longer points to the child object which was deleted
+        self.assertFalse(sequential.location.url() in chapter.children)
+
+
+
     def test_about_overrides(self):
         '''
         This test case verifies that a course can use specialized override for about data, e.g. /about/Fall_2012/effort.html
         while there is a base definition in /about/effort.html
         '''
         import_from_xml(modulestore(), 'common/test/data/', ['full'])
-        ms = modulestore('direct')
-        effort = ms.get_item(Location(['i4x', 'edX', 'full', 'about', 'effort', None]))
-        self.assertEqual(effort.definition['data'], '6 hours')
+        module_store = modulestore('direct')
+        effort = module_store.get_item(Location(['i4x', 'edX', 'full', 'about', 'effort', None]))
+        self.assertEqual(effort.data, '6 hours')
 
         # this one should be in a non-override folder
-        effort = ms.get_item(Location(['i4x', 'edX', 'full', 'about', 'end_date', None]))
-        self.assertEqual(effort.definition['data'], 'TBD')
+        effort = module_store.get_item(Location(['i4x', 'edX', 'full', 'about', 'end_date', None]))
+        self.assertEqual(effort.data, 'TBD')
 
     def test_remove_hide_progress_tab(self):
         import_from_xml(modulestore(), 'common/test/data/', ['full'])
 
-        ms = modulestore('direct')
-        cs = contentstore()
+        module_store = modulestore('direct')
+        content_store = contentstore()
 
         source_location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
-        course = ms.get_item(source_location)
-        self.assertNotIn('hide_progress_tab', course.metadata)
+        course = module_store.get_item(source_location)
+        self.assertFalse(course.hide_progress_tab)
 
     def test_clone_course(self):
 
@@ -143,19 +173,19 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         data = parse_json(resp)
         self.assertEqual(data['id'], 'i4x://MITx/999/course/Robot_Super_Course')
 
-        ms = modulestore('direct')
-        cs = contentstore()
+        module_store = modulestore('direct')
+        content_store = contentstore()
 
         source_location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
         dest_location = CourseDescriptor.id_to_location('MITx/999/Robot_Super_Course')
 
-        clone_course(ms, cs, source_location, dest_location)
+        clone_course(module_store, content_store, source_location, dest_location)
 
         # now loop through all the units in the course and verify that the clone can render them, which
         # means the objects are at least present
-        items = ms.get_items(Location(['i4x', 'edX', 'full', 'vertical', None]))
+        items = module_store.get_items(Location(['i4x', 'edX', 'full', 'vertical', None]))
         self.assertGreater(len(items), 0)
-        clone_items = ms.get_items(Location(['i4x', 'MITx', '999', 'vertical', None]))
+        clone_items = module_store.get_items(Location(['i4x', 'MITx', '999', 'vertical', None]))
         self.assertGreater(len(clone_items), 0)
         for descriptor in items:
             new_loc = descriptor.location._replace(org='MITx', course='999')
@@ -166,14 +196,14 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
     def test_delete_course(self):
         import_from_xml(modulestore(), 'common/test/data/', ['full'])
 
-        ms = modulestore('direct')
-        cs = contentstore()
+        module_store = modulestore('direct')
+        content_store = contentstore()
 
         location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
 
-        delete_course(ms, cs, location, commit=True)
+        delete_course(module_store, content_store, location, commit=True)
 
-        items = ms.get_items(Location(['i4x', 'edX', 'full', 'vertical', None]))
+        items = module_store.get_items(Location(['i4x', 'edX', 'full', 'vertical', None]))
         self.assertEqual(len(items), 0)
 
     def verify_content_existence(self, modulestore, root_dir, location, dirname, category_name, filename_suffix=''):
@@ -188,10 +218,10 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
             self.assertTrue(fs.exists(item.location.name + filename_suffix))
 
     def test_export_course(self):
-        ms = modulestore('direct')
-        cs = contentstore()
+        module_store = modulestore('direct')
+        content_store = contentstore()
 
-        import_from_xml(ms, 'common/test/data/', ['full'])
+        import_from_xml(module_store, 'common/test/data/', ['full'])
         location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
 
         root_dir = path(mkdtemp_clean())
@@ -199,43 +229,43 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         print 'Exporting to tempdir = {0}'.format(root_dir)
 
         # export out to a tempdir
-        export_to_xml(ms, cs, location, root_dir, 'test_export')
+        export_to_xml(module_store, content_store, location, root_dir, 'test_export')
 
         # check for static tabs
-        self.verify_content_existence(ms, root_dir, location, 'tabs', 'static_tab', '.html')
+        self.verify_content_existence(module_store, root_dir, location, 'tabs', 'static_tab', '.html')
 
         # check for custom_tags
-        self.verify_content_existence(ms, root_dir, location, 'info', 'course_info', '.html')
+        self.verify_content_existence(module_store, root_dir, location, 'info', 'course_info', '.html')
 
         # check for custom_tags
-        self.verify_content_existence(ms, root_dir, location, 'custom_tags', 'custom_tag_template')
+        self.verify_content_existence(module_store, root_dir, location, 'custom_tags', 'custom_tag_template')
 
         # check for graiding_policy.json
         fs = OSFS(root_dir / 'test_export/policies/6.002_Spring_2012')
         self.assertTrue(fs.exists('grading_policy.json'))
 
-        course = ms.get_item(location)
+        course = module_store.get_item(location)
         # compare what's on disk compared to what we have in our course
-        with fs.open('grading_policy.json','r') as grading_policy:
-            on_disk = loads(grading_policy.read())    
-            self.assertEqual(on_disk, course.definition['data']['grading_policy'])
+        with fs.open('grading_policy.json', 'r') as grading_policy:
+            on_disk = loads(grading_policy.read())
+            self.assertEqual(on_disk, course.grading_policy)
 
         #check for policy.json
         self.assertTrue(fs.exists('policy.json'))
 
         # compare what's on disk to what we have in the course module
-        with fs.open('policy.json','r') as course_policy:
+        with fs.open('policy.json', 'r') as course_policy:
             on_disk = loads(course_policy.read())
             self.assertIn('course/6.002_Spring_2012', on_disk)
-            self.assertEqual(on_disk['course/6.002_Spring_2012'], course.metadata)
+            self.assertEqual(on_disk['course/6.002_Spring_2012'], own_metadata(course))
 
         # remove old course
-        delete_course(ms, cs, location)
+        delete_course(module_store, content_store, location)
 
         # reimport
-        import_from_xml(ms, root_dir, ['test_export'])
+        import_from_xml(module_store, root_dir, ['test_export'])
 
-        items = ms.get_items(Location(['i4x', 'edX', 'full', 'vertical', None]))
+        items = module_store.get_items(Location(['i4x', 'edX', 'full', 'vertical', None]))
         self.assertGreater(len(items), 0)
         for descriptor in items:
             print "Checking {0}....".format(descriptor.location.url())
@@ -245,11 +275,11 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         shutil.rmtree(root_dir)
 
     def test_course_handouts_rewrites(self):
-        ms = modulestore('direct')
-        cs = contentstore()
+        module_store = modulestore('direct')
+        content_store = contentstore()
 
         # import a test course
-        import_from_xml(ms, 'common/test/data/', ['full'])
+        import_from_xml(module_store, 'common/test/data/', ['full'])
 
         handout_location = Location(['i4x', 'edX', 'full', 'course_info', 'handouts'])
 
@@ -264,32 +294,33 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         self.assertContains(resp, '/c4x/edX/full/asset/handouts_schematic_tutorial.pdf')
 
     def test_export_course_with_unknown_metadata(self):
-        ms = modulestore('direct')
-        cs = contentstore()
+        module_store = modulestore('direct')
+        content_store = contentstore()
 
-        import_from_xml(ms, 'common/test/data/', ['full'])
+        import_from_xml(module_store, 'common/test/data/', ['full'])
         location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
 
         root_dir = path(mkdtemp_clean())
 
-        course = ms.get_item(location)
+        course = module_store.get_item(location)
 
+        metadata = own_metadata(course)
         # add a bool piece of unknown metadata so we can verify we don't throw an exception
-        course.metadata['new_metadata'] = True
+        metadata['new_metadata'] = True
 
-        ms.update_metadata(location, course.metadata)
+        module_store.update_metadata(location, metadata)
 
         print 'Exporting to tempdir = {0}'.format(root_dir)
 
         # export out to a tempdir
-        bExported = False
+        exported = False
         try:
-            export_to_xml(ms, cs, location, root_dir, 'test_export')
-            bExported = True
+            export_to_xml(module_store, content_store, location, root_dir, 'test_export')
+            exported = True
         except Exception:
             pass
 
-        self.assertTrue(bExported)
+        self.assertTrue(exported)
 
 class ContentStoreTest(ModuleStoreTestCase):
     """
@@ -428,7 +459,7 @@ class ContentStoreTest(ModuleStoreTestCase):
 
     def test_capa_module(self):
         """Test that a problem treats markdown specially."""
-        course = CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course')
+        CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course')
 
         problem_data = {
             'parent_location': 'i4x://MITx/999/course/Robot_Super_Course',
@@ -445,82 +476,77 @@ class ContentStoreTest(ModuleStoreTestCase):
         self.assertIsInstance(problem, CapaDescriptor, "New problem is not a CapaDescriptor")
         context = problem.get_context()
         self.assertIn('markdown', context, "markdown is missing from context")
-        self.assertIn('markdown', problem.metadata, "markdown is missing from metadata")
         self.assertNotIn('markdown', problem.editable_metadata_fields, "Markdown slipped into the editable metadata fields")
 
     def test_import_metadata_with_attempts_empty_string(self):
         import_from_xml(modulestore(), 'common/test/data/', ['simple'])
-        ms = modulestore('direct')
+        module_store = modulestore('direct')
         did_load_item = False
-        try:       
-            ms.get_item(Location(['i4x', 'edX', 'simple', 'problem', 'ps01-simple', None]))
+        try:
+            module_store.get_item(Location(['i4x', 'edX', 'simple', 'problem', 'ps01-simple', None]))
             did_load_item = True
         except ItemNotFoundError:
             pass
 
         # make sure we found the item (e.g. it didn't error while loading)
-        self.assertTrue(did_load_item)   
+        self.assertTrue(did_load_item)
 
     def test_metadata_inheritance(self):
         import_from_xml(modulestore(), 'common/test/data/', ['full'])
 
-        ms = modulestore('direct')
-        course = ms.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None]))
+        module_store = modulestore('direct')
+        course = module_store.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None]))
 
-        verticals = ms.get_items(['i4x', 'edX', 'full', 'vertical', None, None])
+        verticals = module_store.get_items(['i4x', 'edX', 'full', 'vertical', None, None])
 
         # let's assert on the metadata_inheritance on an existing vertical
         for vertical in verticals:
-            self.assertIn('xqa_key', vertical.metadata)
-            self.assertEqual(course.metadata['xqa_key'], vertical.metadata['xqa_key'])
+            self.assertEqual(course.lms.xqa_key, vertical.lms.xqa_key)
 
         self.assertGreater(len(verticals), 0)
 
         new_component_location = Location('i4x', 'edX', 'full', 'html', 'new_component')
         source_template_location = Location('i4x', 'edx', 'templates', 'html', 'Blank_HTML_Page')
-        
+
         # crate a new module and add it as a child to a vertical
-        ms.clone_item(source_template_location, new_component_location)
+        module_store.clone_item(source_template_location, new_component_location)
         parent = verticals[0]
-        ms.update_children(parent.location, parent.definition.get('children', []) + [new_component_location.url()])
+        module_store.update_children(parent.location, parent.children + [new_component_location.url()])
 
         # flush the cache
-        ms.get_cached_metadata_inheritance_tree(new_component_location, -1)
-        new_module = ms.get_item(new_component_location)
+        module_store.get_cached_metadata_inheritance_tree(new_component_location, -1)
+        new_module = module_store.get_item(new_component_location)
 
         # check for grace period definition which should be defined at the course level
-        self.assertIn('graceperiod', new_module.metadata)
+        self.assertEqual(parent.lms.graceperiod, new_module.lms.graceperiod)
 
-        self.assertEqual(parent.metadata['graceperiod'], new_module.metadata['graceperiod'])
-
-        self.assertEqual(course.metadata['xqa_key'], new_module.metadata['xqa_key'])
+        self.assertEqual(course.lms.xqa_key, new_module.lms.xqa_key)
 
         #
         # now let's define an override at the leaf node level
         #
-        new_module.metadata['graceperiod'] = '1 day'
-        ms.update_metadata(new_module.location, new_module.metadata)
+        new_module.lms.graceperiod = timedelta(1)
+        module_store.update_metadata(new_module.location, own_metadata(new_module))
 
         # flush the cache and refetch
-        ms.get_cached_metadata_inheritance_tree(new_component_location, -1)
-        new_module = ms.get_item(new_component_location)
+        module_store.get_cached_metadata_inheritance_tree(new_component_location, -1)
+        new_module = module_store.get_item(new_component_location)
 
-        self.assertIn('graceperiod', new_module.metadata)
-        self.assertEqual('1 day', new_module.metadata['graceperiod'])
+        self.assertEqual(timedelta(1), new_module.lms.graceperiod)
 
 
 class TemplateTestCase(ModuleStoreTestCase):
 
-    def test_template_cleanup(self):        
-        ms = modulestore('direct')
+    def test_template_cleanup(self):
+        module_store = modulestore('direct')
 
         # insert a bogus template in the store
         bogus_template_location = Location('i4x', 'edx', 'templates', 'html', 'bogus')
         source_template_location = Location('i4x', 'edx', 'templates', 'html', 'Blank_HTML_Page')
-        
-        ms.clone_item(source_template_location, bogus_template_location)
 
-        verify_create = ms.get_item(bogus_template_location)
+        module_store.clone_item(source_template_location, bogus_template_location)
+
+        verify_create = module_store.get_item(bogus_template_location)
         self.assertIsNotNone(verify_create)
 
         # now run cleanup
@@ -529,10 +555,8 @@ class TemplateTestCase(ModuleStoreTestCase):
         # now try to find dangling template, it should not be in DB any longer
         asserted = False
         try:
-            verify_create = ms.get_item(bogus_template_location)
+            verify_create = module_store.get_item(bogus_template_location)
         except ItemNotFoundError:
             asserted = True
 
-        self.assertTrue(asserted)     
-
-
+        self.assertTrue(asserted)
diff --git a/cms/djangoapps/contentstore/tests/test_course_settings.py b/cms/djangoapps/contentstore/tests/test_course_settings.py
index 5560d2e39b..ecdeca29e7 100644
--- a/cms/djangoapps/contentstore/tests/test_course_settings.py
+++ b/cms/djangoapps/contentstore/tests/test_course_settings.py
@@ -10,16 +10,16 @@ from django.core.urlresolvers import reverse
 from django.utils.timezone import UTC
 
 from xmodule.modulestore import Location
-from cms.djangoapps.models.settings.course_details import (CourseDetails,
+from models.settings.course_details import (CourseDetails,
                                                     CourseSettingsEncoder)
-from cms.djangoapps.models.settings.course_grading import CourseGradingModel
-from cms.djangoapps.contentstore.utils import get_modulestore
+from models.settings.course_grading import CourseGradingModel
+from contentstore.utils import get_modulestore
 
 from django.test import TestCase
-from utils import ModuleStoreTestCase
+from .utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
-from cms.djangoapps.models.settings.course_metadata import CourseMetadata
+from models.settings.course_metadata import CourseMetadata
 from xmodule.modulestore.xml_importer import import_from_xml
 from xmodule.modulestore.django import modulestore
 
@@ -246,8 +246,9 @@ class CourseGradingTest(CourseTestCase):
         altered_grader = CourseGradingModel.update_from_json(test_grader.__dict__)
         self.assertDictEqual(test_grader.__dict__, altered_grader.__dict__, "cutoff add D")
 
-        test_grader.grace_period = {'hours' :  4, 'minutes' : 5, 'seconds': 0}
+        test_grader.grace_period = {'hours': 4, 'minutes': 5, 'seconds': 0}
         altered_grader = CourseGradingModel.update_from_json(test_grader.__dict__)
+        print test_grader.grace_period, altered_grader.grace_period
         self.assertDictEqual(test_grader.__dict__, altered_grader.__dict__, "4 hour grace period")
 
     def test_update_grader_from_json(self):
@@ -286,31 +287,31 @@ class CourseMetadataEditingTest(CourseTestCase):
 
     def test_update_from_json(self):
         test_model = CourseMetadata.update_from_json(self.course_location,
-            { "a" : 1,
-              "b_a_c_h" : { "c" : "test" },
-              "test_text" : "a text string"})
+            { "advertised_start" : "start A",
+              "testcenter_info" : { "c" : "test" },
+              "days_early_for_beta" : 2})
         self.update_check(test_model)
         # try fresh fetch to ensure persistence
         test_model = CourseMetadata.fetch(self.course_location)
         self.update_check(test_model)
         # now change some of the existing metadata
         test_model = CourseMetadata.update_from_json(self.course_location,
-            { "a" : 2,
+            { "advertised_start" : "start B",
               "display_name" : "jolly roger"})
         self.assertIn('display_name', test_model, 'Missing editable metadata field')
         self.assertEqual(test_model['display_name'], 'jolly roger', "not expected value")
-        self.assertIn('a', test_model, 'Missing revised a metadata field')
-        self.assertEqual(test_model['a'], 2, "a not expected value")
+        self.assertIn('advertised_start', test_model, 'Missing revised advertised_start metadata field')
+        self.assertEqual(test_model['advertised_start'], 'start B', "advertised_start not expected value")
 
     def update_check(self, test_model):
         self.assertIn('display_name', test_model, 'Missing editable metadata field')
         self.assertEqual(test_model['display_name'], 'Robot Super Course', "not expected value")
-        self.assertIn('a', test_model, 'Missing new a metadata field')
-        self.assertEqual(test_model['a'], 1, "a not expected value")
-        self.assertIn('b_a_c_h', test_model, 'Missing b_a_c_h metadata field')
-        self.assertDictEqual(test_model['b_a_c_h'], { "c" : "test" }, "b_a_c_h not expected value")
-        self.assertIn('test_text', test_model, 'Missing test_text metadata field')
-        self.assertEqual(test_model['test_text'], "a text string", "test_text not expected value")
+        self.assertIn('advertised_start', test_model, 'Missing new advertised_start metadata field')
+        self.assertEqual(test_model['advertised_start'], 'start A', "advertised_start not expected value")
+        self.assertIn('testcenter_info', test_model, 'Missing testcenter_info metadata field')
+        self.assertDictEqual(test_model['testcenter_info'], { "c" : "test" }, "testcenter_info not expected value")
+        self.assertIn('days_early_for_beta', test_model, 'Missing days_early_for_beta metadata field')
+        self.assertEqual(test_model['days_early_for_beta'], 2, "days_early_for_beta not expected value")
 
 
     def test_delete_key(self):
@@ -321,5 +322,5 @@ class CourseMetadataEditingTest(CourseTestCase):
         self.assertEqual(test_model['display_name'], 'Testing', "not expected value")
         self.assertIn('rerandomize', test_model, 'Missing rerandomize metadata field')
         # check for deletion effectiveness
-        self.assertNotIn('showanswer', test_model, 'showanswer field still in')
-        self.assertNotIn('xqa_key', test_model, 'xqa_key field still in')
\ No newline at end of file
+        self.assertEqual('closed', test_model['showanswer'], 'showanswer field still in')
+        self.assertEqual(None, test_model['xqa_key'], 'xqa_key field still in')
diff --git a/cms/djangoapps/contentstore/tests/test_course_updates.py b/cms/djangoapps/contentstore/tests/test_course_updates.py
index c57f1322f5..6a3a1e21f7 100644
--- a/cms/djangoapps/contentstore/tests/test_course_updates.py
+++ b/cms/djangoapps/contentstore/tests/test_course_updates.py
@@ -1,4 +1,4 @@
-from cms.djangoapps.contentstore.tests.test_course_settings import CourseTestCase
+from contentstore.tests.test_course_settings import CourseTestCase
 from django.core.urlresolvers import reverse
 import json
 
diff --git a/cms/djangoapps/contentstore/tests/test_utils.py b/cms/djangoapps/contentstore/tests/test_utils.py
index 09e3b045f9..4ab40d17a8 100644
--- a/cms/djangoapps/contentstore/tests/test_utils.py
+++ b/cms/djangoapps/contentstore/tests/test_utils.py
@@ -1,4 +1,4 @@
-from  cms.djangoapps.contentstore import utils
+from  contentstore import utils
 import mock
 from django.test import TestCase
 
diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py
index c4a46459e2..e43a95fccd 100644
--- a/cms/djangoapps/contentstore/tests/tests.py
+++ b/cms/djangoapps/contentstore/tests/tests.py
@@ -8,7 +8,7 @@ import json
 from fs.osfs import OSFS
 import copy
 
-from cms.djangoapps.contentstore.utils import get_modulestore
+from contentstore.utils import get_modulestore
 
 from xmodule.modulestore import Location
 from xmodule.modulestore.store_utilities import clone_course
@@ -24,7 +24,7 @@ from xmodule.course_module import CourseDescriptor
 from xmodule.seq_module import SequenceDescriptor
 
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
-from utils import ModuleStoreTestCase, parse_json, user, registration
+from .utils import ModuleStoreTestCase, parse_json, user, registration
 
 
 class ContentStoreTestCase(ModuleStoreTestCase):
diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py
index cba30131b5..0a99441fe9 100644
--- a/cms/djangoapps/contentstore/utils.py
+++ b/cms/djangoapps/contentstore/utils.py
@@ -39,10 +39,10 @@ def get_course_location_for_item(location):
         # make sure we found exactly one match on this above course search
         found_cnt = len(courses)
         if found_cnt == 0:
-            raise BaseException('Could not find course at {0}'.format(course_search_location))
+            raise Exception('Could not find course at {0}'.format(course_search_location))
 
         if found_cnt > 1:
-            raise BaseException('Found more than one course at {0}. There should only be one!!! Dump = {1}'.format(course_search_location, courses))
+            raise Exception('Found more than one course at {0}. There should only be one!!! Dump = {1}'.format(course_search_location, courses))
 
         location = courses[0].location
 
@@ -136,7 +136,7 @@ def compute_unit_state(unit):
     'private' content is editabled and not visible in the LMS
     """
 
-    if unit.metadata.get('is_draft', False):
+    if unit.cms.is_draft:
         try:
             modulestore('direct').get_item(unit.location)
             return UnitState.draft
diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index 345861f979..80833a4e5f 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -28,11 +28,15 @@ from django.conf import settings
 
 from xmodule.modulestore import Location
 from xmodule.modulestore.exceptions import ItemNotFoundError, InvalidLocationError
+from xmodule.modulestore.inheritance import own_metadata
+from xblock.core import Scope
+from xblock.runtime import KeyValueStore, DbModel, InvalidScopeError
 from xmodule.x_module import ModuleSystem
 from xmodule.error_module import ErrorDescriptor
 from xmodule.errortracker import exc_info_to_str
 import static_replace
 from external_auth.views import ssl_login_shortcut
+from xmodule.modulestore.mongo import MongoUsage
 
 from mitxmako.shortcuts import render_to_response, render_to_string
 from xmodule.modulestore.django import modulestore
@@ -54,12 +58,12 @@ from contentstore.course_info_model import get_course_updates,\
 from cache_toolbox.core import del_cached_content
 from xmodule.timeparse import stringify_time
 from contentstore.module_info_model import get_module_info, set_module_info
-from cms.djangoapps.models.settings.course_details import CourseDetails,\
+from models.settings.course_details import CourseDetails,\
     CourseSettingsEncoder
-from cms.djangoapps.models.settings.course_grading import CourseGradingModel
-from cms.djangoapps.contentstore.utils import get_modulestore
+from models.settings.course_grading import CourseGradingModel
+from contentstore.utils import get_modulestore
 from django.shortcuts import redirect
-from cms.djangoapps.models.settings.course_metadata import CourseMetadata
+from models.settings.course_metadata import CourseMetadata
 
 # to install PIL on MacOSX: 'easy_install http://dist.repoze.org/PIL-1.1.6.tar.gz'
 
@@ -86,12 +90,14 @@ def signup(request):
     csrf_token = csrf(request)['csrf_token']
     return render_to_response('signup.html', {'csrf': csrf_token})
 
+
 def old_login_redirect(request):
     '''
     Redirect to the active login url.
     '''
     return redirect('login', permanent=True)
 
+
 @ssl_login_shortcut
 @ensure_csrf_cookie
 def login_page(request):
@@ -104,14 +110,16 @@ def login_page(request):
         'forgot_password_link': "//{base}/#forgot-password-modal".format(base=settings.LMS_BASE),
     })
 
+
 def howitworks(request):
     if request.user.is_authenticated():
         return index(request)
-    else: 
+    else:
         return render_to_response('howitworks.html', {})
 
 # ==== Views for any logged-in user ==================================
 
+
 @login_required
 @ensure_csrf_cookie
 def index(request):
@@ -131,7 +139,7 @@ def index(request):
 
     return render_to_response('index.html', {
         'new_course_template': Location('i4x', 'edx', 'templates', 'course', 'Empty'),
-        'courses': [(course.metadata.get('display_name'),
+        'courses': [(course.display_name,
                     reverse('course_index', args=[
                         course.location.org,
                         course.location.course,
@@ -145,6 +153,7 @@ def index(request):
 
 # ==== Views with per-item permissions================================
 
+
 def has_access(user, location, role=STAFF_ROLE_NAME):
     '''
     Return True if user allowed to access this piece of data
@@ -234,8 +243,13 @@ def edit_subsection(request, location):
 
     # remove all metadata from the generic dictionary that is presented in a more normalized UI
 
-    policy_metadata = dict((key, value) for key, value in item.metadata.iteritems()
-        if key not in ['display_name', 'start', 'due', 'format'] and key not in item.system_metadata_fields)
+    policy_metadata = dict(
+        (field.name, field.read_from(item))
+        for field
+        in item.fields
+        if field.name not in ['display_name', 'start', 'due', 'format'] and
+           field.scope == Scope.settings
+    )
 
     can_view_live = False
     subsection_units = item.get_children()
@@ -288,8 +302,7 @@ def edit_unit(request, location):
     # Check if there are any advanced modules specified in the course policy. These modules
     # should be specified as a list of strings, where the strings are the names of the modules
     # in ADVANCED_COMPONENT_TYPES that should be enabled for the course.
-    course_metadata = CourseMetadata.fetch(course.location)
-    course_advanced_keys = course_metadata.get(ADVANCED_COMPONENT_POLICY_KEY, [])
+    course_advanced_keys = course.advanced_modules
 
     # Set component types according to course policy file
     component_types = list(COMPONENT_TYPES)
@@ -310,10 +323,10 @@ def edit_unit(request, location):
         if category in component_types:
             #This is a hack to create categories for different xmodules
             component_templates[category].append((
-                template.display_name,
+                template.display_name_with_default,
                 template.location.url(),
-                'markdown' in template.metadata,
-                'empty' in template.metadata
+                hasattr(template, 'markdown') and template.markdown is not None,
+                template.cms.empty,
             ))
 
     components = [
@@ -357,11 +370,6 @@ def edit_unit(request, location):
 
     unit_state = compute_unit_state(item)
 
-    try:
-        published_date = time.strftime('%B %d, %Y', item.metadata.get('published_date'))
-    except TypeError:
-        published_date = None
-
     return render_to_response('unit.html', {
         'context_course': course,
         'active_tab': 'courseware',
@@ -372,11 +380,11 @@ def edit_unit(request, location):
         'draft_preview_link': preview_lms_link,
         'published_preview_link': lms_link,
         'subsection': containing_subsection,
-        'release_date': get_date_display(datetime.fromtimestamp(time.mktime(containing_subsection.start))) if containing_subsection.start is not None else None,
+        'release_date': get_date_display(datetime.fromtimestamp(time.mktime(containing_subsection.lms.start))) if containing_subsection.lms.start is not None else None,
         'section': containing_section,
         'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty'),
         'unit_state': unit_state,
-        'published_date': published_date,
+        'published_date': item.cms.published_date.strftime('%B %d, %Y') if item.cms.published_date is not None else None,
     })
 
 
@@ -393,6 +401,7 @@ def preview_component(request, location):
         'editor': wrap_xmodule(component.get_html, component, 'xmodule_edit.html')(),
     })
 
+
 @expect_json
 @login_required
 @ensure_csrf_cookie
@@ -440,9 +449,8 @@ def preview_dispatch(request, preview_id, location, dispatch=None):
     dispatch: The action to execute
     """
 
-    instance_state, shared_state = load_preview_state(request, preview_id, location)
     descriptor = modulestore().get_item(location)
-    instance = load_preview_module(request, preview_id, descriptor, instance_state, shared_state)
+    instance = load_preview_module(request, preview_id, descriptor)
     # Let the module handle the AJAX
     try:
         ajax_return = instance.handle_ajax(dispatch, request.POST)
@@ -453,46 +461,9 @@ def preview_dispatch(request, preview_id, location, dispatch=None):
         log.exception("error processing ajax call")
         raise
 
-    save_preview_state(request, preview_id, location, instance.get_instance_state(), instance.get_shared_state())
     return HttpResponse(ajax_return)
 
 
-def load_preview_state(request, preview_id, location):
-    """
-    Load the state of a preview module from the request
-
-    preview_id (str): An identifier specifying which preview this module is used for
-    location: The Location of the module to dispatch to
-    """
-    if 'preview_states' not in request.session:
-        request.session['preview_states'] = defaultdict(dict)
-
-    instance_state = request.session['preview_states'][preview_id, location].get('instance')
-    shared_state = request.session['preview_states'][preview_id, location].get('shared')
-
-    return instance_state, shared_state
-
-
-def save_preview_state(request, preview_id, location, instance_state, shared_state):
-    """
-    Save the state of a preview module to the request
-
-    preview_id (str): An identifier specifying which preview this module is used for
-    location: The Location of the module to dispatch to
-    instance_state: The instance state to save
-    shared_state: The shared state to save
-    """
-    if 'preview_states' not in request.session:
-        request.session['preview_states'] = defaultdict(dict)
-
-    # request.session doesn't notice indirect changes; so, must set its dict w/ every change to get
-    # it to persist: http://www.djangobook.com/en/2.0/chapter14.html
-    preview_states = request.session['preview_states']
-    preview_states[preview_id, location]['instance'] = instance_state
-    preview_states[preview_id, location]['shared'] = shared_state
-    request.session['preview_states'] = preview_states  # make session mgmt notice the update
-
-
 def render_from_lms(template_name, dictionary, context=None, namespace='main'):
     """
     Render a template using the LMS MAKO_TEMPLATES
@@ -500,6 +471,33 @@ def render_from_lms(template_name, dictionary, context=None, namespace='main'):
     return render_to_string(template_name, dictionary, context, namespace="lms." + namespace)
 
 
+class SessionKeyValueStore(KeyValueStore):
+    def __init__(self, request, model_data):
+        self._model_data = model_data
+        self._session = request.session
+
+    def get(self, key):
+        try:
+            return self._model_data[key.field_name]
+        except (KeyError, InvalidScopeError):
+            return self._session[tuple(key)]
+
+    def set(self, key, value):
+        try:
+            self._model_data[key.field_name] = value
+        except (KeyError, InvalidScopeError):
+            self._session[tuple(key)] = value
+
+    def delete(self, key):
+        try:
+            del self._model_data[key.field_name]
+        except (KeyError, InvalidScopeError):
+            del self._session[tuple(key)]
+
+    def has(self, key):
+        return key in self._model_data or key in self._session
+
+
 def preview_module_system(request, preview_id, descriptor):
     """
     Returns a ModuleSystem for the specified descriptor that is specialized for
@@ -510,6 +508,14 @@ def preview_module_system(request, preview_id, descriptor):
     descriptor: An XModuleDescriptor
     """
 
+    def preview_model_data(descriptor):
+        return DbModel(
+            SessionKeyValueStore(request, descriptor._model_data),
+            descriptor.module_class,
+            preview_id,
+            MongoUsage(preview_id, descriptor.location.url()),
+        )
+
     return ModuleSystem(
         ajax_url=reverse('preview_dispatch', args=[preview_id, descriptor.location.url(), '']).rstrip('/'),
         # TODO (cpennington): Do we want to track how instructors are using the preview problems?
@@ -520,6 +526,7 @@ def preview_module_system(request, preview_id, descriptor):
         debug=True,
         replace_urls=partial(static_replace.replace_static_urls, data_directory=None, course_namespace=descriptor.location),
         user=request.user,
+        xblock_model_data=preview_model_data,
     )
 
 
@@ -532,11 +539,11 @@ def get_preview_module(request, preview_id, descriptor):
     preview_id (str): An identifier specifying which preview this module is used for
     location: A Location
     """
-    instance_state, shared_state = descriptor.get_sample_state()[0]
-    return load_preview_module(request, preview_id, descriptor, instance_state, shared_state)
+
+    return load_preview_module(request, preview_id, descriptor)
 
 
-def load_preview_module(request, preview_id, descriptor, instance_state, shared_state):
+def load_preview_module(request, preview_id, descriptor):
     """
     Return a preview XModule instantiated from the supplied descriptor, instance_state, and shared_state
 
@@ -548,12 +555,13 @@ def load_preview_module(request, preview_id, descriptor, instance_state, shared_
     """
     system = preview_module_system(request, preview_id, descriptor)
     try:
-        module = descriptor.xmodule_constructor(system)(instance_state, shared_state)
+        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_constructor(system)(None, None)
+        ).xmodule(system)
 
     # cdodge: Special case
     if module.location.category == 'static_tab':
@@ -571,11 +579,9 @@ def load_preview_module(request, preview_id, descriptor, instance_state, shared_
 
     module.get_html = replace_static_urls(
         module.get_html,
-        module.metadata.get('data_dir', module.location.course),
+        getattr(module, 'data_dir', module.location.course),
         course_namespace=Location([module.location.tag, module.location.org, module.location.course, None, None])
     )
-    save_preview_state(request, preview_id, descriptor.location.url(),
-        module.get_instance_state(), module.get_shared_state())
 
     return module
 
@@ -589,7 +595,7 @@ def get_module_previews(request, descriptor):
     """
     preview_html = []
     for idx, (instance_state, shared_state) in enumerate(descriptor.get_sample_state()):
-        module = load_preview_module(request, str(idx), descriptor, instance_state, shared_state)
+        module = load_preview_module(request, str(idx), descriptor)
         preview_html.append(module.get_html())
     return preview_html
 
@@ -636,6 +642,19 @@ def delete_item(request):
     if item.location.revision is None and item.location.category == 'vertical' and delete_all_versions:
         modulestore('direct').delete_item(item.location)
 
+    # cdodge: we need to remove our parent's pointer to us so that it is no longer dangling
+    if delete_all_versions:
+        parent_locs = modulestore('direct').get_parent_locations(item_loc, None)
+
+        for parent_loc in parent_locs:
+            parent = modulestore('direct').get_item(parent_loc)
+            item_url = item_loc.url()
+            if item_url in parent.children:
+                children = parent.children
+                children.remove(item_url)
+                parent.children = children
+                modulestore('direct').update_children(parent.location, parent.children)
+
     return HttpResponse()
 
 
@@ -673,7 +692,7 @@ def save_item(request):
 
         # update existing metadata with submitted metadata (which can be partial)
         # IMPORTANT NOTE: if the client passed pack 'null' (None) for a piece of metadata that means 'remove it'
-        for metadata_key in posted_metadata.keys():
+        for metadata_key, value in posted_metadata.items():
 
             # let's strip out any metadata fields from the postback which have been identified as system metadata
             # and therefore should not be user-editable, so we should accept them back from the client
@@ -681,15 +700,15 @@ def save_item(request):
                 del posted_metadata[metadata_key]
             elif posted_metadata[metadata_key] is None:
                 # remove both from passed in collection as well as the collection read in from the modulestore
-                if metadata_key in existing_item.metadata:
-                    del existing_item.metadata[metadata_key]
+                if metadata_key in existing_item._model_data:
+                    del existing_item._model_data[metadata_key]
                 del posted_metadata[metadata_key]
-
-        # overlay the new metadata over the modulestore sourced collection to support partial updates
-        existing_item.metadata.update(posted_metadata)
+            else:
+                existing_item._model_data[metadata_key] = value
 
         # commit to datastore
-        store.update_metadata(item_location, existing_item.metadata)
+        # TODO (cpennington): This really shouldn't have to do this much reaching in to get the metadata
+        store.update_metadata(item_location, own_metadata(existing_item))
 
     return HttpResponse()
 
@@ -709,6 +728,7 @@ def create_draft(request):
 
     return HttpResponse()
 
+
 @login_required
 @expect_json
 def publish_draft(request):
@@ -738,6 +758,7 @@ def unpublish_unit(request):
 
     return HttpResponse()
 
+
 @login_required
 @expect_json
 def clone_item(request):
@@ -754,22 +775,18 @@ def clone_item(request):
 
     new_item = get_modulestore(template).clone_item(template, dest_location)
 
-    # TODO: This needs to be deleted when we have proper storage for static content
-    new_item.metadata['data_dir'] = parent.metadata['data_dir']
-
     # replace the display name with an optional parameter passed in from the caller
     if display_name is not None:
-        new_item.metadata['display_name'] = display_name
+        new_item.display_name = display_name
 
-    get_modulestore(template).update_metadata(new_item.location.url(), new_item.own_metadata)
+    get_modulestore(template).update_metadata(new_item.location.url(), own_metadata(new_item))
 
     if new_item.location.category not in DETACHED_CATEGORIES:
-        get_modulestore(parent.location).update_children(parent_location, parent.definition.get('children', []) + [new_item.location.url()])
+        get_modulestore(parent.location).update_children(parent_location, parent.children + [new_item.location.url()])
 
     return HttpResponse(json.dumps({'id': dest_location.url()}))
 
-#@login_required
-#@ensure_csrf_cookie
+
 def upload_asset(request, org, course, coursename):
     '''
     cdodge: this method allows for POST uploading of files into the course asset library, which will
@@ -831,6 +848,7 @@ def upload_asset(request, org, course, coursename):
     response['asset_url'] = StaticContent.get_url_path_from_location(content.location)
     return response
 
+
 '''
 This view will return all CMS users who are editors for the specified course
 '''
@@ -863,6 +881,7 @@ def create_json_response(errmsg = None):
 
     return resp
 
+
 '''
 This POST-back view will add a user - specified by email - to the list of editors for
 the specified course
@@ -895,6 +914,7 @@ def add_user(request, location):
 
     return create_json_response()
 
+
 '''
 This POST-back view will remove a user - specified by email - from the list of editors for
 the specified course
@@ -926,6 +946,7 @@ def remove_user(request, location):
 def landing(request, org, course, coursename):
     return render_to_response('temp-course-landing.html', {})
 
+
 @login_required
 @ensure_csrf_cookie
 def static_pages(request, org, course, coursename):
@@ -980,7 +1001,7 @@ def reorder_static_tabs(request):
     for tab in course.tabs:
         if tab['type'] == 'static_tab':
             reordered_tabs.append({'type': 'static_tab',
-                'name': tab_items[static_tab_idx].metadata.get('display_name'),
+                'name': tab_items[static_tab_idx].display_name,
                 'url_slug': tab_items[static_tab_idx].location.name})
             static_tab_idx += 1
         else:
@@ -989,7 +1010,7 @@ def reorder_static_tabs(request):
 
     # OK, re-assemble the static tabs in the new order
     course.tabs = reordered_tabs
-    modulestore('direct').update_metadata(course.location, course.metadata)
+    modulestore('direct').update_metadata(course.location, own_metadata(course))
     return HttpResponse()
 
 
@@ -1029,6 +1050,7 @@ def edit_tabs(request, org, course, coursename):
         'components': components
         })
 
+
 def not_found(request):
     return render_to_response('error.html', {'error': '404'})
 
@@ -1064,6 +1086,7 @@ def course_info(request, org, course, name, provided_id=None):
         'handouts_location': Location(['i4x', org, course, 'course_info', 'handouts']).url()
     })
 
+
 @expect_json
 @login_required
 @ensure_csrf_cookie
@@ -1161,6 +1184,7 @@ def get_course_settings(request, org, course, name):
                                        "section": "details"})
     })
 
+
 @login_required
 @ensure_csrf_cookie
 def course_config_graders_page(request, org, course, name):
@@ -1184,6 +1208,7 @@ def course_config_graders_page(request, org, course, name):
         'course_details': json.dumps(course_details, cls=CourseSettingsEncoder)
     })
 
+
 @login_required
 @ensure_csrf_cookie
 def course_config_advanced_page(request, org, course, name):
@@ -1203,10 +1228,10 @@ def course_config_advanced_page(request, org, course, name):
     return render_to_response('settings_advanced.html', {
         'context_course': course_module,
         'course_location' : location,
-        'advanced_blacklist' : json.dumps(CourseMetadata.FILTERED_LIST),
         'advanced_dict' : json.dumps(CourseMetadata.fetch(location)),
     })
 
+
 @expect_json
 @login_required
 @ensure_csrf_cookie
@@ -1238,6 +1263,7 @@ def course_settings_updates(request, org, course, name, section):
         return HttpResponse(json.dumps(manager.update_from_json(request.POST), cls=CourseSettingsEncoder),
                             mimetype="application/json")
 
+
 @expect_json
 @login_required
 @ensure_csrf_cookie
@@ -1272,7 +1298,7 @@ def course_grader_updates(request, org, course, name, grader_index=None):
         return HttpResponse(json.dumps(CourseGradingModel.update_grader_from_json(Location(['i4x', org, course, 'course', name]), request.POST)),
                             mimetype="application/json")
 
-        
+
 ## NB: expect_json failed on ["key", "key2"] and json payload
 @login_required
 @ensure_csrf_cookie
@@ -1284,7 +1310,7 @@ def course_advanced_updates(request, org, course, name):
     org, course: Attributes of the Location for the item to edit
     """
     location = ['i4x', org, course, 'course', name]
-    
+
     # check that logged in user has permissions to this item
     if not has_access(request.user, location):
         raise PermissionDenied()
@@ -1294,7 +1320,7 @@ def course_advanced_updates(request, org, course, name):
         real_method = request.META['HTTP_X_HTTP_METHOD_OVERRIDE']
     else:
         real_method = request.method
-        
+
     if real_method == 'GET':
         return HttpResponse(json.dumps(CourseMetadata.fetch(location)), mimetype="application/json")
     elif real_method == 'DELETE':
@@ -1363,6 +1389,7 @@ def asset_index(request, org, course, name):
 def edge(request):
     return render_to_response('university_profiles/edge.html', {})
 
+
 @login_required
 @expect_json
 def create_new_course(request):
@@ -1404,13 +1431,10 @@ def create_new_course(request):
     new_course = modulestore('direct').clone_item(template, dest_location)
 
     if display_name is not None:
-        new_course.metadata['display_name'] = display_name
-
-    # we need a 'data_dir' for legacy reasons
-    new_course.metadata['data_dir'] = uuid4().hex
+        new_course.display_name = display_name
 
     # set a default start date to now
-    new_course.metadata['start'] = stringify_time(time.gmtime())
+    new_course.start = time.gmtime()
 
     initialize_course_tabs(new_course)
 
@@ -1418,6 +1442,7 @@ def create_new_course(request):
 
     return HttpResponse(json.dumps({'id': new_course.location.url()}))
 
+
 def initialize_course_tabs(course):
     # set up the default tabs
     # I've added this because when we add static tabs, the LMS either expects a None for the tabs list or
@@ -1428,12 +1453,13 @@ def initialize_course_tabs(course):
     # This logic is repeated in xmodule/modulestore/tests/factories.py
     # so if you change anything here, you need to also change it there.
     course.tabs = [{"type": "courseware"},
-        {"type": "course_info", "name": "Course Info"}, 
+        {"type": "course_info", "name": "Course Info"},
         {"type": "discussion", "name": "Discussion"},
         {"type": "wiki", "name": "Wiki"},
         {"type": "progress", "name": "Progress"}]
 
-    modulestore('direct').update_metadata(course.location.url(), course.own_metadata)
+    modulestore('direct').update_metadata(course.location.url(), own_metadata(course))
+
 
 @ensure_csrf_cookie
 @login_required
@@ -1512,6 +1538,7 @@ def import_course(request, org, course, name):
                         course_module.location.name])
         })
 
+
 @ensure_csrf_cookie
 @login_required
 def generate_export_course(request, org, course, name):
@@ -1563,6 +1590,7 @@ def export_course(request, org, course, name):
         'successful_import_redirect_url': ''
     })
 
+
 def event(request):
     '''
     A noop to swallow the analytics call so that cms methods don't spook and poor developers looking at
diff --git a/cms/djangoapps/models/settings/course_details.py b/cms/djangoapps/models/settings/course_details.py
index b27f4e3804..d3cd5fe164 100644
--- a/cms/djangoapps/models/settings/course_details.py
+++ b/cms/djangoapps/models/settings/course_details.py
@@ -1,13 +1,14 @@
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore import Location
 from xmodule.modulestore.exceptions import ItemNotFoundError
+from xmodule.modulestore.inheritance import own_metadata
 import json
 from json.encoder import JSONEncoder
 import time
 from contentstore.utils import get_modulestore
 from util.converters import jsdate_to_time, time_to_date
-from cms.djangoapps.models.settings import course_grading
-from cms.djangoapps.contentstore.utils import update_item
+from models.settings import course_grading
+from contentstore.utils import update_item
 import re
 import logging
 
@@ -43,25 +44,25 @@ class CourseDetails(object):
 
         temploc = course_location._replace(category='about', name='syllabus')
         try:
-            course.syllabus = get_modulestore(temploc).get_item(temploc).definition['data']
+            course.syllabus = get_modulestore(temploc).get_item(temploc).data
         except ItemNotFoundError:
             pass
 
         temploc = temploc._replace(name='overview')
         try:
-            course.overview = get_modulestore(temploc).get_item(temploc).definition['data']
+            course.overview = get_modulestore(temploc).get_item(temploc).data
         except ItemNotFoundError:
             pass
 
         temploc = temploc._replace(name='effort')
         try:
-            course.effort = get_modulestore(temploc).get_item(temploc).definition['data']
+            course.effort = get_modulestore(temploc).get_item(temploc).data
         except ItemNotFoundError:
             pass
 
         temploc = temploc._replace(name='video')
         try:
-            raw_video = get_modulestore(temploc).get_item(temploc).definition['data']
+            raw_video = get_modulestore(temploc).get_item(temploc).data
             course.intro_video = CourseDetails.parse_video_tag(raw_video)
         except ItemNotFoundError:
             pass
@@ -116,7 +117,7 @@ class CourseDetails(object):
             descriptor.enrollment_end = converted
 
         if dirty:
-            get_modulestore(course_location).update_metadata(course_location, descriptor.metadata)
+            get_modulestore(course_location).update_metadata(course_location, own_metadata(descriptor))
 
         # NOTE: below auto writes to the db w/o verifying that any of the fields actually changed
         # to make faster, could compare against db or could have client send over a list of which fields changed.
@@ -133,7 +134,6 @@ class CourseDetails(object):
         recomposed_video_tag = CourseDetails.recompose_video_tag(jsondict['intro_video'])
         update_item(temploc, recomposed_video_tag)
 
-
         # Could just generate and return a course obj w/o doing any db reads, but I put the reads in as a means to confirm
         # it persisted correctly
         return CourseDetails.fetch(course_location)
diff --git a/cms/djangoapps/models/settings/course_grading.py b/cms/djangoapps/models/settings/course_grading.py
index 3d0b8f78af..b20fb71f66 100644
--- a/cms/djangoapps/models/settings/course_grading.py
+++ b/cms/djangoapps/models/settings/course_grading.py
@@ -2,6 +2,7 @@ from xmodule.modulestore import Location
 from contentstore.utils import get_modulestore
 import re
 from util import converters
+from datetime import timedelta
 
 
 class CourseGradingModel(object):
@@ -91,7 +92,7 @@ class CourseGradingModel(object):
         descriptor.raw_grader = graders_parsed
         descriptor.grade_cutoffs = jsondict['grade_cutoffs']
 
-        get_modulestore(course_location).update_item(course_location, descriptor.definition['data'])
+        get_modulestore(course_location).update_item(course_location, descriptor._model_data._kvs._data)
         CourseGradingModel.update_grace_period_from_json(course_location, jsondict['grace_period'])
 
         return CourseGradingModel.fetch(course_location)
@@ -119,7 +120,7 @@ class CourseGradingModel(object):
         else:
             descriptor.raw_grader.append(grader)
 
-        get_modulestore(course_location).update_item(course_location, descriptor.definition['data'])
+        get_modulestore(course_location).update_item(course_location, descriptor._model_data._kvs._data)
 
         return CourseGradingModel.jsonize_grader(index, descriptor.raw_grader[index])
 
@@ -134,7 +135,7 @@ class CourseGradingModel(object):
 
         descriptor = get_modulestore(course_location).get_item(course_location)
         descriptor.grade_cutoffs = cutoffs
-        get_modulestore(course_location).update_item(course_location, descriptor.definition['data'])
+        get_modulestore(course_location).update_item(course_location, descriptor._model_data._kvs._data)
 
         return cutoffs
 
@@ -156,11 +157,11 @@ class CourseGradingModel(object):
                 graceperiodjson = graceperiodjson['grace_period']
 
             # lms requires these to be in a fixed order
-            grace_rep = "{0[hours]:d} hours {0[minutes]:d} minutes {0[seconds]:d} seconds".format(graceperiodjson) 
+            grace_timedelta = timedelta(**graceperiodjson)
 
             descriptor = get_modulestore(course_location).get_item(course_location)
-            descriptor.metadata['graceperiod'] = grace_rep
-            get_modulestore(course_location).update_metadata(course_location, descriptor.metadata)
+            descriptor.lms.graceperiod = grace_timedelta
+            get_modulestore(course_location).update_metadata(course_location, descriptor._model_data._kvs._metadata)
 
     @staticmethod
     def delete_grader(course_location, index):
@@ -176,7 +177,7 @@ class CourseGradingModel(object):
             del descriptor.raw_grader[index]
             # force propagation to definition
             descriptor.raw_grader = descriptor.raw_grader
-            get_modulestore(course_location).update_item(course_location, descriptor.definition['data'])
+            get_modulestore(course_location).update_item(course_location, descriptor._model_data._kvs._data)
 
     # NOTE cannot delete cutoffs. May be useful to reset
     @staticmethod
@@ -189,7 +190,7 @@ class CourseGradingModel(object):
 
         descriptor = get_modulestore(course_location).get_item(course_location)
         descriptor.grade_cutoffs = descriptor.defaut_grading_policy['GRADE_CUTOFFS']
-        get_modulestore(course_location).update_item(course_location, descriptor.definition['data'])
+        get_modulestore(course_location).update_item(course_location, descriptor._model_data._kvs._data)
 
         return descriptor.grade_cutoffs
 
@@ -202,8 +203,8 @@ class CourseGradingModel(object):
             course_location = Location(course_location)
 
         descriptor = get_modulestore(course_location).get_item(course_location)
-        if 'graceperiod' in descriptor.metadata: del descriptor.metadata['graceperiod']   
-        get_modulestore(course_location).update_metadata(course_location, descriptor.metadata)
+        del descriptor.lms.graceperiod
+        get_modulestore(course_location).update_metadata(course_location, descriptor._model_data._kvs._metadata)
 
     @staticmethod
     def get_section_grader_type(location):
@@ -212,7 +213,7 @@ class CourseGradingModel(object):
 
         descriptor = get_modulestore(location).get_item(location)
         return {
-                "graderType": descriptor.metadata.get('format', u"Not Graded"),
+                "graderType": descriptor.lms.format if descriptor.lms.format is not None else 'Not Graded',
                 "location": location,
                 "id": 99   # just an arbitrary value to
                 }
@@ -224,23 +225,41 @@ class CourseGradingModel(object):
 
         descriptor = get_modulestore(location).get_item(location)
         if 'graderType' in jsondict and jsondict['graderType'] != u"Not Graded":
-            descriptor.metadata['format'] = jsondict.get('graderType')
-            descriptor.metadata['graded'] = True
+            descriptor.lms.format = jsondict.get('graderType')
+            descriptor.lms.graded = True
         else:
-            if 'format' in descriptor.metadata: del descriptor.metadata['format'] 
-            if 'graded' in descriptor.metadata: del descriptor.metadata['graded'] 
+            del descriptor.lms.format
+            del descriptor.lms.graded
 
-        get_modulestore(location).update_metadata(location, descriptor.metadata)
+        get_modulestore(location).update_metadata(location, descriptor._model_data._kvs._metadata)
 
 
     @staticmethod
     def convert_set_grace_period(descriptor):
-        # 5 hours 59 minutes 59 seconds => { hours: 5, minutes : 59, seconds : 59}
-        rawgrace = descriptor.metadata.get('graceperiod', None)
+        # 5 hours 59 minutes 59 seconds => converted to iso format
+        rawgrace = descriptor.lms.graceperiod
         if rawgrace:
-            parsedgrace = {str(key): int(val) for (val, key) in re.findall('\s*(\d+)\s*(\w+)', rawgrace)}
-            return parsedgrace
-        else: return None
+            hours_from_days = rawgrace.days*24
+            seconds = rawgrace.seconds
+            hours_from_seconds = int(seconds / 3600)
+            hours = hours_from_days + hours_from_seconds
+            seconds -= hours_from_seconds * 3600
+            minutes = int(seconds / 60)
+            seconds -= minutes * 60
+
+            graceperiod = {'hours': 0, 'minutes': 0, 'seconds': 0}
+            if hours > 0:
+                graceperiod['hours'] = hours
+
+            if minutes > 0:
+                graceperiod['minutes'] = minutes
+
+            if seconds > 0:
+                graceperiod['seconds'] = seconds
+
+            return graceperiod
+        else:
+            return None
 
     @staticmethod
     def parse_grader(json_grader):
diff --git a/cms/djangoapps/models/settings/course_metadata.py b/cms/djangoapps/models/settings/course_metadata.py
index d088d75665..ed11a6d7a4 100644
--- a/cms/djangoapps/models/settings/course_metadata.py
+++ b/cms/djangoapps/models/settings/course_metadata.py
@@ -1,6 +1,8 @@
 from xmodule.modulestore import Location
 from contentstore.utils import get_modulestore
 from xmodule.x_module import XModuleDescriptor
+from xmodule.modulestore.inheritance import own_metadata
+from xblock.core import Scope
 
 
 class CourseMetadata(object):
@@ -8,9 +10,8 @@ class CourseMetadata(object):
     For CRUD operations on metadata fields which do not have specific editors on the other pages including any user generated ones.
     The objects have no predefined attrs but instead are obj encodings of the editable metadata.
     '''
-    # __new_advanced_key__ is used by client not server; so, could argue against it being here
-    FILTERED_LIST = XModuleDescriptor.system_metadata_fields + ['start', 'end', 'enrollment_start', 'enrollment_end', 'tabs', 'graceperiod', '__new_advanced_key__']
-    
+    FILTERED_LIST = XModuleDescriptor.system_metadata_fields + ['start', 'end', 'enrollment_start', 'enrollment_end', 'tabs', 'graceperiod']
+
     @classmethod
     def fetch(cls, course_location):
         """
@@ -18,53 +19,63 @@ class CourseMetadata(object):
         """
         if not isinstance(course_location, Location):
             course_location = Location(course_location)
-            
+
         course = {}
-        
+
         descriptor = get_modulestore(course_location).get_item(course_location)
-        
-        for k, v in descriptor.metadata.iteritems():
-            if k not in cls.FILTERED_LIST:
-                course[k] = v
-                
+
+        for field in descriptor.fields + descriptor.lms.fields:
+            if field.scope != Scope.settings:
+                continue
+
+            if field.name not in cls.FILTERED_LIST:
+                course[field.name] = field.read_from(descriptor)
+
         return course
-        
+
     @classmethod
     def update_from_json(cls, course_location, jsondict):
         """
         Decode the json into CourseMetadata and save any changed attrs to the db.
-        
+
         Ensures none of the fields are in the blacklist.
         """
         descriptor = get_modulestore(course_location).get_item(course_location)
-        
+
         dirty = False
 
         for k, v in jsondict.iteritems():
             # should it be an error if one of the filtered list items is in the payload?
-            if k not in cls.FILTERED_LIST and (k not in descriptor.metadata or descriptor.metadata[k] != v):
+            if k in cls.FILTERED_LIST:
+                continue
+
+            if hasattr(descriptor, k) and getattr(descriptor, k) != v:
                 dirty = True
-                descriptor.metadata[k] = v
-            
+                setattr(descriptor, k, v)
+            elif hasattr(descriptor.lms, k) and getattr(descriptor.lms, k) != k:
+                dirty = True
+                setattr(descriptor.lms, k, v)
+
         if dirty:
-            get_modulestore(course_location).update_metadata(course_location, descriptor.metadata)
-            
+            get_modulestore(course_location).update_metadata(course_location, own_metadata(descriptor))
+
         # Could just generate and return a course obj w/o doing any db reads, but I put the reads in as a means to confirm
         # it persisted correctly
         return cls.fetch(course_location)
-    
+
     @classmethod
     def delete_key(cls, course_location, payload):
         '''
         Remove the given metadata key(s) from the course. payload can be a single key or [key..]
         '''
         descriptor = get_modulestore(course_location).get_item(course_location)
-        
+
         for key in payload['deleteKeys']:
-            if key in descriptor.metadata:
-                del descriptor.metadata[key]
-    
-        get_modulestore(course_location).update_metadata(course_location, descriptor.metadata)
-        
+            if hasattr(descriptor, key):
+                delattr(descriptor, key)
+            elif hasattr(descriptor.lms, key):
+                delattr(descriptor.lms, key)
+
+        get_modulestore(course_location).update_metadata(course_location, own_metadata(descriptor))
+
         return cls.fetch(course_location)
-        
\ No newline at end of file
diff --git a/cms/envs/dev.py b/cms/envs/dev.py
index 9164c02e3f..f70f22512e 100644
--- a/cms/envs/dev.py
+++ b/cms/envs/dev.py
@@ -96,6 +96,13 @@ CACHES = {
         'KEY_PREFIX': 'general',
         'VERSION': 4,
         'KEY_FUNCTION': 'util.memcache.safe_key',
+    },
+
+    'mongo_metadata_inheritance': {
+        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+        'LOCATION': '/var/tmp/mongo_metadata_inheritance',
+        'TIMEOUT': 300,
+        'KEY_FUNCTION': 'util.memcache.safe_key',
     }
 }
 
diff --git a/cms/envs/test.py b/cms/envs/test.py
index abe03edd41..d7992cb471 100644
--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -98,6 +98,13 @@ CACHES = {
         'KEY_PREFIX': 'general',
         'VERSION': 4,
         'KEY_FUNCTION': 'util.memcache.safe_key',
+    },
+
+    'mongo_metadata_inheritance': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        'LOCATION': '/var/tmp/mongo_metadata_inheritance',
+        'TIMEOUT': 300,
+        'KEY_FUNCTION': 'util.memcache.safe_key',
     }
 }
 
diff --git a/cms/one_time_startup.py b/cms/one_time_startup.py
index 93428a3404..38a2fef847 100644
--- a/cms/one_time_startup.py
+++ b/cms/one_time_startup.py
@@ -1,5 +1,13 @@
 from dogapi import dog_http_api, dog_stats_api
 from django.conf import settings
+from xmodule.modulestore.django import modulestore
+
+from django.core.cache import get_cache, InvalidCacheBackendError
+
+cache = get_cache('mongo_metadata_inheritance')
+for store_name in settings.MODULESTORE:
+    store = modulestore(store_name)
+    store.metadata_inheritance_cache = cache
 
 if hasattr(settings, 'DATADOG_API'):
     dog_http_api.api_key = settings.DATADOG_API
diff --git a/cms/static/client_templates/advanced_entry.html b/cms/static/client_templates/advanced_entry.html
index 0312fdd344..6be22e2116 100644
--- a/cms/static/client_templates/advanced_entry.html
+++ b/cms/static/client_templates/advanced_entry.html
@@ -1,16 +1,11 @@
 <li class="field-group course-advanced-policy-list-item">
-	<div class="field text key" id="<%= (_.isEmpty(key) ? '__new_advanced_key__' : key) %>">
+	<div class="field is-not-editable text key" id="<%= key %>">
 		<label for="<%= keyUniqueId %>">Policy Key:</label>
-		<input type="text" class="short policy-key" id="<%= keyUniqueId %>" value="<%= key %>" />
-		<span class="tip tip-stacked">Keys are case	sensitive and cannot contain spaces or start with a number</span>
+		<input readonly title="This field is disabled: policy keys cannot be edited." type="text" class="short policy-key" id="<%= keyUniqueId %>" value="<%= key %>" />
   </div>
   
   <div class="field text value">
     <label for="<%= valueUniqueId %>">Policy Value:</label>
     <textarea class="json text" id="<%= valueUniqueId %>"><%= value %></textarea>
   </div>
-	
-	<div class="actions">
-		<a href="#" class="button delete-button standard remove-item remove-grading-data"><span class="delete-icon"></span>Delete</a>
-	</div>
 </li>
\ No newline at end of file
diff --git a/cms/static/js/models/settings/advanced.js b/cms/static/js/models/settings/advanced.js
index 5741eb88dd..adc259239d 100644
--- a/cms/static/js/models/settings/advanced.js
+++ b/cms/static/js/models/settings/advanced.js
@@ -1,27 +1,15 @@
 if (!CMS.Models['Settings']) CMS.Models.Settings = {};
 
 CMS.Models.Settings.Advanced = Backbone.Model.extend({
-    // the key for a newly added policy-- before the user has entered a key value
-    new_key : "__new_advanced_key__",
 
     defaults: {
         // the properties are whatever the user types in (in addition to whatever comes originally from the server)
     },
     // which keys to send as the deleted keys on next save
     deleteKeys : [],
-    blacklistKeys : [], // an array which the controller should populate directly for now [static not instance based]
 
     validate: function (attrs) {
-        var errors = {};
-        for (var key in attrs) {
-            if (key === this.new_key || _.isEmpty(key)) {
-                errors[key] = "A key must be entered.";
-            }
-            else if (_.contains(this.blacklistKeys, key)) {
-                errors[key] = key + " is a reserved keyword or can be edited on another screen";
-            }
-        }
-        if (!_.isEmpty(errors)) return errors;
+        // Keys can no longer be edited. We are currently not validating values.
     },
     
     save : function (attrs, options) {
diff --git a/cms/static/js/template_loader.js b/cms/static/js/template_loader.js
index 3492ca677a..f64c685364 100644
--- a/cms/static/js/template_loader.js
+++ b/cms/static/js/template_loader.js
@@ -5,7 +5,7 @@
 	if (typeof window.templateLoader == 'function') return;
 	
     var templateLoader = {
-      templateVersion: "0.0.15",
+      templateVersion: "0.0.16",
       templates: {},
       loadRemoteTemplate: function(templateName, filename, callback) {
         if (!this.templates[templateName]) {
diff --git a/cms/static/js/views/settings/advanced_view.js b/cms/static/js/views/settings/advanced_view.js
index a933bbdb9b..e3ff098efb 100644
--- a/cms/static/js/views/settings/advanced_view.js
+++ b/cms/static/js/views/settings/advanced_view.js
@@ -6,14 +6,6 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
 
     // Model class is CMS.Models.Settings.Advanced
     events : {
-        'click .delete-button' : "deleteEntry",
-        'click .new-button' : "addEntry",
-        // update model on changes
-        'change .policy-key' : "updateKey",
-        // keypress to catch alpha keys and backspace/delete on some browsers
-        'keypress .policy-key' : "showSaveCancelButtons",
-        // keyup to catch backspace/delete reliably
-        'keyup .policy-key' : "showSaveCancelButtons",
         'focus :input' : "focusInput",
         'blur :input' : "blurInput"
         // TODO enable/disable save based on validation (currently enabled whenever there are changes)
@@ -95,16 +87,11 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
                             mirror.setValue(stringValue);
                         } catch(quotedE) {
                             // TODO: validation error
-                            console.log("Error with JSON, even after converting to String.");
-                            console.log(quotedE);
+                            // console.log("Error with JSON, even after converting to String.");
+                            // console.log(quotedE);
                             JSONValue = undefined;
                         }
                     }
-                    else {
-                        // TODO: validation error
-                        console.log("Error with JSON, but will not convert to String.");
-                        console.log(e);
-                    }
                 }
                 if (JSONValue !== undefined) {
                     self.clearValidationErrors();
@@ -113,7 +100,6 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
             }
         });
     },
-
     showMessage: function (type) {
         this.$el.find(".message-status").removeClass("is-shown");
         if (type) {
@@ -128,56 +114,19 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
         else {
             // This is the case of the page first rendering, or when Cancel is pressed.
             this.hideSaveCancelButtons();
-            this.toggleNewButton(true);
         }
     },
-
     showSaveCancelButtons: function(event) {
         if (!this.buttonsVisible) {
-            if (event && (event.type === 'keypress' || event.type === 'keyup')) {
-                // check whether it's really an altering event: note, String.fromCharCode(keyCode) will 
-                // give positive values for control/command/option-letter combos; so, don't use it
-                if (!((event.charCode && String.fromCharCode(event.charCode) !== "") ||
-                        // 8 = backspace, 46 = delete
-                        event.keyCode === 8 || event.keyCode === 46)) return;
-            }
             this.$el.find(".message-status").removeClass("is-shown");
             $('.wrapper-notification').addClass('is-shown');
             this.buttonsVisible = true;
         }
     },
-
     hideSaveCancelButtons: function() {
         $('.wrapper-notification').removeClass('is-shown');
         this.buttonsVisible = false;
     },
-
-    toggleNewButton: function (enable) {
-        var newButton = this.$el.find(".new-button");
-        if (enable) {
-            newButton.removeClass('disabled');
-        }
-        else {
-            newButton.addClass('disabled');
-        }
-    },
-
-    deleteEntry : function(event) {
-        event.preventDefault();
-        // find out which entry
-        var li$ = $(event.currentTarget).closest('li');
-        // Not data b/c the validation view uses it for a selector
-        var key = $('.key', li$).attr('id');
-
-        delete this.selectorToField[this.fieldToSelectorMap[key]];
-        delete this.fieldToSelectorMap[key];
-        if (key !== this.model.new_key) {
-            this.model.deleteKeys.push(key);
-            this.model.unset(key);
-        }
-        li$.remove();
-        this.showSaveCancelButtons();
-    },
     saveView : function(event) {
         // TODO one last verification scan:
         //    call validateKey on each to ensure proper format
@@ -201,102 +150,15 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
             error : CMS.ServerError
         });
     },
-    addEntry : function() {
-        var listEle$ = this.$el.find('.course-advanced-policy-list');
-        var newEle = this.renderTemplate("", "");
-        listEle$.append(newEle);
-        // need to re-find b/c replaceWith seems to copy rather than use the specific ele instance
-        var policyValueDivs = this.$el.find('#' + this.model.new_key).closest('li').find('.json');
-        // only 1 but hey, let's take advantage of the context mechanism
-        _.each(policyValueDivs, this.attachJSONEditor, this);
-        this.toggleNewButton(false);
-    },
-    updateKey : function(event) {
-        var parentElement = $(event.currentTarget).closest('.key');
-        // old key: either the key as in the model or new_key.
-        // That is, it doesn't change as the val changes until val is accepted.
-        var oldKey = parentElement.attr('id');
-        // TODO: validation of keys with spaces. For now at least trim strings to remove initial and
-        // trailing whitespace
-        var newKey = $.trim($(event.currentTarget).val());
-        if (oldKey !== newKey) {
-            // TODO: is it OK to erase other validation messages?
-            this.clearValidationErrors();
-
-            if (!this.validateKey(oldKey, newKey)) return;
-
-            if (this.model.has(newKey)) {
-                var error = {};
-                error[oldKey] = 'You have already defined "' + newKey + '" in the manual policy definitions.';
-                error[newKey] = "You tried to enter a duplicate of this key.";
-                this.model.trigger("invalid", this.model, error);
-                return false;
-            }
-
-            // explicitly call validate to determine whether to proceed (relying on triggered error means putting continuation in the success
-            // method which is uglier I think?)
-            var newEntryModel = {};
-            // set the new key's value to the old one's
-            newEntryModel[newKey] = (oldKey === this.model.new_key ? '' : this.model.get(oldKey));
-
-            var validation = this.model.validate(newEntryModel);
-            if (validation) {
-                if (_.has(validation, newKey)) {
-                    // swap to the key which the map knows about
-                    validation[oldKey] = validation[newKey];
-                }
-                this.model.trigger("invalid", this.model, validation);
-                // abandon update
-                return;
-            }
-
-            // Now safe to actually do the update
-            this.model.set(newEntryModel);
-
-            // update maps
-            var selector = this.fieldToSelectorMap[oldKey];
-            this.selectorToField[selector] = newKey;
-            this.fieldToSelectorMap[newKey] = selector;
-            delete this.fieldToSelectorMap[oldKey];
-
-            if (oldKey !== this.model.new_key) {
-                // mark the old key for deletion and delete from field maps
-                this.model.deleteKeys.push(oldKey);
-                this.model.unset(oldKey) ;
-            }
-            else {
-                // id for the new entry will now be the key value. Enable new entry button.
-                this.toggleNewButton(true);
-            }
-            
-            // check for newkey being the name of one which was previously deleted in this session
-            var wasDeleting = this.model.deleteKeys.indexOf(newKey);
-            if (wasDeleting >= 0) {
-                this.model.deleteKeys.splice(wasDeleting, 1);
-            }
-
-            // Update the ID to the new value.
-            parentElement.attr('id', newKey);
-            
-        }
-    },
-    validateKey : function(oldKey, newKey) {
-        // model validation can't handle malformed keys nor notice if 2 fields have same key; so, need to add that chk here
-        // TODO ensure there's no spaces or illegal chars (note some checking for spaces currently done in model's
-        // validate method.
-        return true;
-    },
-
     renderTemplate: function (key, value) {
         var newKeyId = _.uniqueId('policy_key_'),
         newEle = this.template({ key : key, value : JSON.stringify(value, null, 4),
             keyUniqueId: newKeyId, valueUniqueId: _.uniqueId('policy_value_')});
         
-        this.fieldToSelectorMap[(_.isEmpty(key) ? this.model.new_key : key)] = newKeyId;
-        this.selectorToField[newKeyId] = (_.isEmpty(key) ? this.model.new_key : key);
+        this.fieldToSelectorMap[key] = newKeyId;
+        this.selectorToField[newKeyId] = key;
         return newEle;
     },
-    
     focusInput : function(event) {
         $(event.target).prev().addClass("is-focused");
     },
diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 5d4bc7c773..a2d46c0510 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -405,6 +405,21 @@ textarea.text {
     @include linear-gradient($paleYellow, tint($paleYellow, 90%));
     outline: 0;
   }
+
+  &[disabled] {
+    border-color: $gray-l4;
+    color: $gray-l2;
+  }
+
+  &[readonly] {
+    border-color: $gray-l4;
+    color: $gray-l1;
+
+    &:focus {
+      @include linear-gradient($lightGrey, tint($lightGrey, 90%));
+      outline: 0;
+    }
+  }
 }
 
 // forms - specific
diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss
index d8011dd651..a42ff80bc2 100644
--- a/cms/static/sass/_settings.scss
+++ b/cms/static/sass/_settings.scss
@@ -239,13 +239,9 @@ body.course.settings {
 
     // not editable fields
     .field.is-not-editable {
-
-      label, .label {
-        color: $gray-l3;
-      }
-
-      input {
-        opacity: 0.25;
+     
+      & label.is-focused {
+       color: $gray-d2;
       }
     }
 
diff --git a/cms/templates/base.html b/cms/templates/base.html
index 498897bd11..f7b2c46f61 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -6,10 +6,10 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>
-        <%block name="title"></%block> | 
+        <%block name="title"></%block> |
         % if context_course:
         <% ctx_loc = context_course.location %>
-        ${context_course.display_name} | 
+        ${context_course.display_name_with_default} |
         % endif
         edX Studio
     </title>
@@ -22,7 +22,7 @@
     <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/markitup/sets/wiki/style.css')}" />
     <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/symbolset.ss-symbolicons-block.css')}" />
     <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/symbolset.ss-standard.css')}" />
-   
+
     <%block name="header_extras"></%block>
   </head>
 
diff --git a/cms/templates/course_index.html b/cms/templates/course_index.html
deleted file mode 100644
index 5c8772c1ed..0000000000
--- a/cms/templates/course_index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<%inherit file="base.html" />
-
-<%include file="widgets/header.html"/>
-
-<%block name="content">
-<section class="main-container">
-
-  <%include file="widgets/navigation.html"/>
-
-  <section class="main-content">
-  </section>
-
-</section>
-</%block>
diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html
index 43775122d4..42ddc39be1 100644
--- a/cms/templates/edit_subsection.html
+++ b/cms/templates/edit_subsection.html
@@ -22,7 +22,7 @@
       <article class="subsection-body window" data-id="${subsection.location}">
         <div class="subsection-name-input">
           <label>Display Name:</label>
-          <input type="text" value="${subsection.display_name | h}" class="subsection-display-name-input" data-metadata-name="display_name"/>
+          <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>
@@ -40,7 +40,7 @@
              <a href="#" class="save-button">Save</a>
              <a href="#" class="cancel-button">Cancel</a>
              <a href="#" class="delete-icon remove-policy-data"></a>
-           </li>       
+           </li>
     </div>
 
     <div class="sidebar">
@@ -51,28 +51,28 @@
         <label>Release date:<!-- <span class="description">Determines when this subsection and the units within it will be released publicly.</span>--></label>
         <div class="datepair" data-language="javascript">
             <%
-                start_date = datetime.fromtimestamp(mktime(subsection.start)) if subsection.start is not None else None
-                parent_start_date = datetime.fromtimestamp(mktime(parent_item.start)) if parent_item.start is not None else None
+                start_date = datetime.fromtimestamp(mktime(subsection.lms.start)) if subsection.lms.start is not None else None
+                parent_start_date = datetime.fromtimestamp(mktime(parent_item.lms.start)) if parent_item.lms.start is not None else None
             %>
           <input type="text" id="start_date" name="start_date" value="${start_date.strftime('%m/%d/%Y') if start_date is not None else ''}" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
-          <input type="text" id="start_time" name="start_time" value="${start_date.strftime('%H:%M') if start_date is not None else ''}" placeholder="HH:MM" class="time" size='10' autocomplete="off"/> 
+          <input type="text" id="start_time" name="start_time" value="${start_date.strftime('%H:%M') if start_date is not None else ''}" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
         </div>
-        % if subsection.start != parent_item.start and subsection.start:
+        % if subsection.lms.start != parent_item.lms.start and subsection.lms.start:
             % if parent_start_date is None:
-            <p class="notice">The date above differs from the release date of ${parent_item.display_name}, which is unset.
+            <p class="notice">The date above differs from the release date of ${parent_item.display_name_with_default}, which is unset.
             % else:
-            <p class="notice">The date above differs from the release date of ${parent_item.display_name} – ${parent_start_date.strftime('%m/%d/%Y')} at ${parent_start_date.strftime('%H:%M')}.
+            <p class="notice">The date above differs from the release date of ${parent_item.display_name_with_default} – ${parent_start_date.strftime('%m/%d/%Y')} at ${parent_start_date.strftime('%H:%M')}.
             % endif
-            <a href="#" class="sync-date no-spinner">Sync to ${parent_item.display_name}.</a></p>
+            <a href="#" class="sync-date no-spinner">Sync to ${parent_item.display_name_with_default}.</a></p>
         % endif
       </div>
-    
+
     <div class="row gradable">
       <label>Graded as:</label>
-      
-    <div class="gradable-status" data-initial-status="${subsection.metadata.get('format', 'Not Graded')}">
+
+    <div class="gradable-status" data-initial-status="${subsection.lms.format if subsection.lms.format is not None else 'Not Graded'}">
     </div>
-    
+
     <div class="due-date-input row">
       <label>Due date:</label>
       <a href="#" class="set-date">Set a due date</a>
@@ -80,9 +80,9 @@
         <p class="date-description">
           <%
               # due date uses it own formatting for stringifying the date. As with capa_module.py, there's a utility module available for us to use
-             due_date = dateutil.parser.parse(subsection.metadata.get('due')) if 'due' in subsection.metadata else None
+             due_date = dateutil.parser.parse(subsection.lms.due) if subsection.lms.due else None
           %>
-          <input type="text" id="due_date" name="due_date" value="${due_date.strftime('%m/%d/%Y') if due_date is not None else ''}" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/> 
+          <input type="text" id="due_date" name="due_date" value="${due_date.strftime('%m/%d/%Y') if due_date is not None else ''}" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
           <input type="text" id="due_time" name="due_time" value="${due_date.strftime('%H:%M') if due_date is not None else ''}" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
           <a href="#" class="remove-date">Remove due date</a>
         </p>
@@ -110,7 +110,7 @@
   <script type="text/javascript" src="${static.url('js/views/grader-select-view.js')}"></script>
   <script type="text/javascript" src="${static.url('js/models/settings/course_grading_policy.js')}"></script>
   <script type="text/javascript" src="${static.url('js/views/overview.js')}"></script>
-  
+
 
 <script type="text/javascript">
     $(document).ready(function() {
@@ -128,7 +128,7 @@
 	        window.graderTypes.course_location = new CMS.Models.Location('${parent_location}');
 	        window.graderTypes.reset(${course_graders|n});
 	    }
-	    
+
 	    $(".gradable-status").each(function(index, ele) {
 	        var gradeView = new CMS.Views.OverviewAssignmentGrader({
 	            el : ele,
diff --git a/cms/templates/import.html b/cms/templates/import.html
index d83411fb9a..add31597cd 100644
--- a/cms/templates/import.html
+++ b/cms/templates/import.html
@@ -21,14 +21,14 @@
       <div class="description">
         <p><strong>Importing a new course will delete all content currently associated with your course
         and replace it with the contents of the uploaded file.</strong></p>
-        <p>File uploads must be gzipped tar files (.tar.gz or .tgz) containing, at a minimum, a <code>course.xml</code> file.</p>
+        <p>File uploads must be gzipped tar files (.tar.gz) containing, at a minimum, a <code>course.xml</code> file.</p>
         <p>Please note that if your course has any problems with auto-generated <code>url_name</code> nodes,
         re-importing your course could cause the loss of student data associated with those problems.</p>
       </div>
       <form action="${reverse('import_course', kwargs=dict(org=context_course.location.org, course=context_course.location.course, name=context_course.location.name))}" method="post" enctype="multipart/form-data" class="import-form">
         <h2>Course to import:</h2>
         <p class="error-block"></p>
-        <a href="#" class="choose-file-button">Choose File</a>        
+        <a href="#" class="choose-file-button">Choose File</a>
         <p class="file-name-block"><span class="file-name"></span><a href="#" class="choose-file-button-inline">change</a></p>
         <input type="file" name="course-data" class="file-input">
         <input type="submit" value="Replace my course with the one above" class="submit-button">
@@ -45,13 +45,13 @@
 <%block name="jsextra">
 <script>
 (function() {
-    
+
 var bar = $('.progress-bar');
 var fill = $('.progress-fill');
 var percent = $('.percent');
 var status = $('#status');
 var submitBtn = $('.submit-button');
-   
+
 $('form').ajaxForm({
     beforeSend: function() {
         status.empty();
@@ -76,7 +76,7 @@ $('form').ajaxForm({
         submitBtn.show();
         bar.hide();
     }
-  }); 
-})();       
+  });
+})();
 </script>
 </%block>
\ No newline at end of file
diff --git a/cms/templates/new_item.html b/cms/templates/new_item.html
index 60da39fd2a..45cb157845 100644
--- a/cms/templates/new_item.html
+++ b/cms/templates/new_item.html
@@ -8,7 +8,7 @@
       <div>${module_type}</div>
       <div>
         % for template in module_templates:
-        <a class="save" data-template-id="${template.location.url()}">${template.display_name}</a>
+        <a class="save" data-template-id="${template.location.url()}">${template.display_name_with_default}</a>
         % endfor
       </div>
     </div>
diff --git a/cms/templates/overview.html b/cms/templates/overview.html
index 1098a6885e..904f654717 100644
--- a/cms/templates/overview.html
+++ b/cms/templates/overview.html
@@ -32,7 +32,7 @@
 	    window.graderTypes.course_location = new CMS.Models.Location('${parent_location}');
 	    window.graderTypes.reset(${course_graders|n});
     }
-    
+
     $(".gradable-status").each(function(index, ele) {
         var gradeView = new CMS.Views.OverviewAssignmentGrader({
             el : ele,
@@ -40,7 +40,7 @@
         });
     });
   });
-  
+
   </script>
 </%block>
 
@@ -146,7 +146,7 @@
 
   <div class="main-wrapper">
     <div class="inner-wrapper">
-      <article class="courseware-overview" data-course-id="${context_course.location.url()}">        
+      <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>
@@ -154,16 +154,16 @@
 
             <div class="item-details" data-id="${section.location}">
               <h3 class="section-name">
-                <span data-tooltip="Edit this section's name" class="section-name-span">${section.display_name}</span>
+                <span data-tooltip="Edit this section's name" class="section-name-span">${section.display_name_with_default}</span>
                 <form class="section-name-edit" style="display:none">
-                  <input type="text" value="${section.display_name | h}" class="edit-section-name" autocomplete="off"/>
+                  <input type="text" value="${section.display_name_with_default | h}" class="edit-section-name" autocomplete="off"/>
                   <input type="submit" class="save-button edit-section-name-save" value="Save" />
                   <input type="button" class="cancel-button edit-section-name-cancel" value="Cancel" />
                 </form>
               </h3>
               <div class="section-published-date">
                 <%
-                  start_date = datetime.fromtimestamp(mktime(section.start)) if section.start is not None else None
+                  start_date = datetime.fromtimestamp(mktime(section.lms.start)) if section.lms.start is not None else None
                   start_date_str = start_date.strftime('%m/%d/%Y') if start_date is not None else ''
                   start_time_str = start_date.strftime('%H:%M') if start_date is not None else ''
                 %>
@@ -174,9 +174,9 @@
                   <span class="published-status"><strong>Will Release:</strong> ${start_date_str} at ${start_time_str}</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>
-            
+
             <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>
@@ -196,15 +196,15 @@
                     <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}</span></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.metadata.get('format', 'Not Graded')}">
+
+                  <div class="gradable-status" data-initial-status="${subsection.lms.format if section.lms.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>                    
+                    <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>
diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index 39e9b70f9d..b26a17125b 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -70,17 +70,17 @@ from contentstore import utils
           <ol class="list-input">
             <li class="field text is-not-editable" id="field-course-organization">
               <label for="course-organization">Organization</label>
-              <input type="text" class="long" id="course-organization" value="[Course Organization]" disabled="disabled" />
+              <input title="This field is disabled: this information cannot be changed." type="text" class="long" id="course-organization" value="[Course Organization]" readonly />
             </li>
 
             <li class="field text is-not-editable" id="field-course-number">
               <label for="course-number">Course Number</label>
-              <input type="text" class="short" id="course-number" value="[Course No.]" disabled="disabled">
+              <input title="This field is disabled: this information cannot be changed." type="text" class="short" id="course-number" value="[Course No.]" readonly>
             </li>
 
             <li class="field text is-not-editable" id="field-course-name">
               <label for="course-name">Course Name</label>
-              <input type="text" class="long" id="course-name" value="[Course Name]" disabled="disabled" />
+              <input title="This field is disabled: this information cannot be changed." type="text" class="long" id="course-name" value="[Course Name]" readonly />
             </li>
           </ol>
           <span class="tip tip-stacked">These are used in <a rel="external" href="${utils.get_lms_link_for_about_page(course_location)}" />your course URL</a>, and cannot be changed</span>
diff --git a/cms/templates/settings_advanced.html b/cms/templates/settings_advanced.html
index ceee406398..838af5ada9 100644
--- a/cms/templates/settings_advanced.html
+++ b/cms/templates/settings_advanced.html
@@ -21,7 +21,6 @@ $(document).ready(function () {
 
     // proactively populate advanced b/c it has the filtered list and doesn't really follow the model pattern
     var advancedModel = new CMS.Models.Settings.Advanced(${advanced_dict | n}, {parse: true});
-    advancedModel.blacklistKeys = ${advanced_blacklist | n};
     advancedModel.url = "${reverse('course_advanced_settings_updates', kwargs=dict(org=context_course.location.org, course=context_course.location.course, name=context_course.location.name))}";
 
     var editor = new CMS.Views.Settings.Advanced({
@@ -61,18 +60,11 @@ editor.render();
             <span class="tip">Manually Edit Course Policy Values (JSON Key / Value pairs)</span>
           </header>
 
-          <p class="instructions"><strong>Warning</strong>: Add only manual policy data that you are familiar
-          with.</p>
+          <p class="instructions"><strong>Warning</strong>: Do not modify these policies unless you are familiar with their purpose.</p>
 
           <ul class="list-input course-advanced-policy-list enum">
               
           </ul>
-
-          <div class="actions">
-            <a href="#" class="button new-button new-advanced-policy-item add-policy-data">
-              <span class="plus-icon white"></span>New Manual Policy
-            </a>            
-          </div>
         </section>
       </form>
     </article>
@@ -80,9 +72,9 @@ editor.render();
     <aside class="content-supplementary" role="complimentary">
       <div class="bit">
         <h3 class="title-3">How will these settings be used?</h3>
-        <p>Manual policies are JSON-based key and value pairs that allow you add additional settings which edX Studio will use when generating your course.</p>
+        <p>Manual policies are JSON-based key and value pairs that give you control over specific course settings that edX Studio will use when displaying and running your course.</p>
 
-        <p>Any policies you define here will override any other information you've defined elsewhere in Studio. With this in mind, please be very careful and do not add policies that you are unfamiliar with (both their purpose and their syntax).</p>
+        <p>Any policies you modify here will override any other information you've defined elsewhere in Studio. With this in mind, please be very careful and do not edit policies that you are unfamiliar with (both their purpose and their syntax).</p>
       </div>
 
       <div class="bit">
@@ -110,7 +102,7 @@ editor.render();
       <i class="ss-icon ss-symbolicons-block icon icon-warning">&#x26A0;</i>
 
       <p><strong>Note: </strong>Your changes will not take effect until you <strong>save your
-      progress</strong>. Take care with key and value formatting, as validation is <strong>not implemented</strong>.</p>
+      progress</strong>. Take care with policy value formatting, as validation is <strong>not implemented</strong>.</p>
     </div>
 
     <div class="actions">
diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index 5cd872ce98..6b37bc2cea 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -44,12 +44,12 @@
       </div>
       <div class="main-column">
         <article class="unit-body window">
-          <p class="unit-name-input"><label>Display Name:</label><input type="text" value="${unit.display_name | h}" class="unit-display-name-input" /></p>
+          <p class="unit-name-input"><label>Display Name:</label><input type="text" value="${unit.display_name_with_default | h}" class="unit-display-name-input" /></p>
           <ol class="components">
             % for id in components:
             <li class="component" data-id="${id}"/>
             % endfor
-            <li class="new-component-item adding">              
+            <li class="new-component-item adding">
               <div class="new-component">
                 <h5>Add New Component</h5>
                 <ul class="new-component-type">
@@ -86,7 +86,7 @@
                                           <span class="name"> ${name}</span>
                                         </a>
                                       </li>
-                                    
+
                                     % else:
                                       <li class="editor-md">
                                         <a href="#" data-location="${location}">
@@ -95,7 +95,7 @@
                                       </li>
                                     % endif
                                 % endif
-                    
+
                               %endfor
                           </ul>
                         </div>
@@ -103,20 +103,20 @@
                             <div class="tab" id="tab2">
                               <ul class="new-component-template">
                                   % for name, location, has_markdown, is_empty in templates:
-                                    % if not has_markdown:  
+                                    % if not has_markdown:
                                         % if is_empty:
                                           <li class="editor-manual empty">
                                             <a href="#" data-location="${location}">
                                               <span class="name">${name}</span>
                                             </a>
                                           </li>
-                                        
+
                                         % else:
                                           <li class="editor-manual">
                                             <a href="#" data-location="${location}">
                                               <span class="name"> ${name}</span>
                                             </a>
-                                        
+
                                           </li>
                                         % endif
                                     % endif
@@ -147,13 +147,13 @@
             <div class="row published-alert">
               <p class="edit-draft-message">This unit has been published. To make changes, you must <a href="#" class="create-draft">edit a draft</a>.</p>
               <p class="publish-draft-message">This is a draft of the published unit. To update the live version, you must <a href="#" class="publish-draft">replace it with this draft</a>.</p>
-            </div>            
+            </div>
             <div class="row status">
-              <p>This unit is scheduled to be released to <strong>students</strong> 
+              <p>This unit is scheduled to be released to <strong>students</strong>
               % if release_date is not None:
                   on <strong>${release_date}</strong>
-              % endif 
-              with the subsection <a href="${reverse('edit_subsection', kwargs={'location': subsection.location})}">"${subsection.display_name}"</a></p>
+              % endif
+              with the subsection <a href="${reverse('edit_subsection', kwargs={'location': subsection.location})}">"${subsection.display_name_with_default}"</a></p>
             </div>
             <div class="row unit-actions">
               <a href="#" class="delete-draft delete-button">Delete Draft</a>
@@ -168,18 +168,18 @@
             <div><input type="text" class="url" value="/courseware/${section.url_name}/${subsection.url_name}" disabled /></div>
             <ol>
               <li>
-                <a href="#" class="section-item">${section.display_name}</a>
+                <a href="#" class="section-item">${section.display_name_with_default}</a>
                 <ol>
                   <li>
                     <a href="${reverse('edit_subsection', args=[subsection.location])}" class="section-item">
                       <span class="folder-icon"></span>
-                      <span class="subsection-name"><span class="subsection-name-value">${subsection.display_name}</span></span>
+                      <span class="subsection-name"><span class="subsection-name-value">${subsection.display_name_with_default}</span></span>
                     </a>
                     ${units.enum_units(subsection, actions=False, selected=unit.location)}
                   </li>
                 </ol>
               </li>
-            </ol>            
+            </ol>
           </div>
         </div>
       </div>
diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html
index a063e4b526..775346c3d4 100644
--- a/cms/templates/widgets/header.html
+++ b/cms/templates/widgets/header.html
@@ -5,24 +5,24 @@
 
     <div class="wrapper wrapper-left ">
       <h1 class="branding"><a href="/">edX Studio</a></h1>
-      
+
       % if context_course:
       <% ctx_loc = context_course.location %>
       <div class="info-course">
         <h2 class="sr">Current Course:</h2>
         <a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">
         <span class="course-org">${ctx_loc.org}</span><span class="course-number">${ctx_loc.course}</span>
-        <span class="course-title" title="${context_course.display_name}">${context_course.display_name}</span>
+        <span class="course-title" title="${context_course.display_name_with_default}">${context_course.display_name_with_default}</span>
         </a>
       </div>
-      
+
       <nav class="nav-course primary nav-dropdown" role="navigation">
-        <h2 class="sr">${context_course.display_name}'s Navigation:</h2>
+        <h2 class="sr">${context_course.display_name_with_default}'s Navigation:</h2>
 
         <ol>
           <li class="nav-item nav-course-courseware">
             <h3 class="title"><span class="label-prefix">Course </span>Content <i class="ss-icon ss-symbolicons-block icon-expand">&#x25BE;</i></h3>
-            
+
             <div class="wrapper wrapper-nav-sub">
               <div class="nav-sub">
                 <ul>
@@ -32,12 +32,12 @@
                   <li class="nav-item nav-course-courseware-uploads"><a href="${reverse('asset_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Files &amp; Uploads</a></li>
                 </ul>
               </div>
-            </div>            
+            </div>
           </li>
 
           <li class="nav-item nav-course-settings">
             <h3 class="title"><span class="label-prefix">Course </span>Settings <i class="ss-icon ss-symbolicons-block icon-expand">&#x25BE;</i></h3>
-            
+
             <div class="wrapper wrapper-nav-sub">
               <div class="nav-sub">
                 <ul>
@@ -47,12 +47,12 @@
                   <li class="nav-item nav-course-settings-advanced"><a href="${reverse('course_advanced_settings', kwargs={'org' : ctx_loc.org, 'course' : ctx_loc.course, 'name': ctx_loc.name})}">Advanced Settings</a></li>
                 </ul>
               </div>
-            </div>            
+            </div>
           </li>
 
           <li class="nav-item nav-course-tools">
             <h3 class="title">Tools <i class="ss-icon ss-symbolicons-block icon-expand">&#x25BE;</i></h3>
-            
+
             <div class="wrapper wrapper-nav-sub">
               <div class="nav-sub">
                 <ul>
@@ -66,16 +66,16 @@
       </nav>
       % endif
     </div>
-    
+
     <div class="wrapper wrapper-right">
-      % if user.is_authenticated():    
+      % if user.is_authenticated():
       <nav class="nav-account nav-is-signedin nav-dropdown">
         <h2 class="sr">Currently logged in as:</h2>
         <ol>
           <li class="nav-item nav-account-username">
             <a href="#" class="title">
               <span class="account-username">
-                <i class="ss-icon ss-symbolicons-standard icon-user">&#x1F464;</i> 
+                <i class="ss-icon ss-symbolicons-standard icon-user">&#x1F464;</i>
                 ${ user.username }
               </span>
               <i class="ss-icon ss-symbolicons-block icon-expand">&#x25BE;</i>
@@ -111,7 +111,7 @@
           </li>
         </ol>
       </nav>
-      % endif      
+      % endif
     </div>
   </header>
-</div>
\ No newline at end of file
+</div>
diff --git a/cms/templates/widgets/metadata-edit.html b/cms/templates/widgets/metadata-edit.html
index 590baec3c9..51fe400f88 100644
--- a/cms/templates/widgets/metadata-edit.html
+++ b/cms/templates/widgets/metadata-edit.html
@@ -1,18 +1,17 @@
-% if metadata:
 <%
   import hashlib
   hlskey = hashlib.md5(module.location.url()).hexdigest()
 %>
 <section class="metadata_edit">
   <ul>
-    % for keyname in editable_metadata_fields:
+    % for field_name, field_value in editable_metadata_fields.items():
     <li>
-        % if keyname=='source_code':
-	    <a href="#hls-modal-${hlskey}" style="color:yellow;" id="hls-trig-${hlskey}" >Edit High Level Source</a>
-        % else:
-            <label>${keyname}:</label>
- 	    <input type='text' data-metadata-name='${keyname}' value='${metadata[keyname]}' size='60' />
-	% endif
+      % if field_name == 'source_code':
+        <a href="#hls-modal-${hlskey}" style="color:yellow;" id="hls-trig-${hlskey}" >Edit High Level Source</a>
+      % else:
+        <label>${field_name}:</label>
+ 	      <input type='text' data-metadata-name='${field_name}' value='${field_value}' size='60' />
+      % endif
     </li>
     % endfor
   </ul>
@@ -22,4 +21,3 @@
   % endif
 
 </section>
-% endif
diff --git a/cms/templates/widgets/navigation.html b/cms/templates/widgets/navigation.html
deleted file mode 100644
index f7e79bceb3..0000000000
--- a/cms/templates/widgets/navigation.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<section class="cal">
-  <header class="wip">
-    <ul class="actions">
-      <li><a href="#">Timeline view</a></li>
-      <li><a href="#">Multi-Module edit</a></li>
-    </ul>
-
-    <ul>
-      <li>
-        <h2>Sort:</h2>
-        <select>
-          <option value="">Linear Order</option>
-          <option value="">Recently Modified</option>
-          <option value="">Type</option>
-          <option value="">Alphabetically</option>
-        </select>
-      </li>
-
-      <li>
-        <h2>Filter:</h2>
-        <select>
-          <option value="">All content</option>
-          <option value="">Videos</option>
-          <option value="">Problems</option>
-          <option value="">Labs</option>
-          <option value="">Tutorials</option>
-          <option value="">HTML</option>
-        </select>
-        <a href="#" class="more">More</a>
-      </li>
-      <li>
-        <a href="#">Hide goals</a>
-      </li>
-      <li class="search">
-        <input type="search" name="" id="" value="" placeholder="Search" />
-      </li>
-    </ul>
-  </header>
-
-  <ol id="weeks">
-    % for week in weeks:
-    <li class="week" data-id="${week.location.url()}">
-      <header>
-        <h1><a href="#" class="week-edit">${week.url_name}</a></h1>
-        <ul>
-          % if 'goals' in week.metadata:
-            % for goal in week.metadata['goals']:
-            <li class="goal editable">${goal}</li>
-            % endfor
-          % else:
-            <li class="goal editable">Please create a learning goal for this week</li>
-          % endif
-        </ul>
-      </header>
-
-      <ul class="modules">
-        % for module in week.get_children():
-        <li class="module"
-            data-id="${module.location.url()}"
-            data-type="${module.js_module_name}"
-            data-preview-type="${module.module_class.js_module_name}">
-
-            <a href="#" class="module-edit">${module.display_name}</a>
-        </li>
-        % endfor
-        <%include file="module-dropdown.html"/>
-      </ul>
-    </li>
-    %endfor
-  </ol>
-
-  <section class="new-section">
-    <a href="#" class="wip" >+ Add New Section</a>
-
-    <section class="hidden">
-      <form>
-        <ul>
-          <li>
-            <input type="text" name="" id="" placeholder="Section title" />
-          </li>
-          <li>
-            <select>
-              <option>Blank</option>
-              <option>6.002x</option>
-              <option>6.00x</option>
-            </select>
-          </li>
-          <li>
-            <input type="submit" value="Save and edit week" class="edit-week" />
-
-            <div>
-              <a href="#" class="close">Save without edit</a>
-              <a href="#" class="close">cancel</a>
-            </div>
-          </li>
-        </ul>
-      </form>
-    </section>
-  </section>
-</section>
-
diff --git a/cms/templates/widgets/sequence-edit.html b/cms/templates/widgets/sequence-edit.html
index e9d796784d..c70f2568fa 100644
--- a/cms/templates/widgets/sequence-edit.html
+++ b/cms/templates/widgets/sequence-edit.html
@@ -40,7 +40,7 @@
               <a href="#" class="module-edit"
                  data-id="${child.location.url()}"
                  data-type="${child.js_module_name}"
-                 data-preview-type="${child.module_class.js_module_name}">${child.display_name}</a>
+                 data-preview-type="${child.module_class.js_module_name}">${child.display_name_with_default}</a>
               <a href="#" class="draggable">handle</a>
             </li>
             %endfor
diff --git a/cms/templates/widgets/units.html b/cms/templates/widgets/units.html
index 8e23b05bf8..5ac05e79eb 100644
--- a/cms/templates/widgets/units.html
+++ b/cms/templates/widgets/units.html
@@ -22,7 +22,7 @@ This def will enumerate through a passed in subsection and list all of the units
     <div class="section-item ${selected_class}">
       <a href="${reverse('edit_unit', args=[unit.location])}" class="${unit_state}-item">
         <span class="${unit.category}-icon"></span>
-        <span class="unit-name">${unit.display_name}</span>
+        <span class="unit-name">${unit.display_name_with_default}</span>
       </a>
       % if actions:
       <div class="item-actions">
@@ -39,7 +39,7 @@ This def will enumerate through a passed in subsection and list all of the units
     </a>
   </li>
 </ol>
-</%def> 
+</%def>
 
 
 
diff --git a/cms/xmodule_namespace.py b/cms/xmodule_namespace.py
new file mode 100644
index 0000000000..391cac8eca
--- /dev/null
+++ b/cms/xmodule_namespace.py
@@ -0,0 +1,30 @@
+import datetime
+
+from xblock.core import Namespace, Boolean, Scope, ModelType, String
+
+
+class StringyBoolean(Boolean):
+    def from_json(self, value):
+        if isinstance(value, basestring):
+            return value.lower() == 'true'
+        return value
+
+class DateTuple(ModelType):
+    """
+    ModelType that stores datetime objects as time tuples
+    """
+    def from_json(self, value):
+        return datetime.datetime(*value[0:6])
+
+    def to_json(self, value):
+        if value is None:
+            return None
+
+        return list(value.timetuple())
+
+
+class CmsNamespace(Namespace):
+    is_draft = Boolean(help="Whether this module is a draft", default=False, scope=Scope.settings)
+    published_date = DateTuple(help="Date when the module was published", scope=Scope.settings)
+    published_by = String(help="Id of the user who published this module", scope=Scope.settings)
+    empty = StringyBoolean(help="Whether this is an empty template", scope=Scope.settings, default=False)
diff --git a/common/djangoapps/__init__.py b/common/djangoapps/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/common/djangoapps/course_groups/cohorts.py b/common/djangoapps/course_groups/cohorts.py
index f0234ec71a..c362ed4e89 100644
--- a/common/djangoapps/course_groups/cohorts.py
+++ b/common/djangoapps/course_groups/cohorts.py
@@ -65,23 +65,23 @@ def is_commentable_cohorted(course_id, commentable_id):
                                                                ans))
     return ans
 
-    
+
 def get_cohorted_commentables(course_id):
     """
     Given a course_id return a list of strings representing cohorted commentables
     """
 
     course = courses.get_course_by_id(course_id)
-    
+
     if not course.is_cohorted:
         # this is the easy case :)
         ans = []
-    else: 
+    else:
         ans = course.cohorted_discussions
 
     return ans
-    
-    
+
+
 def get_cohort(user, course_id):
     """
     Given a django User and a course_id, return the user's cohort in that
@@ -120,7 +120,8 @@ def get_cohort(user, course_id):
         return None
 
     choices = course.auto_cohort_groups
-    if len(choices) == 0:
+    n = len(choices)
+    if n == 0:
         # Nowhere to put user
         log.warning("Course %s is auto-cohorted, but there are no"
                     " auto_cohort_groups specified",
@@ -128,12 +129,19 @@ def get_cohort(user, course_id):
         return None
 
     # Put user in a random group, creating it if needed
-    group_name = random.choice(choices)
+    choice = random.randrange(0, n)
+    group_name = choices[choice]
+
+    # Victor: we are seeing very strange behavior on prod, where almost all users
+    # end up in the same group.  Log at INFO to try to figure out what's going on.
+    log.info("DEBUG: adding user {0} to cohort {1}.  choice={2}".format(
+        user, group_name,choice))
+
     group, created = CourseUserGroup.objects.get_or_create(
         course_id=course_id,
         group_type=CourseUserGroup.COHORT,
         name=group_name)
-    
+
     user.course_groups.add(group)
     return group
 
diff --git a/common/djangoapps/course_groups/tests/tests.py b/common/djangoapps/course_groups/tests/tests.py
index efed39d536..94d52ff6df 100644
--- a/common/djangoapps/course_groups/tests/tests.py
+++ b/common/djangoapps/course_groups/tests/tests.py
@@ -6,7 +6,7 @@ from django.test.utils import override_settings
 
 from course_groups.models import CourseUserGroup
 from course_groups.cohorts import (get_cohort, get_course_cohorts,
-                                   is_commentable_cohorted)
+                                   is_commentable_cohorted, get_cohort_by_name)
 
 from xmodule.modulestore.django import modulestore, _MODULESTORES
 
@@ -76,7 +76,7 @@ class TestCohorts(django.test.TestCase):
                               "id": to_id(name)})
                       for name in discussions)
 
-        course.metadata["discussion_topics"] = topics
+        course.discussion_topics = topics
 
         d = {"cohorted": cohorted}
         if cohorted_discussions is not None:
@@ -88,7 +88,7 @@ class TestCohorts(django.test.TestCase):
         if auto_cohort_groups is not None:
             d["auto_cohort_groups"] = auto_cohort_groups
 
-        course.metadata["cohort_config"] = d
+        course.cohort_config = d
 
 
     def setUp(self):
@@ -168,7 +168,7 @@ class TestCohorts(django.test.TestCase):
 
         self.assertEquals(get_cohort(user3, course.id), None,
                           "No groups->no auto-cohorting")
-        
+
         # Now make it different
         self.config_course_cohorts(course, [], cohorted=True,
                                    auto_cohort=True,
@@ -180,6 +180,37 @@ class TestCohorts(django.test.TestCase):
                           "user2 should still be in originally placed cohort")
 
 
+    def test_auto_cohorting_randomization(self):
+        """
+        Make sure get_cohort() randomizes properly.
+        """
+        course = modulestore().get_course("edX/toy/2012_Fall")
+        self.assertEqual(course.id, "edX/toy/2012_Fall")
+        self.assertFalse(course.is_cohorted)
+
+        groups = ["group_{0}".format(n) for n in range(5)]
+        self.config_course_cohorts(course, [], cohorted=True,
+                                   auto_cohort=True,
+                                   auto_cohort_groups=groups)
+
+        # Assign 100 users to cohorts
+        for i in range(100):
+            user = User.objects.create(username="test_{0}".format(i),
+                                       email="a@b{0}.com".format(i))
+            get_cohort(user, course.id)
+
+        # Now make sure that the assignment was at least vaguely random:
+        # each cohort should have at least 1, and fewer than 50 students.
+        # (with 5 groups, probability of 0 users in any group is about
+        # .8**100= 2.0e-10)
+        for cohort_name in groups:
+            cohort = get_cohort_by_name(course.id, cohort_name)
+            num_users = cohort.users.count()
+            self.assertGreater(num_users, 1)
+            self.assertLess(num_users, 50)
+
+
+
     def test_get_course_cohorts(self):
         course1_id = 'a/b/c'
         course2_id = 'e/f/g'
diff --git a/common/djangoapps/status/tests.py b/common/djangoapps/status/tests.py
index 1695663ac5..bf60017036 100644
--- a/common/djangoapps/status/tests.py
+++ b/common/djangoapps/status/tests.py
@@ -4,7 +4,7 @@ import os
 from django.test.utils import override_settings
 from tempfile import NamedTemporaryFile
 
-from status import get_site_status_msg
+from .status import get_site_status_msg
 
 # Get a name where we can put test files
 TMP_FILE = NamedTemporaryFile(delete=False)
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 6ac57c1182..902ec82677 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -44,9 +44,8 @@ from collections import namedtuple
 
 from courseware.courses import get_courses, sort_by_announcement
 from courseware.access import has_access
-from courseware.models import StudentModuleCache
 from courseware.views import get_module_for_descriptor, jump_to
-from courseware.module_render import get_instance_module
+from courseware.model_data import ModelDataCache
 
 from statsd import statsd
 
@@ -318,7 +317,7 @@ def change_enrollment(request):
         if not has_access(user, course, 'enroll'):
             return {'success': False,
                     'error': 'enrollment in {} not allowed at this time'
-                    .format(course.display_name)}
+                    .format(course.display_name_with_default)}
 
         org, course_num, run = course_id.split("/")
         statsd.increment("common.student.enrollment",
@@ -1071,14 +1070,14 @@ def accept_name_change(request):
 
 @csrf_exempt
 def test_center_login(request):
-    # errors are returned by navigating to the error_url, adding a query parameter named "code" 
+    # errors are returned by navigating to the error_url, adding a query parameter named "code"
     # which contains the error code describing the exceptional condition.
     def makeErrorURL(error_url, error_code):
         log.error("generating error URL with error code {}".format(error_code))
         return "{}?code={}".format(error_url, error_code);
-     
+
     # get provided error URL, which will be used as a known prefix for returning error messages to the
-    # Pearson shell.  
+    # Pearson shell.
     error_url = request.POST.get("errorURL")
 
     # TODO: check that the parameters have not been tampered with, by comparing the code provided by Pearson
@@ -1089,12 +1088,12 @@ def test_center_login(request):
 
     # calculate SHA for query string
     # TODO: figure out how to get the original query string, so we can hash it and compare.
-    
-    
+
+
     if 'clientCandidateID' not in request.POST:
         return HttpResponseRedirect(makeErrorURL(error_url, "missingClientCandidateID"));
     client_candidate_id = request.POST.get("clientCandidateID")
-    
+
     # TODO: check remaining parameters, and maybe at least log if they're not matching
     # expected values....
     # registration_id = request.POST.get("registrationID")
@@ -1108,12 +1107,12 @@ def test_center_login(request):
         return HttpResponseRedirect(makeErrorURL(error_url, "invalidClientCandidateID"));
 
     # find testcenter_registration that matches the provided exam code:
-    # Note that we could rely in future on either the registrationId or the exam code, 
-    # or possibly both.  But for now we know what to do with an ExamSeriesCode, 
+    # Note that we could rely in future on either the registrationId or the exam code,
+    # or possibly both.  But for now we know what to do with an ExamSeriesCode,
     # while we currently have no record of RegistrationID values at all.
     if 'vueExamSeriesCode' not in request.POST:
-        # we are not allowed to make up a new error code, according to Pearson, 
-        # so instead of "missingExamSeriesCode", we use a valid one that is 
+        # we are not allowed to make up a new error code, according to Pearson,
+        # so instead of "missingExamSeriesCode", we use a valid one that is
         # inaccurate but at least distinct.  (Sigh.)
         log.error("missing exam series code for cand ID {}".format(client_candidate_id))
         return HttpResponseRedirect(makeErrorURL(error_url, "missingPartnerID"));
@@ -1127,11 +1126,11 @@ def test_center_login(request):
     if not registrations:
         log.error("not able to find exam registration for exam {} and cand ID {}".format(exam_series_code, client_candidate_id))
         return HttpResponseRedirect(makeErrorURL(error_url, "noTestsAssigned"));
-    
+
     # TODO: figure out what to do if there are more than one registrations....
     # for now, just take the first...
     registration = registrations[0]
-    
+
     course_id = registration.course_id
     course = course_from_id(course_id)  # assume it will be found....
     if not course:
@@ -1149,19 +1148,19 @@ def test_center_login(request):
     if not timelimit_descriptor:
         log.error("cand {} on exam {} for course {}: descriptor not found for location {}".format(client_candidate_id, exam_series_code, course_id, location))
         return HttpResponseRedirect(makeErrorURL(error_url, "missingClientProgram"));
-        
-    timelimit_module_cache = StudentModuleCache.cache_for_descriptor_descendents(course_id, testcenteruser.user, 
-                                                                                 timelimit_descriptor, depth=None)
-    timelimit_module = get_module_for_descriptor(request.user, request, timelimit_descriptor, 
+
+    timelimit_module_cache = ModelDataCache.cache_for_descriptor_descendents(course_id, testcenteruser.user,
+                                                                             timelimit_descriptor, depth=None)
+    timelimit_module = get_module_for_descriptor(request.user, request, timelimit_descriptor,
                                                  timelimit_module_cache, course_id, position=None)
     if not timelimit_module.category == 'timelimit':
         log.error("cand {} on exam {} for course {}: non-timelimit module at location {}".format(client_candidate_id, exam_series_code, course_id, location))
         return HttpResponseRedirect(makeErrorURL(error_url, "missingClientProgram"));
-        
+
     if timelimit_module and timelimit_module.has_ended:
         log.warning("cand {} on exam {} for course {}: test already over at {}".format(client_candidate_id, exam_series_code, course_id, timelimit_module.ending_at))
         return HttpResponseRedirect(makeErrorURL(error_url, "allTestsTaken"));
-    
+
     # check if we need to provide an accommodation:
     time_accommodation_mapping = {'ET12ET' : 'ADDHALFTIME',
                                   'ET30MN' : 'ADD30MIN',
@@ -1174,27 +1173,24 @@ def test_center_login(request):
     # special, hard-coded client ID used by Pearson shell for testing:
     if client_candidate_id == "edX003671291147":
         time_accommodation_code = 'TESTING'
-        
+
     if time_accommodation_code:
         timelimit_module.accommodation_code = time_accommodation_code
-        instance_module = get_instance_module(course_id, testcenteruser.user, timelimit_module, timelimit_module_cache)
-        instance_module.state = timelimit_module.get_instance_state()
-        instance_module.save()
         log.info("cand {} on exam {} for course {}: receiving accommodation {}".format(client_candidate_id, exam_series_code, course_id, time_accommodation_code))
-        
+
     # UGLY HACK!!!
-    # Login assumes that authentication has occurred, and that there is a 
+    # Login assumes that authentication has occurred, and that there is a
     # backend annotation on the user object, indicating which backend
     # against which the user was authenticated.  We're authenticating here
     # against the registration entry, and assuming that the request given
     # this information is correct, we allow the user to be logged in
     # without a password.  This could all be formalized in a backend object
-    # that does the above checking.  
+    # that does the above checking.
     # TODO: (brian) create a backend class to do this.
-    # testcenteruser.user.backend = "%s.%s" % (backend.__module__, backend.__class__.__name__)    
-    testcenteruser.user.backend = "%s.%s" % ("TestcenterAuthenticationModule", "TestcenterAuthenticationClass")    
+    # testcenteruser.user.backend = "%s.%s" % (backend.__module__, backend.__class__.__name__)
+    testcenteruser.user.backend = "%s.%s" % ("TestcenterAuthenticationModule", "TestcenterAuthenticationClass")
     login(request, testcenteruser.user)
-    
+
     # And start the test:
     return jump_to(request, course_id, location)
 
diff --git a/common/djangoapps/terrain/factories.py b/common/djangoapps/terrain/factories.py
index bb7ae012c8..a531f4fd26 100644
--- a/common/djangoapps/terrain/factories.py
+++ b/common/djangoapps/terrain/factories.py
@@ -7,13 +7,14 @@ from xmodule.modulestore.django import modulestore
 from time import gmtime
 from uuid import uuid4
 from xmodule.timeparse import stringify_time
+from xmodule.modulestore.inheritance import own_metadata
 
 
 class GroupFactory(Factory):
     FACTORY_FOR = Group
 
     name = 'staff_MITx/999/Robot_Super_Course'
-    
+
 
 class UserProfileFactory(Factory):
     FACTORY_FOR = UserProfile
@@ -81,18 +82,17 @@ class XModuleCourseFactory(Factory):
 
         # This metadata code was copied from cms/djangoapps/contentstore/views.py
         if display_name is not None:
-            new_course.metadata['display_name'] = display_name
+            new_course.display_name = display_name
 
-        new_course.metadata['data_dir'] = uuid4().hex
-        new_course.metadata['start'] = stringify_time(gmtime())
+        new_course.lms.start = gmtime()
         new_course.tabs = [{"type": "courseware"},
-            {"type": "course_info", "name": "Course Info"}, 
+            {"type": "course_info", "name": "Course Info"},
             {"type": "discussion", "name": "Discussion"},
             {"type": "wiki", "name": "Wiki"},
             {"type": "progress", "name": "Progress"}]
 
         # Update the data in the mongo datastore
-        store.update_metadata(new_course.location.url(), new_course.own_metadata)
+        store.update_metadata(new_course.location.url(), own_metadata(new_course))
 
         return new_course
 
@@ -139,17 +139,14 @@ class XModuleItemFactory(Factory):
 
         new_item = store.clone_item(template, dest_location)
 
-        # TODO: This needs to be deleted when we have proper storage for static content
-        new_item.metadata['data_dir'] = parent.metadata['data_dir']
-
         # replace the display name with an optional parameter passed in from the caller
         if display_name is not None:
-            new_item.metadata['display_name'] = display_name
+            new_item.display_name = display_name
 
-        store.update_metadata(new_item.location.url(), new_item.own_metadata)
+        store.update_metadata(new_item.location.url(), own_metadata(new_item))
 
         if new_item.location.category not in DETACHED_CATEGORIES:
-            store.update_children(parent_location, parent.definition.get('children', []) + [new_item.location.url()])
+            store.update_children(parent_location, parent.children + [new_item.location.url()])
 
         return new_item
 
diff --git a/common/djangoapps/terrain/steps.py b/common/djangoapps/terrain/steps.py
index 88fba697b2..3dcef9b1ed 100644
--- a/common/djangoapps/terrain/steps.py
+++ b/common/djangoapps/terrain/steps.py
@@ -1,5 +1,5 @@
 from lettuce import world, step
-from factories import *
+from .factories import *
 from lettuce.django import django_url
 from django.contrib.auth.models import User
 from student.models import CourseEnrollment
diff --git a/common/djangoapps/xmodule_modifiers.py b/common/djangoapps/xmodule_modifiers.py
index 7b19c27553..d398dfef0d 100644
--- a/common/djangoapps/xmodule_modifiers.py
+++ b/common/djangoapps/xmodule_modifiers.py
@@ -33,7 +33,7 @@ def wrap_xmodule(get_html, module, template, context=None):
     def _get_html():
         context.update({
             'content': get_html(),
-            'display_name': module.metadata.get('display_name') if module.metadata is not None else None,
+            'display_name': module.display_name,
             'class_': module.__class__.__name__,
             'module_name': module.js_module_name
         })
@@ -108,42 +108,25 @@ def add_histogram(get_html, module, user):
         histogram = grade_histogram(module_id)
         render_histogram = len(histogram) > 0
 
-        # TODO (ichuang): Remove after fall 2012 LMS migration done
-        if settings.MITX_FEATURES.get('ENABLE_LMS_MIGRATION'):
-            [filepath, filename] = module.definition.get('filename', ['', None])
-            osfs = module.system.filestore
-            if filename is not None and osfs.exists(filename):
-                # if original, unmangled filename exists then use it (github
-                # doesn't like symlinks)
-                filepath = filename
-            data_dir = osfs.root_path.rsplit('/')[-1]
-            giturl = module.metadata.get('giturl', 'https://github.com/MITx')
-            edit_link = "%s/%s/tree/master/%s" % (giturl, data_dir, filepath)
-        else:
-            edit_link = False
-            # Need to define all the variables that are about to be used
-            giturl = ""
-            data_dir = ""
-        source_file = module.metadata.get('source_file', '')  	# source used to generate the problem XML, eg latex or word
+        source_file = module.lms.source_file  # source used to generate the problem XML, eg latex or word
 
         # useful to indicate to staff if problem has been released or not
         # TODO (ichuang): use _has_access_descriptor.can_load in lms.courseware.access, instead of now>mstart comparison here
         now = time.gmtime()
         is_released = "unknown"
-        mstart = getattr(module.descriptor, 'start')
+        mstart = module.descriptor.lms.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 = {'definition': module.definition.get('data'),
-                         'metadata': json.dumps(module.metadata, indent=4),
+        staff_context = {'fields': [(field.name, getattr(module, field.name)) for field in module.fields],
+                         'lms_fields': [(field.name, getattr(module.lms, field.name)) for field in module.lms.fields],
                          'location': module.location,
-                         'xqa_key': module.metadata.get('xqa_key', ''),
+                         'xqa_key': module.lms.xqa_key,
                          'source_file': source_file,
-                         'source_url': '%s/%s/tree/master/%s' % (giturl, data_dir, source_file),
                          'category': str(module.__class__.__name__),
                          # Template uses element_id in js function names, so can't allow dashes
                          'element_id': module.location.html_id().replace('-', '_'),
-                         'edit_link': edit_link,
                          'user': user,
                          'xqa_server': settings.MITX_FEATURES.get('USE_XQA_SERVER', 'http://xqa:server@content-qa.mitx.mit.edu/xqa'),
                          'histogram': json.dumps(histogram),
diff --git a/common/lib/capa/capa/calc.py b/common/lib/capa/capa/calc.py
index 0f062d17d5..c3fe6b656b 100644
--- a/common/lib/capa/capa/calc.py
+++ b/common/lib/capa/capa/calc.py
@@ -183,7 +183,7 @@ def evaluator(variables, functions, string, cs=False):
 
     # 0.33k or -17
     number = (Optional(minus | plus) + inner_number
-              + Optional(CaselessLiteral("E") + Optional("-") + number_part)
+              + Optional(CaselessLiteral("E") + Optional((plus | minus)) + number_part)
               + Optional(number_suffix))
     number = number.setParseAction(number_parse_action)  # Convert to number
 
diff --git a/common/lib/capa/capa/capa_problem.py b/common/lib/capa/capa/capa_problem.py
index 8b32686985..42753fc90b 100644
--- a/common/lib/capa/capa/capa_problem.py
+++ b/common/lib/capa/capa/capa_problem.py
@@ -39,11 +39,11 @@ import verifiers
 import verifiers.draganddrop
 
 import calc
-from correctmap import CorrectMap
+from .correctmap import CorrectMap
 import eia
 import inputtypes
 import customrender
-from util import contextualize_text, convert_files_to_filenames
+from .util import contextualize_text, convert_files_to_filenames
 import xqueue_interface
 
 # to be replaced with auto-registering
@@ -78,7 +78,7 @@ global_context = {'random': random,
 # These should be removed from HTML output, including all subelements
 html_problem_semantics = ["codeparam", "responseparam", "answer", "script", "hintgroup", "openendedparam", "openendedrubric"]
 
-log = logging.getLogger('mitx.' + __name__)
+log = logging.getLogger(__name__)
 
 #-----------------------------------------------------------------------------
 # main class for this module
@@ -108,6 +108,8 @@ class LoncapaProblem(object):
         self.do_reset()
         self.problem_id = id
         self.system = system
+        if self.system is None:
+            raise Exception()
         self.seed = seed
 
         if state:
diff --git a/common/lib/capa/capa/checker.py b/common/lib/capa/capa/checker.py
index f583a5ea7d..15358aac9e 100755
--- a/common/lib/capa/capa/checker.py
+++ b/common/lib/capa/capa/checker.py
@@ -12,8 +12,8 @@ from path import path
 from cStringIO import StringIO
 from collections import defaultdict
 
-from calc import UndefinedVariable
-from capa_problem import LoncapaProblem
+from .calc import UndefinedVariable
+from .capa_problem import LoncapaProblem
 from mako.lookup import TemplateLookup
 
 logging.basicConfig(format="%(levelname)s %(message)s")
diff --git a/common/lib/capa/capa/chem/tests.py b/common/lib/capa/capa/chem/tests.py
index 571526f915..f422fcf0d1 100644
--- a/common/lib/capa/capa/chem/tests.py
+++ b/common/lib/capa/capa/chem/tests.py
@@ -2,7 +2,7 @@ import codecs
 from fractions import Fraction
 import unittest
 
-from chemcalc import (compare_chemical_expression, divide_chemical_expression,
+from .chemcalc import (compare_chemical_expression, divide_chemical_expression,
                       render_to_html, chemical_equations_equal)
 
 import miller
@@ -277,7 +277,6 @@ class Test_Render_Equations(unittest.TestCase):
 
     def test_render9(self):
         s = "5[Ni(NH3)4]^2+ + 5/2SO4^2-"
-        #import ipdb; ipdb.set_trace()
         out = render_to_html(s)
         correct = u'<span class="math">5[Ni(NH<sub>3</sub>)<sub>4</sub>]<sup>2+</sup>+<sup>5</sup>&frasl;<sub>2</sub>SO<sub>4</sub><sup>2-</sup></span>'
         log(out + ' ------- ' + correct, 'html')
diff --git a/common/lib/capa/capa/correctmap.py b/common/lib/capa/capa/correctmap.py
index ea56863a2f..b726f765d8 100644
--- a/common/lib/capa/capa/correctmap.py
+++ b/common/lib/capa/capa/correctmap.py
@@ -47,7 +47,7 @@ class CorrectMap(object):
             queuestate=None, **kwargs):
 
         if answer_id is not None:
-            self.cmap[answer_id] = {'correctness': correctness,
+            self.cmap[str(answer_id)] = {'correctness': correctness,
                                     'npoints': npoints,
                                     'msg': msg,
                                     'hint': hint,
diff --git a/common/lib/capa/capa/customrender.py b/common/lib/capa/capa/customrender.py
index a925a5970d..60d3ce578b 100644
--- a/common/lib/capa/capa/customrender.py
+++ b/common/lib/capa/capa/customrender.py
@@ -6,7 +6,7 @@ These tags do not have state, so they just get passed the system (for access to
 and the xml element.
 """
 
-from registry import TagRegistry
+from .registry import TagRegistry
 
 import logging
 import re
@@ -15,9 +15,9 @@ import json
 
 from lxml import etree
 import xml.sax.saxutils as saxutils
-from registry import TagRegistry
+from .registry import TagRegistry
 
-log = logging.getLogger('mitx.' + __name__)
+log = logging.getLogger(__name__)
 
 registry = TagRegistry()
 
diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index f614743e67..c2babfa479 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -47,10 +47,10 @@ import sys
 import os
 import pyparsing
 
-from registry import TagRegistry
+from .registry import TagRegistry
 from capa.chem import chemcalc
 
-log = logging.getLogger('mitx.' + __name__)
+log = logging.getLogger(__name__)
 
 #########################################################################
 
@@ -366,6 +366,12 @@ class ChoiceGroup(InputTypeBase):
 
         self.choices = self.extract_choices(self.xml)
 
+    @classmethod
+    def get_attributes(cls):
+        return [Attribute("show_correctness", "always"),
+                Attribute("submitted_message", "Answer received.")]
+
+
     def _extra_context(self):
         return {'input_type': self.html_input_type,
                 'choices': self.choices,
@@ -851,6 +857,10 @@ class DragAndDropInput(InputTypeBase):
             if tag_type == 'draggable' and not self.no_labels:
                 dic['label'] = dic['label'] or dic['id']
 
+            if tag_type == 'draggable':
+                dic['target_fields'] = [parse(target, 'target') for target in
+                                                tag.iterchildren('target')]
+
             return dic
 
         # add labels to images?:
diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
index d49d030df5..6bf98999d8 100644
--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -28,15 +28,15 @@ from collections import namedtuple
 from shapely.geometry import Point, MultiPoint
 
 # specific library imports
-from calc import evaluator, UndefinedVariable
-from correctmap import CorrectMap
+from .calc import evaluator, UndefinedVariable
+from .correctmap import CorrectMap
 from datetime import datetime
-from util import *
+from .util import *
 from lxml import etree
 from lxml.html.soupparser import fromstring as fromstring_bs     # uses Beautiful Soup!!! FIXME?
 import xqueue_interface
 
-log = logging.getLogger('mitx.' + __name__)
+log = logging.getLogger(__name__)
 
 
 #-----------------------------------------------------------------------------
@@ -231,16 +231,14 @@ class LoncapaResponse(object):
         # hint specified by function?
         hintfn = hintgroup.get('hintfn')
         if hintfn:
-            '''
-            Hint is determined by a function defined in the <script> context; evaluate
-            that function to obtain list of hint, hintmode for each answer_id.
+            # Hint is determined by a function defined in the <script> context; evaluate
+            # that function to obtain list of hint, hintmode for each answer_id.
 
-            The function should take arguments (answer_ids, student_answers, new_cmap, old_cmap)
-            and it should modify new_cmap as appropriate.
+            # The function should take arguments (answer_ids, student_answers, new_cmap, old_cmap)
+            # and it should modify new_cmap as appropriate.
 
-            We may extend this in the future to add another argument which provides a
-            callback procedure to a social hint generation system.
-            '''
+            # We may extend this in the future to add another argument which provides a
+            # callback procedure to a social hint generation system.
             if not hintfn in self.context:
                 msg = 'missing specified hint function %s in script context' % hintfn
                 msg += "\nSee XML source line %s" % getattr(self.xml, 'sourceline', '<unavailable>')
@@ -329,7 +327,7 @@ class LoncapaResponse(object):
         """ Render a <div> for a message that applies to the entire response.
 
         *response_msg* is a string, which may contain XHTML markup
-        
+
         Returns an etree element representing the response message <div> """
         # First try wrapping the text in a <div> and parsing
         # it as an XHTML tree
@@ -872,7 +870,7 @@ class CustomResponse(LoncapaResponse):
     Custom response.  The python code to be run should be in <answer>...</answer>
     or in a <script>...</script>
     '''
-    snippets = [{'snippet': """<customresponse>
+    snippets = [{'snippet': r"""<customresponse>
     <text>
     <br/>
     Suppose that \(I(t)\) rises from \(0\) to \(I_S\) at a time \(t_0 \neq 0\)
@@ -1104,7 +1102,7 @@ def sympy_check2():
                 # the form:
                 # {'overall_message': STRING,
                 #  'input_list': [{ 'ok': BOOLEAN, 'msg': STRING }, ...] }
-                # 
+                #
                 # This allows the function to return an 'overall message'
                 # that applies to the entire problem, as well as correct/incorrect
                 # status and messages for individual inputs
@@ -1197,7 +1195,7 @@ class SymbolicResponse(CustomResponse):
     """
     Symbolic math response checking, using symmath library.
     """
-    snippets = [{'snippet': '''<problem>
+    snippets = [{'snippet': r'''<problem>
       <text>Compute \[ \exp\left(-i \frac{\theta}{2} \left[ \begin{matrix} 0 & 1 \\ 1 & 0 \end{matrix} \right] \right) \]
       and give the resulting \(2\times 2\) matrix: <br/>
         <symbolicresponse answer="">
@@ -1988,7 +1986,7 @@ class AnnotationResponse(LoncapaResponse):
 
         for inputfield in self.inputfields:
             option_scoring = dict([(option['id'], {
-                    'correctness': choices.get(option['choice']), 
+                    'correctness': choices.get(option['choice']),
                     'points': scoring.get(option['choice'])
                 }) for option in self._find_options(inputfield) ])
 
diff --git a/common/lib/capa/capa/templates/choicegroup.html b/common/lib/capa/capa/templates/choicegroup.html
index e4a3f1dc39..e1ff40b6a1 100644
--- a/common/lib/capa/capa/templates/choicegroup.html
+++ b/common/lib/capa/capa/templates/choicegroup.html
@@ -1,7 +1,7 @@
 <form class="choicegroup capa_inputtype" id="inputtype_${id}">
     <div class="indicator_container">
     % if input_type == 'checkbox' or not value:
-        % if status == 'unsubmitted':
+        % if status == 'unsubmitted' or show_correctness == 'never':
         <span class="unanswered" style="display:inline-block;" id="status_${id}"></span>
         % elif status == 'correct': 
         <span class="correct" id="status_${id}"></span>
@@ -26,7 +26,7 @@
                 else:
                     correctness = None
             %>
-            % if correctness:
+            % if correctness and not show_correctness=='never':
             class="choicegroup_${correctness}"
             % endif
             % endif
@@ -41,4 +41,7 @@
         <span id="answer_${id}"></span>
     </fieldset>
 
+    % if show_correctness == "never" and (value or status not in ['unsubmitted']):
+    <div class="capa_alert">${submitted_message}</div>
+    %endif
 </form>
diff --git a/common/lib/capa/capa/tests/test_html_render.py b/common/lib/capa/capa/tests/test_html_render.py
index 6c74d06ef4..e99308587e 100644
--- a/common/lib/capa/capa/tests/test_html_render.py
+++ b/common/lib/capa/capa/tests/test_html_render.py
@@ -7,7 +7,7 @@ import json
 import mock
 
 from capa.capa_problem import LoncapaProblem
-from response_xml_factory import StringResponseXMLFactory, CustomResponseXMLFactory
+from .response_xml_factory import StringResponseXMLFactory, CustomResponseXMLFactory
 from . import test_system
 
 class CapaHtmlRenderTest(unittest.TestCase):
diff --git a/common/lib/capa/capa/tests/test_inputtypes.py b/common/lib/capa/capa/tests/test_inputtypes.py
index f670a38746..360fd9f2f6 100644
--- a/common/lib/capa/capa/tests/test_inputtypes.py
+++ b/common/lib/capa/capa/tests/test_inputtypes.py
@@ -102,6 +102,8 @@ class ChoiceGroupTest(unittest.TestCase):
                     'choices': [('foil1', '<text>This is foil One.</text>'),
                                 ('foil2', '<text>This is foil Two.</text>'),
                                 ('foil3', 'This is foil Three.'), ],
+                    'show_correctness': 'always',
+                    'submitted_message': 'Answer received.',
                     'name_array_suffix': expected_suffix,   # what is this for??
                     }
 
@@ -555,14 +557,14 @@ class DragAndDropTest(unittest.TestCase):
                         "target_outline": "false",
                         "base_image": "/static/images/about_1.png",
                         "draggables": [
-{"can_reuse": "", "label": "Label 1", "id": "1", "icon": ""},
-{"can_reuse": "", "label": "cc", "id": "name_with_icon", "icon": "/static/images/cc.jpg", },
-{"can_reuse": "", "label": "arrow-left", "id": "with_icon", "icon": "/static/images/arrow-left.png", "can_reuse": ""},
-{"can_reuse": "", "label": "Label2", "id": "5", "icon": "", "can_reuse": ""},
-{"can_reuse": "", "label": "Mute", "id": "2", "icon": "/static/images/mute.png", "can_reuse": ""},
-{"can_reuse": "", "label": "spinner", "id": "name_label_icon3", "icon": "/static/images/spinner.gif", "can_reuse": ""},
-{"can_reuse": "", "label": "Star", "id": "name4", "icon": "/static/images/volume.png", "can_reuse": ""},
-{"can_reuse": "", "label": "Label3", "id": "7", "icon": "", "can_reuse": ""}],
+{"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": "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": "Label3", "id": "7", "icon": "", "can_reuse": "", "target_fields": []}],
                         "one_per_target": "True",
                         "targets": [
                 {"y": "90", "x": "210", "id": "t1", "w": "90", "h": "90"},
diff --git a/common/lib/capa/capa/tests/test_responsetypes.py b/common/lib/capa/capa/tests/test_responsetypes.py
index 93a7e9628a..e024909d75 100644
--- a/common/lib/capa/capa/tests/test_responsetypes.py
+++ b/common/lib/capa/capa/tests/test_responsetypes.py
@@ -19,7 +19,7 @@ from capa.xqueue_interface import dateformat
 
 class ResponseTest(unittest.TestCase):
     """ Base class for tests of capa responses."""
-    
+
     xml_factory_class = None
 
     def setUp(self):
@@ -43,7 +43,7 @@ class ResponseTest(unittest.TestCase):
 
         for input_str in incorrect_answers:
             result = problem.grade_answers({'1_2_1': input_str}).get_correctness('1_2_1')
-            self.assertEqual(result, 'incorrect', 
+            self.assertEqual(result, 'incorrect',
                             msg="%s should be marked incorrect" % str(input_str))
 
 class MultiChoiceResponseTest(ResponseTest):
@@ -61,7 +61,7 @@ class MultiChoiceResponseTest(ResponseTest):
     def test_named_multiple_choice_grade(self):
         problem = self.build_problem(choices=[False, True, False],
                                     choice_names=["foil_1", "foil_2", "foil_3"])
-        
+
         # Ensure that we get the expected grades
         self.assert_grade(problem, 'choice_foil_1', 'incorrect')
         self.assert_grade(problem, 'choice_foil_2', 'correct')
@@ -117,7 +117,7 @@ class ImageResponseTest(ResponseTest):
 
         # Anything inside the rectangle (and along the borders) is correct
         # Everything else is incorrect
-        correct_inputs = ["[12,19]", "[10,10]", "[20,20]", 
+        correct_inputs = ["[12,19]", "[10,10]", "[20,20]",
                             "[10,15]", "[20,15]", "[15,10]", "[15,20]"]
         incorrect_inputs = ["[4,6]", "[25,15]", "[15,40]", "[15,4]"]
         self.assert_multiple_grade(problem, correct_inputs, incorrect_inputs)
@@ -259,7 +259,7 @@ class OptionResponseTest(ResponseTest):
     xml_factory_class = OptionResponseXMLFactory
 
     def test_grade(self):
-        problem = self.build_problem(options=["first", "second", "third"], 
+        problem = self.build_problem(options=["first", "second", "third"],
                                     correct_option="second")
 
         # Assert that we get the expected grades
@@ -374,8 +374,8 @@ class StringResponseTest(ResponseTest):
         hints = [("wisconsin", "wisc", "The state capital of Wisconsin is Madison"),
                 ("minnesota", "minn", "The state capital of Minnesota is St. Paul")]
 
-        problem = self.build_problem(answer="Michigan", 
-                                    case_sensitive=False, 
+        problem = self.build_problem(answer="Michigan",
+                                    case_sensitive=False,
                                     hints=hints)
 
         # We should get a hint for Wisconsin
@@ -543,7 +543,7 @@ class ChoiceResponseTest(ResponseTest):
     xml_factory_class = ChoiceResponseXMLFactory
 
     def test_radio_group_grade(self):
-        problem = self.build_problem(choice_type='radio', 
+        problem = self.build_problem(choice_type='radio',
                                         choices=[False, True, False])
 
         # Check that we get the expected results
@@ -601,17 +601,17 @@ class NumericalResponseTest(ResponseTest):
         correct_responses = ["4", "4.0", "4.00"]
         incorrect_responses = ["", "3.9", "4.1", "0"]
         self.assert_multiple_grade(problem, correct_responses, incorrect_responses)
-        
+
 
     def test_grade_decimal_tolerance(self):
         problem = self.build_problem(question_text="What is 2 + 2 approximately?",
                                         explanation="The answer is 4",
                                         answer=4,
                                         tolerance=0.1)
-        correct_responses = ["4.0", "4.00", "4.09", "3.91"] 
+        correct_responses = ["4.0", "4.00", "4.09", "3.91"]
         incorrect_responses = ["", "4.11", "3.89", "0"]
         self.assert_multiple_grade(problem, correct_responses, incorrect_responses)
-                        
+
     def test_grade_percent_tolerance(self):
         problem = self.build_problem(question_text="What is 2 + 2 approximately?",
                                         explanation="The answer is 4",
@@ -642,6 +642,15 @@ class NumericalResponseTest(ResponseTest):
         incorrect_responses = ["", "2.11", "1.89", "0"]
         self.assert_multiple_grade(problem, correct_responses, incorrect_responses)
 
+    def test_exponential_answer(self):
+        problem = self.build_problem(question_text="What 5 * 10?",
+                                     explanation="The answer is 50",
+                                     answer="5e+1")
+        correct_responses = ["50", "50.0", "5e1", "5e+1", "50e0", "500e-1"]
+        incorrect_responses = ["", "3.9", "4.1", "0", "5.01e1"]
+        self.assert_multiple_grade(problem, correct_responses, incorrect_responses)
+
+
 
 class CustomResponseTest(ResponseTest):
     from response_xml_factory import CustomResponseXMLFactory
@@ -667,7 +676,7 @@ class CustomResponseTest(ResponseTest):
         # The code can also set the global overall_message (str)
         # to pass a message that applies to the whole response
         inline_script = textwrap.dedent("""
-        messages[0] = "Test Message" 
+        messages[0] = "Test Message"
         overall_message = "Overall message"
         """)
         problem = self.build_problem(answer=inline_script)
@@ -687,14 +696,14 @@ class CustomResponseTest(ResponseTest):
     def test_function_code_single_input(self):
 
         # For function code, we pass in these arguments:
-        # 
+        #
         #   'expect' is the expect attribute of the <customresponse>
         #
         #   'answer_given' is the answer the student gave (if there is just one input)
         #       or an ordered list of answers (if there are multiple inputs)
-        #   
         #
-        # The function should return a dict of the form 
+        #
+        # The function should return a dict of the form
         # { 'ok': BOOL, 'msg': STRING }
         #
         script = textwrap.dedent("""
@@ -727,7 +736,7 @@ class CustomResponseTest(ResponseTest):
     def test_function_code_multiple_input_no_msg(self):
 
         # Check functions also have the option of returning
-        # a single boolean value 
+        # a single boolean value
         # If true, mark all the inputs correct
         # If false, mark all the inputs incorrect
         script = textwrap.dedent("""
@@ -736,7 +745,7 @@ class CustomResponseTest(ResponseTest):
                         answer_given[1] == expect)
         """)
 
-        problem = self.build_problem(script=script, cfn="check_func", 
+        problem = self.build_problem(script=script, cfn="check_func",
                                     expect="42", num_inputs=2)
 
         # Correct answer -- expect both inputs marked correct
@@ -764,10 +773,10 @@ class CustomResponseTest(ResponseTest):
 
         # If the <customresponse> has multiple inputs associated with it,
         # the check function can return a dict of the form:
-        # 
+        #
         # {'overall_message': STRING,
         #  'input_list': [{'ok': BOOL, 'msg': STRING}, ...] }
-        # 
+        #
         # 'overall_message' is displayed at the end of the response
         #
         # 'input_list' contains dictionaries representing the correctness
@@ -784,7 +793,7 @@ class CustomResponseTest(ResponseTest):
                             {'ok': check3,  'msg': 'Feedback 3'} ] }
             """)
 
-        problem = self.build_problem(script=script, 
+        problem = self.build_problem(script=script,
                                     cfn="check_func", num_inputs=3)
 
         # Grade the inputs (one input incorrect)
@@ -821,11 +830,11 @@ class CustomResponseTest(ResponseTest):
                 check1 = (int(answer_given[0]) == 1)
                 check2 = (int(answer_given[1]) == 2)
                 check3 = (int(answer_given[2]) == 3)
-                return {'ok': (check1 and check2 and check3),  
+                return {'ok': (check1 and check2 and check3),
                         'msg': 'Message text'}
             """)
 
-        problem = self.build_problem(script=script, 
+        problem = self.build_problem(script=script,
                                     cfn="check_func", num_inputs=3)
 
         # Grade the inputs (one input incorrect)
@@ -862,7 +871,7 @@ class CustomResponseTest(ResponseTest):
         # Expect that an exception gets raised when we check the answer
         with self.assertRaises(Exception):
             problem.grade_answers({'1_2_1': '42'})
-    
+
     def test_invalid_dict_exception(self):
 
         # Construct a script that passes back an invalid dict format
diff --git a/common/lib/capa/capa/util.py b/common/lib/capa/capa/util.py
index a0f25c4947..9f3e8bd3a0 100644
--- a/common/lib/capa/capa/util.py
+++ b/common/lib/capa/capa/util.py
@@ -1,4 +1,4 @@
-from calc import evaluator, UndefinedVariable
+from .calc import evaluator, UndefinedVariable
 
 #-----------------------------------------------------------------------------
 #
diff --git a/common/lib/capa/capa/verifiers/draganddrop.py b/common/lib/capa/capa/verifiers/draganddrop.py
index 239ff2b9a4..cdfa163f33 100644
--- a/common/lib/capa/capa/verifiers/draganddrop.py
+++ b/common/lib/capa/capa/verifiers/draganddrop.py
@@ -27,6 +27,49 @@ values are (x,y) coordinates of centers of dragged images.
 import json
 
 
+def flat_user_answer(user_answer):
+    """
+    Convert nested `user_answer` to flat format.
+
+        {'up': {'first': {'p': 'p_l'}}}
+
+        to
+
+        {'up': 'p_l[p][first]'}
+    """
+
+    def parse_user_answer(answer):
+        key = answer.keys()[0]
+        value = answer.values()[0]
+        if isinstance(value, dict):
+
+            # Make complex value:
+            # Example:
+            # Create like 'p_l[p][first]' from {'first': {'p': 'p_l'}
+            complex_value_list = []
+            v_value = value
+            while isinstance(v_value, dict):
+                v_key = v_value.keys()[0]
+                v_value = v_value.values()[0]
+                complex_value_list.append(v_key)
+
+            complex_value = '{0}'.format(v_value)
+            for i in reversed(complex_value_list):
+                complex_value = '{0}[{1}]'.format(complex_value, i)
+
+            res = {key: complex_value}
+            return res
+        else:
+            return answer
+
+    result = []
+    for answer in user_answer:
+        parse_answer = parse_user_answer(answer)
+        result.append(parse_answer)
+
+    return result
+
+
 class PositionsCompare(list):
     """ Class for comparing positions.
 
@@ -116,37 +159,36 @@ class DragAndDrop(object):
 
         # Number of draggables in user_groups may be differ that in
         # correct_groups, that is incorrect, except special case with 'number'
-        for groupname, draggable_ids in self.correct_groups.items():
-
+        for index, draggable_ids in enumerate(self.correct_groups):
             # 'number' rule special case
             # for reusable draggables we may get in self.user_groups
             # {'1': [u'2', u'2', u'2'], '0': [u'1', u'1'], '2': [u'3']}
             # if '+number' is in rule - do not remove duplicates and strip
             # '+number' from rule
-            current_rule = self.correct_positions[groupname].keys()[0]
+            current_rule = self.correct_positions[index].keys()[0]
             if 'number' in current_rule:
-                rule_values = self.correct_positions[groupname][current_rule]
+                rule_values = self.correct_positions[index][current_rule]
                 # clean rule, do not do clean duplicate items
-                self.correct_positions[groupname].pop(current_rule, None)
+                self.correct_positions[index].pop(current_rule, None)
                 parsed_rule = current_rule.replace('+', '').replace('number', '')
-                self.correct_positions[groupname][parsed_rule] = rule_values
+                self.correct_positions[index][parsed_rule] = rule_values
             else:  # remove dublicates
-                self.user_groups[groupname] = list(set(self.user_groups[groupname]))
+                self.user_groups[index] = list(set(self.user_groups[index]))
 
-            if sorted(draggable_ids) != sorted(self.user_groups[groupname]):
+            if sorted(draggable_ids) != sorted(self.user_groups[index]):
                 return False
 
         # Check that in every group, for rule of that group, user positions of
         # every element are equal with correct positions
-        for groupname in self.correct_groups:
+        for index, _ in enumerate(self.correct_groups):
             rules_executed = 0
             for rule in ('exact', 'anyof', 'unordered_equal'):
                 # every group has only one rule
-                if self.correct_positions[groupname].get(rule, None):
+                if self.correct_positions[index].get(rule, None):
                     rules_executed += 1
                     if not self.compare_positions(
-                            self.correct_positions[groupname][rule],
-                            self.user_positions[groupname]['user'], flag=rule):
+                            self.correct_positions[index][rule],
+                            self.user_positions[index]['user'], flag=rule):
                         return False
             if not rules_executed:  # no correct rules for current group
             # probably xml content mistake - wrong rules names
@@ -248,7 +290,7 @@ class DragAndDrop(object):
             correct_answer = {'name4': 't1',
                             'name_with_icon': 't1',
                             '5': 't2',
-                            '7':'t2'}
+                            '7': 't2'}
 
             It is draggable_name: dragable_position mapping.
 
@@ -284,24 +326,25 @@ class DragAndDrop(object):
 
         Args:
             user_answer: json
-            correct_answer: dict  or list
+            correct_answer: dict or list
         """
 
-        self.correct_groups = dict()  # correct groups from xml
-        self.correct_positions = dict()  # correct positions for comparing
-        self.user_groups = dict()  # will be populated from user answer
-        self.user_positions = dict()  # will be populated from user answer
+        self.correct_groups = []  # Correct groups from xml.
+        self.correct_positions = []  # Correct positions for comparing.
+        self.user_groups = []  # Will be populated from user answer.
+        self.user_positions = []  # Will be populated from user answer.
 
-        # convert from dict answer format to list format
+        # Convert from dict answer format to list format.
         if isinstance(correct_answer, dict):
             tmp = []
             for key, value in correct_answer.items():
-                tmp_dict = {'draggables': [], 'targets': [], 'rule': 'exact'}
-                tmp_dict['draggables'].append(key)
-                tmp_dict['targets'].append(value)
-                tmp.append(tmp_dict)
+                tmp.append({
+                    'draggables': [key],
+                    'targets': [value],
+                    'rule': 'exact'})
             correct_answer = tmp
 
+        # Convert string `user_answer` to object.
         user_answer = json.loads(user_answer)
 
         # This dictionary will hold a key for each draggable the user placed on
@@ -309,27 +352,32 @@ class DragAndDrop(object):
         # correct_answer entries.  If the draggable is mentioned in at least one
         # correct_answer entry, the value is False.
         # default to consider every user answer excess until proven otherwise.
-        self.excess_draggables = dict((users_draggable.keys()[0],True) 
-            for users_draggable in user_answer['draggables'])
+        self.excess_draggables = dict((users_draggable.keys()[0],True)
+            for users_draggable in user_answer)
 
-        # create identical data structures from user answer and correct answer
-        for i in xrange(0, len(correct_answer)):
-            groupname = str(i)
-            self.correct_groups[groupname] = correct_answer[i]['draggables']
-            self.correct_positions[groupname] = {correct_answer[i]['rule']:
-                                                correct_answer[i]['targets']}
-            self.user_groups[groupname] = []
-            self.user_positions[groupname] = {'user': []}
-            for draggable_dict in user_answer['draggables']:
-                # draggable_dict is 1-to-1 {draggable_name: position}
+        # Convert nested `user_answer` to flat format.
+        user_answer = flat_user_answer(user_answer)
+
+        # Create identical data structures from user answer and correct answer.
+        for answer in correct_answer:
+            user_groups_data = []
+            user_positions_data = []
+            for draggable_dict in user_answer:
+                # Draggable_dict is 1-to-1 {draggable_name: position}.
                 draggable_name = draggable_dict.keys()[0]
-                if draggable_name in self.correct_groups[groupname]:
-                    self.user_groups[groupname].append(draggable_name)
-                    self.user_positions[groupname]['user'].append(
+                if draggable_name in answer['draggables']:
+                    user_groups_data.append(draggable_name)
+                    user_positions_data.append(
                                             draggable_dict[draggable_name])
                     # proved that this is not excess
                     self.excess_draggables[draggable_name] = False
 
+            self.correct_groups.append(answer['draggables'])
+            self.correct_positions.append({answer['rule']: answer['targets']})
+            self.user_groups.append(user_groups_data)
+            self.user_positions.append({'user': user_positions_data})
+
+
 def grade(user_input, correct_answer):
     """ Creates DragAndDrop instance from user_input and correct_answer and
         calls DragAndDrop.grade for grading.
diff --git a/common/lib/capa/capa/verifiers/tests_draganddrop.py b/common/lib/capa/capa/verifiers/tests_draganddrop.py
index bcd024fa89..75a194cc6d 100644
--- a/common/lib/capa/capa/verifiers/tests_draganddrop.py
+++ b/common/lib/capa/capa/verifiers/tests_draganddrop.py
@@ -1,7 +1,8 @@
 import unittest
 
 import draganddrop
-from draganddrop import PositionsCompare
+from .draganddrop import PositionsCompare
+import json
 
 
 class Test_PositionsCompare(unittest.TestCase):
@@ -40,90 +41,314 @@ class Test_PositionsCompare(unittest.TestCase):
 
 class Test_DragAndDrop_Grade(unittest.TestCase):
 
+    def test_targets_are_draggable_1(self):
+        user_input = json.dumps([
+            {'p': 'p_l'},
+            {'up': {'first': {'p': 'p_l'}}}
+        ])
+
+        correct_answer = [
+            {
+                'draggables': ['p'],
+                'targets': [
+                    'p_l', 'p_r'
+                ],
+                'rule': 'anyof'
+            },
+            {
+                'draggables': ['up'],
+                'targets': [
+                    'p_l[p][first]'
+                ],
+                'rule': 'anyof'
+            }
+        ]
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_targets_are_draggable_2(self):
+        user_input = json.dumps([
+            {'p': 'p_l'},
+            {'p': 'p_r'},
+            {'s': 's_l'},
+            {'s': 's_r'},
+            {'up': {'1': {'p': 'p_l'}}},
+            {'up': {'3': {'p': 'p_l'}}},
+            {'up': {'1': {'p': 'p_r'}}},
+            {'up': {'3': {'p': 'p_r'}}},
+            {'up_and_down': {'1': {'s': 's_l'}}},
+            {'up_and_down': {'1': {'s': 's_r'}}}
+        ])
+
+        correct_answer = [
+            {
+                'draggables': ['p'],
+                'targets': ['p_l', 'p_r'],
+                'rule': 'unordered_equal'
+            },
+            {
+                'draggables': ['s'],
+                'targets': ['s_l', 's_r'],
+                'rule': 'unordered_equal'
+            },
+            {
+              'draggables': ['up_and_down'],
+              'targets': [
+                's_l[s][1]', 's_r[s][1]'
+              ],
+              'rule': 'unordered_equal'
+            },
+            {
+              'draggables': ['up'],
+              'targets': [
+                'p_l[p][1]', 'p_l[p][3]', 'p_r[p][1]', 'p_r[p][3]'
+              ],
+              'rule': 'unordered_equal'
+            }
+        ]
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_targets_are_draggable_2_manual_parsing(self):
+        user_input = json.dumps([
+            {'up': 'p_l[p][1]'},
+            {'p': 'p_l'},
+            {'up': 'p_l[p][3]'},
+            {'up': 'p_r[p][1]'},
+            {'p': 'p_r'},
+            {'up': 'p_r[p][3]'},
+            {'up_and_down': 's_l[s][1]'},
+            {'s': 's_l'},
+            {'up_and_down': 's_r[s][1]'},
+            {'s': 's_r'}
+        ])
+
+        correct_answer = [
+            {
+                'draggables': ['p'],
+                'targets': ['p_l', 'p_r'],
+                'rule': 'unordered_equal'
+            },
+            {
+                'draggables': ['s'],
+                'targets': ['s_l', 's_r'],
+                'rule': 'unordered_equal'
+            },
+            {
+              'draggables': ['up_and_down'],
+              'targets': [
+                's_l[s][1]', 's_r[s][1]'
+              ],
+              'rule': 'unordered_equal'
+            },
+            {
+              'draggables': ['up'],
+              'targets': [
+                'p_l[p][1]', 'p_l[p][3]', 'p_r[p][1]', 'p_r[p][3]'
+              ],
+              'rule': 'unordered_equal'
+            }
+        ]
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_targets_are_draggable_3_nested(self):
+        user_input = json.dumps([
+            {'molecule': 'left_side_tagret'},
+            {'molecule': 'right_side_tagret'},
+            {'p': {'p_target': {'molecule': 'left_side_tagret'}}},
+            {'p': {'p_target': {'molecule': 'right_side_tagret'}}},
+            {'s': {'s_target': {'molecule': 'left_side_tagret'}}},
+            {'s': {'s_target': {'molecule': 'right_side_tagret'}}},
+            {'up': {'1': {'p': {'p_target': {'molecule': 'left_side_tagret'}}}}},
+            {'up': {'3': {'p': {'p_target': {'molecule': 'left_side_tagret'}}}}},
+            {'up': {'1': {'p': {'p_target': {'molecule': 'right_side_tagret'}}}}},
+            {'up': {'3': {'p': {'p_target': {'molecule': 'right_side_tagret'}}}}},
+            {'up_and_down': {'1': {'s': {'s_target': {'molecule': 'left_side_tagret'}}}}},
+            {'up_and_down': {'1': {'s': {'s_target': {'molecule': 'right_side_tagret'}}}}}
+        ])
+
+        correct_answer = [
+            {
+                'draggables': ['molecule'],
+                'targets': ['left_side_tagret', 'right_side_tagret'],
+                'rule': 'unordered_equal'
+            },
+            {
+                'draggables': ['p'],
+                'targets': [
+                    'left_side_tagret[molecule][p_target]',
+                    'right_side_tagret[molecule][p_target]'
+                ],
+                'rule': 'unordered_equal'
+            },
+            {
+                'draggables': ['s'],
+                'targets': [
+                    'left_side_tagret[molecule][s_target]',
+                    'right_side_tagret[molecule][s_target]'
+                ],
+                'rule': 'unordered_equal'
+            },
+            {
+              'draggables': ['up_and_down'],
+              'targets': [
+                'left_side_tagret[molecule][s_target][s][1]',
+                'right_side_tagret[molecule][s_target][s][1]'
+              ],
+              'rule': 'unordered_equal'
+            },
+            {
+              'draggables': ['up'],
+              'targets': [
+                'left_side_tagret[molecule][p_target][p][1]',
+                'left_side_tagret[molecule][p_target][p][3]',
+                'right_side_tagret[molecule][p_target][p][1]',
+                'right_side_tagret[molecule][p_target][p][3]'
+              ],
+              'rule': 'unordered_equal'
+            }
+        ]
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_targets_are_draggable_4_real_example(self):
+        user_input = json.dumps([
+            {'single_draggable': 's_l'},
+            {'single_draggable': 's_r'},
+            {'single_draggable': 'p_sigma'},
+            {'single_draggable': 'p_sigma*'},
+            {'single_draggable': 's_sigma'},
+            {'single_draggable': 's_sigma*'},
+            {'double_draggable': 'p_pi*'},
+            {'double_draggable': 'p_pi'},
+            {'triple_draggable': 'p_l'},
+            {'triple_draggable': 'p_r'},
+            {'up': {'1': {'triple_draggable': 'p_l'}}},
+            {'up': {'2': {'triple_draggable': 'p_l'}}},
+            {'up': {'2': {'triple_draggable': 'p_r'}}},
+            {'up': {'3': {'triple_draggable': 'p_r'}}},
+            {'up_and_down': {'1': {'single_draggable': 's_l'}}},
+            {'up_and_down': {'1': {'single_draggable': 's_r'}}},
+            {'up_and_down': {'1': {'single_draggable': 's_sigma'}}},
+            {'up_and_down': {'1': {'single_draggable': 's_sigma*'}}},
+            {'up_and_down': {'1': {'double_draggable': 'p_pi'}}},
+            {'up_and_down': {'2': {'double_draggable': 'p_pi'}}}
+        ])
+
+        # 10 targets:
+        # s_l, s_r, p_l, p_r, s_sigma, s_sigma*, p_pi, p_sigma, p_pi*, p_sigma*
+        #
+        # 3 draggable objects, which have targets (internal target ids - 1, 2, 3):
+        # single_draggable, double_draggable, triple_draggable
+        #
+        # 2 draggable objects:
+        # up, up_and_down
+        correct_answer = [
+            {
+              'draggables': ['triple_draggable'],
+              'targets': ['p_l', 'p_r'],
+              'rule': 'unordered_equal'
+            },
+            {
+              'draggables': ['double_draggable'],
+              'targets': ['p_pi', 'p_pi*'],
+              'rule': 'unordered_equal'
+            },
+            {
+              'draggables': ['single_draggable'],
+              'targets': ['s_l', 's_r', 's_sigma', 's_sigma*', 'p_sigma', 'p_sigma*'],
+              'rule': 'unordered_equal'
+            },
+            {
+              'draggables': ['up'],
+              'targets': ['p_l[triple_draggable][1]', 'p_l[triple_draggable][2]',
+              'p_r[triple_draggable][2]', 'p_r[triple_draggable][3]'],
+              'rule': 'unordered_equal'
+            },
+            {
+              'draggables': ['up_and_down'],
+              'targets': ['s_l[single_draggable][1]', 's_r[single_draggable][1]',
+              's_sigma[single_draggable][1]', 's_sigma*[single_draggable][1]',
+              'p_pi[double_draggable][1]', 'p_pi[double_draggable][2]'],
+              'rule': 'unordered_equal'
+            },
+
+        ]
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
     def test_targets_true(self):
-        user_input = '{"draggables": [{"1": "t1"}, \
-         {"name_with_icon": "t2"}]}'
-        correct_answer = {'1':              't1', 'name_with_icon': 't2'}
+        user_input = '[{"1": "t1"}, \
+         {"name_with_icon": "t2"}]'
+        correct_answer = {'1': 't1', 'name_with_icon': 't2'}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_expect_no_actions_wrong(self):
-        user_input = '{"draggables": [{"1": "t1"}, \
-         {"name_with_icon": "t2"}]}'
+        user_input = '[{"1": "t1"}, \
+         {"name_with_icon": "t2"}]'
         correct_answer = []
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
     def test_expect_no_actions_right(self):
-        user_input = '{"draggables": []}'
+        user_input = '[]'
         correct_answer = []
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
 
     def test_targets_false(self):
-        user_input = '{"draggables": [{"1": "t1"}, \
-        {"name_with_icon": "t2"}]}'
-        correct_answer = {'1':              't3', 'name_with_icon': 't2'}
+        user_input = '[{"1": "t1"}, \
+        {"name_with_icon": "t2"}]'
+        correct_answer = {'1': 't3', 'name_with_icon': 't2'}
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
     def test_multiple_images_per_target_true(self):
-        user_input = '{\
-        "draggables": [{"1": "t1"}, {"name_with_icon": "t2"}, \
-        {"2": "t1"}]}'
-        correct_answer = {'1':              't1', 'name_with_icon': 't2',
+        user_input = '[{"1": "t1"}, {"name_with_icon": "t2"}, \
+        {"2": "t1"}]'
+        correct_answer = {'1': 't1', 'name_with_icon': 't2',
         '2': 't1'}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_multiple_images_per_target_false(self):
-        user_input = '{\
-        "draggables": [{"1": "t1"}, {"name_with_icon": "t2"}, \
-        {"2": "t1"}]}'
-        correct_answer = {'1':              't2', 'name_with_icon': 't2',
+        user_input = '[{"1": "t1"}, {"name_with_icon": "t2"}, \
+        {"2": "t1"}]'
+        correct_answer = {'1': 't2', 'name_with_icon': 't2',
         '2': 't1'}
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
     def test_targets_and_positions(self):
-        user_input = '{"draggables": [{"1": [10,10]}, \
-         {"name_with_icon": [[10,10],4]}]}'
+        user_input = '[{"1": [10,10]}, \
+         {"name_with_icon": [[10,10],4]}]'
         correct_answer = {'1':  [10, 10], 'name_with_icon': [[10, 10], 4]}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_position_and_targets(self):
-        user_input = '{"draggables": [{"1": "t1"}, {"name_with_icon": "t2"}]}'
+        user_input = '[{"1": "t1"}, {"name_with_icon": "t2"}]'
         correct_answer = {'1':    't1', 'name_with_icon': 't2'}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_positions_exact(self):
-        user_input = '{"draggables": \
-        [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
+        user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]'
         correct_answer = {'1':   [10, 10], 'name_with_icon': [20, 20]}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_positions_false(self):
-        user_input = '{"draggables": \
-        [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
+        user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]'
         correct_answer = {'1':   [25, 25], 'name_with_icon': [20, 20]}
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
     def test_positions_true_in_radius(self):
-        user_input = '{"draggables": \
-        [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
+        user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]'
         correct_answer = {'1':   [14, 14], 'name_with_icon': [20, 20]}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_positions_true_in_manual_radius(self):
-        user_input = '{"draggables": \
-        [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
+        user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]'
         correct_answer = {'1':   [[40, 10], 30], 'name_with_icon': [20, 20]}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_positions_false_in_manual_radius(self):
-        user_input = '{"draggables": \
-        [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
+        user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]'
         correct_answer = {'1': [[40, 10], 29], 'name_with_icon': [20, 20]}
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
     def test_correct_answer_not_has_key_from_user_answer(self):
-        user_input = '{"draggables": [{"1": "t1"}, \
-        {"name_with_icon": "t2"}]}'
+        user_input = '[{"1": "t1"}, {"name_with_icon": "t2"}]'
         correct_answer = {'3':   't3', 'name_with_icon': 't2'}
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
@@ -131,20 +356,20 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
         """Draggables can be places anywhere on base image.
             Place grass in the middle of the image and ant in the
             right upper corner."""
-        user_input = '{"draggables": \
-        [{"ant":[610.5,57.449951171875]},{"grass":[322.5,199.449951171875]}]}'
+        user_input = '[{"ant":[610.5,57.449951171875]},\
+            {"grass":[322.5,199.449951171875]}]'
 
         correct_answer = {'grass':     [[300, 200], 200], 'ant': [[500, 0], 200]}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_lcao_correct(self):
         """Describe carbon molecule in LCAO-MO"""
-        user_input = '{"draggables":[{"1":"s_left"}, \
+        user_input = '[{"1":"s_left"}, \
         {"5":"s_right"},{"4":"s_sigma"},{"6":"s_sigma_star"},{"7":"p_left_1"}, \
         {"8":"p_left_2"},{"10":"p_right_1"},{"9":"p_right_2"}, \
         {"2":"p_pi_1"},{"3":"p_pi_2"},{"11":"s_sigma_name"}, \
         {"13":"s_sigma_star_name"},{"15":"p_pi_name"},{"16":"p_pi_star_name"}, \
-        {"12":"p_sigma_name"},{"14":"p_sigma_star_name"}]}'
+        {"12":"p_sigma_name"},{"14":"p_sigma_star_name"}]'
 
         correct_answer = [{
         'draggables': ['1', '2', '3', '4', '5', '6'],
@@ -178,12 +403,12 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_lcao_extra_element_incorrect(self):
         """Describe carbon molecule in LCAO-MO"""
-        user_input = '{"draggables":[{"1":"s_left"}, \
+        user_input = '[{"1":"s_left"}, \
         {"5":"s_right"},{"4":"s_sigma"},{"6":"s_sigma_star"},{"7":"p_left_1"}, \
         {"8":"p_left_2"},{"17":"p_left_3"},{"10":"p_right_1"},{"9":"p_right_2"}, \
         {"2":"p_pi_1"},{"3":"p_pi_2"},{"11":"s_sigma_name"}, \
         {"13":"s_sigma_star_name"},{"15":"p_pi_name"},{"16":"p_pi_star_name"}, \
-        {"12":"p_sigma_name"},{"14":"p_sigma_star_name"}]}'
+        {"12":"p_sigma_name"},{"14":"p_sigma_star_name"}]'
 
         correct_answer = [{
         'draggables': ['1', '2', '3', '4', '5', '6'],
@@ -217,9 +442,9 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_reuse_draggable_no_mupliples(self):
         """Test reusable draggables (no mupltiple draggables per target)"""
-        user_input = '{"draggables":[{"1":"target1"}, \
+        user_input = '[{"1":"target1"}, \
         {"2":"target2"},{"1":"target3"},{"2":"target4"},{"2":"target5"}, \
-        {"3":"target6"}]}'
+        {"3":"target6"}]'
         correct_answer = [
         {
             'draggables': ['1'],
@@ -240,9 +465,9 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_reuse_draggable_with_mupliples(self):
         """Test reusable draggables with mupltiple draggables per target"""
-        user_input = '{"draggables":[{"1":"target1"}, \
+        user_input = '[{"1":"target1"}, \
         {"2":"target2"},{"1":"target1"},{"2":"target4"},{"2":"target4"}, \
-        {"3":"target6"}]}'
+        {"3":"target6"}]'
         correct_answer = [
         {
             'draggables': ['1'],
@@ -263,10 +488,10 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_reuse_many_draggable_with_mupliples(self):
         """Test reusable draggables with mupltiple draggables per target"""
-        user_input = '{"draggables":[{"1":"target1"}, \
+        user_input = '[{"1":"target1"}, \
         {"2":"target2"},{"1":"target1"},{"2":"target4"},{"2":"target4"}, \
         {"3":"target6"}, {"4": "target3"}, {"5": "target4"}, \
-        {"5": "target5"}, {"6": "target2"}]}'
+        {"5": "target5"}, {"6": "target2"}]'
         correct_answer = [
         {
             'draggables': ['1', '4'],
@@ -292,12 +517,12 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_reuse_many_draggable_with_mupliples_wrong(self):
         """Test reusable draggables with mupltiple draggables per target"""
-        user_input = '{"draggables":[{"1":"target1"}, \
+        user_input = '[{"1":"target1"}, \
         {"2":"target2"},{"1":"target1"}, \
         {"2":"target3"}, \
         {"2":"target4"}, \
         {"3":"target6"}, {"4": "target3"}, {"5": "target4"}, \
-        {"5": "target5"}, {"6": "target2"}]}'
+        {"5": "target5"}, {"6": "target2"}]'
         correct_answer = [
         {
             'draggables': ['1', '4'],
@@ -323,10 +548,10 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_label_10_targets_with_a_b_c_false(self):
         """Test reusable draggables (no mupltiple draggables per target)"""
-        user_input = '{"draggables":[{"a":"target1"}, \
+        user_input = '[{"a":"target1"}, \
         {"b":"target2"},{"c":"target3"},{"a":"target4"},{"b":"target5"}, \
         {"c":"target6"}, {"a":"target7"},{"b":"target8"},{"c":"target9"}, \
-         {"a":"target1"}]}'
+         {"a":"target1"}]'
         correct_answer = [
         {
             'draggables': ['a'],
@@ -347,10 +572,10 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_label_10_targets_with_a_b_c_(self):
         """Test reusable draggables (no mupltiple draggables per target)"""
-        user_input = '{"draggables":[{"a":"target1"}, \
+        user_input = '[{"a":"target1"}, \
         {"b":"target2"},{"c":"target3"},{"a":"target4"},{"b":"target5"}, \
         {"c":"target6"}, {"a":"target7"},{"b":"target8"},{"c":"target9"}, \
-         {"a":"target10"}]}'
+         {"a":"target10"}]'
         correct_answer = [
         {
             'draggables': ['a'],
@@ -371,10 +596,10 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_label_10_targets_with_a_b_c_multiple(self):
         """Test reusable draggables  (mupltiple draggables per target)"""
-        user_input = '{"draggables":[{"a":"target1"}, \
+        user_input = '[{"a":"target1"}, \
         {"b":"target2"},{"c":"target3"},{"b":"target5"}, \
         {"c":"target6"}, {"a":"target7"},{"b":"target8"},{"c":"target9"}, \
-         {"a":"target1"}]}'
+         {"a":"target1"}]'
         correct_answer = [
         {
             'draggables': ['a', 'a', 'a'],
@@ -395,10 +620,10 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_label_10_targets_with_a_b_c_multiple_false(self):
         """Test reusable draggables  (mupltiple draggables per target)"""
-        user_input = '{"draggables":[{"a":"target1"}, \
+        user_input = '[{"a":"target1"}, \
         {"b":"target2"},{"c":"target3"},{"a":"target4"},{"b":"target5"}, \
         {"c":"target6"}, {"a":"target7"},{"b":"target8"},{"c":"target9"}, \
-         {"a":"target1"}]}'
+         {"a":"target1"}]'
         correct_answer = [
         {
             'draggables': ['a', 'a', 'a'],
@@ -419,10 +644,10 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_label_10_targets_with_a_b_c_reused(self):
         """Test a b c in 10 labels reused"""
-        user_input = '{"draggables":[{"a":"target1"}, \
+        user_input = '[{"a":"target1"}, \
         {"b":"target2"},{"c":"target3"},{"b":"target5"}, \
         {"c":"target6"}, {"b":"target8"},{"c":"target9"}, \
-         {"a":"target10"}]}'
+         {"a":"target10"}]'
         correct_answer = [
         {
             'draggables': ['a', 'a'],
@@ -443,10 +668,10 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_label_10_targets_with_a_b_c_reused_false(self):
         """Test a b c in 10 labels reused false"""
-        user_input = '{"draggables":[{"a":"target1"}, \
+        user_input = '[{"a":"target1"}, \
         {"b":"target2"},{"c":"target3"},{"b":"target5"}, {"a":"target8"},\
         {"c":"target6"}, {"b":"target8"},{"c":"target9"}, \
-         {"a":"target10"}]}'
+         {"a":"target10"}]'
         correct_answer = [
         {
             'draggables': ['a', 'a'],
@@ -467,9 +692,9 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_mixed_reuse_and_not_reuse(self):
         """Test reusable draggables """
-        user_input = '{"draggables":[{"a":"target1"}, \
+        user_input = '[{"a":"target1"}, \
         {"b":"target2"},{"c":"target3"}, {"a":"target4"},\
-         {"a":"target5"}]}'
+         {"a":"target5"}]'
         correct_answer = [
         {
             'draggables': ['a', 'b'],
@@ -485,8 +710,8 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_mixed_reuse_and_not_reuse_number(self):
         """Test reusable draggables with number """
-        user_input = '{"draggables":[{"a":"target1"}, \
-        {"b":"target2"},{"c":"target3"}, {"a":"target4"}]}'
+        user_input = '[{"a":"target1"}, \
+        {"b":"target2"},{"c":"target3"}, {"a":"target4"}]'
         correct_answer = [
         {
             'draggables': ['a', 'a', 'b'],
@@ -502,8 +727,8 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_mixed_reuse_and_not_reuse_number_false(self):
         """Test reusable draggables with numbers, but wrong"""
-        user_input = '{"draggables":[{"a":"target1"}, \
-        {"b":"target2"},{"c":"target3"}, {"a":"target4"}, {"a":"target10"}]}'
+        user_input = '[{"a":"target1"}, \
+        {"b":"target2"},{"c":"target3"}, {"a":"target4"}, {"a":"target10"}]'
         correct_answer = [
         {
             'draggables': ['a', 'a', 'b'],
@@ -518,9 +743,9 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
     def test_alternative_correct_answer(self):
-        user_input = '{"draggables":[{"name_with_icon":"t1"},\
+        user_input = '[{"name_with_icon":"t1"},\
         {"name_with_icon":"t1"},{"name_with_icon":"t1"},{"name4":"t1"}, \
-        {"name4":"t1"}]}'
+        {"name4":"t1"}]'
         correct_answer = [
         {'draggables': ['name4'], 'targets': ['t1', 't1'], 'rule': 'exact'},
         {'draggables': ['name_with_icon'], 'targets': ['t1', 't1', 't1'],
@@ -533,14 +758,13 @@ class Test_DragAndDrop_Populate(unittest.TestCase):
 
     def test_1(self):
         correct_answer = {'1': [[40, 10], 29], 'name_with_icon': [20, 20]}
-        user_input = '{"draggables": \
-        [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
+        user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]'
         dnd = draganddrop.DragAndDrop(correct_answer, user_input)
 
-        correct_groups = {'1': ['name_with_icon'], '0': ['1']}
-        correct_positions = {'1': {'exact': [[20, 20]]}, '0': {'exact': [[[40, 10], 29]]}}
-        user_groups = {'1': [u'name_with_icon'], '0': [u'1']}
-        user_positions = {'1': {'user': [[20, 20]]}, '0': {'user': [[10, 10]]}}
+        correct_groups = [['1'], ['name_with_icon']]
+        correct_positions = [{'exact': [[[40, 10], 29]]}, {'exact': [[20, 20]]}]
+        user_groups = [['1'], ['name_with_icon']]
+        user_positions = [{'user': [[10, 10]]}, {'user': [[20, 20]]}]
 
         self.assertEqual(correct_groups, dnd.correct_groups)
         self.assertEqual(correct_positions, dnd.correct_positions)
@@ -551,49 +775,49 @@ class Test_DragAndDrop_Populate(unittest.TestCase):
 class Test_DraAndDrop_Compare_Positions(unittest.TestCase):
 
     def test_1(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
         self.assertTrue(dnd.compare_positions(correct=[[1, 1], [2, 3]],
                                               user=[[2, 3], [1, 1]],
                                               flag='anyof'))
 
     def test_2a(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
         self.assertTrue(dnd.compare_positions(correct=[[1, 1], [2, 3]],
                                                user=[[2, 3], [1, 1]],
                                                flag='exact'))
 
     def test_2b(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
         self.assertFalse(dnd.compare_positions(correct=[[1, 1], [2, 3]],
                                                user=[[2, 13], [1, 1]],
                                                flag='exact'))
 
     def test_3(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
         self.assertFalse(dnd.compare_positions(correct=["a", "b"],
                                                user=["a", "b", "c"],
                                                flag='anyof'))
 
     def test_4(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
         self.assertTrue(dnd.compare_positions(correct=["a", "b", "c"],
                                               user=["a", "b"],
                                               flag='anyof'))
 
     def test_5(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
         self.assertFalse(dnd.compare_positions(correct=["a", "b", "c"],
                                                user=["a", "c", "b"],
                                                flag='exact'))
 
     def test_6(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
         self.assertTrue(dnd.compare_positions(correct=["a", "b", "c"],
                                                user=["a", "c", "b"],
                                                flag='anyof'))
 
     def test_7(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
         self.assertFalse(dnd.compare_positions(correct=["a", "b", "b"],
                                                user=["a", "c", "b"],
                                                flag='anyof'))
diff --git a/common/lib/capa/capa/xqueue_interface.py b/common/lib/capa/capa/xqueue_interface.py
index 8dbe2c84aa..5cf2488af0 100644
--- a/common/lib/capa/capa/xqueue_interface.py
+++ b/common/lib/capa/capa/xqueue_interface.py
@@ -7,7 +7,7 @@ import logging
 import requests
 
 
-log = logging.getLogger('mitx.' + __name__)
+log = logging.getLogger(__name__)
 dateformat = '%Y%m%d%H%M%S'
 
 
diff --git a/common/lib/capa/setup.py b/common/lib/capa/setup.py
index 9c724dec8b..d9c813f55c 100644
--- a/common/lib/capa/setup.py
+++ b/common/lib/capa/setup.py
@@ -4,5 +4,5 @@ setup(
     name="capa",
     version="0.1",
     packages=find_packages(exclude=["tests"]),
-    install_requires=['distribute==0.6.34', 'pyparsing==1.5.6'],
+    install_requires=['distribute==0.6.30', 'pyparsing==1.5.6'],
 )
diff --git a/common/lib/xmodule/setup.py b/common/lib/xmodule/setup.py
index 835085d8ea..85d42690b9 100644
--- a/common/lib/xmodule/setup.py
+++ b/common/lib/xmodule/setup.py
@@ -28,6 +28,7 @@ setup(
             "image = xmodule.backcompat_module:TranslateCustomTagDescriptor",
             "error = xmodule.error_module:ErrorDescriptor",
             "peergrading = xmodule.peer_grading_module:PeerGradingDescriptor",
+            "poll_question = xmodule.poll_module:PollDescriptor",
             "problem = xmodule.capa_module:CapaDescriptor",
             "problemset = xmodule.seq_module:SequenceDescriptor",
             "randomize = xmodule.randomize_module:RandomizeDescriptor",
@@ -45,6 +46,7 @@ setup(
             "static_tab = xmodule.html_module:StaticTabDescriptor",
             "custom_tag_template = xmodule.raw_module:RawDescriptor",
             "about = xmodule.html_module:AboutDescriptor",
+            "wrapper = xmodule.wrapper_module:WrapperDescriptor",
             "graphical_slider_tool = xmodule.gst_module:GraphicalSliderToolDescriptor",
             "annotatable = xmodule.annotatable_module:AnnotatableDescriptor",
             "foldit = xmodule.foldit_module:FolditDescriptor",
diff --git a/common/lib/xmodule/xmodule/abtest_module.py b/common/lib/xmodule/xmodule/abtest_module.py
index 537d864127..0e1c66df8e 100644
--- a/common/lib/xmodule/xmodule/abtest_module.py
+++ b/common/lib/xmodule/xmodule/abtest_module.py
@@ -1,4 +1,3 @@
-import json
 import random
 import logging
 from lxml import etree
@@ -7,6 +6,7 @@ from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
 from xmodule.xml_module import XmlDescriptor
 from xmodule.exceptions import InvalidDefinitionError
+from xblock.core import String, Scope, Object, BlockScope
 
 DEFAULT = "_DEFAULT_GROUP"
 
@@ -31,29 +31,42 @@ def group_from_value(groups, v):
     return g
 
 
-class ABTestModule(XModule):
+class ABTestFields(object):
+    group_portions = Object(help="What proportions of students should go in each group", default={DEFAULT: 1}, scope=Scope.content)
+    group_assignments = Object(help="What group this user belongs to", scope=Scope.student_preferences, default={})
+    group_content = Object(help="What content to display to each group", scope=Scope.content, default={DEFAULT: []})
+    experiment = String(help="Experiment that this A/B test belongs to", scope=Scope.content)
+    has_children = True
+
+
+class ABTestModule(ABTestFields, XModule):
     """
     Implements an A/B test with an aribtrary number of competing groups
     """
 
-    def __init__(self, system, location, definition, descriptor, instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor, instance_state, shared_state, **kwargs)
-
-        if shared_state is None:
+    def __init__(self, *args, **kwargs):
+        XModule.__init__(self, *args, **kwargs)
 
+        if self.group is None:
             self.group = group_from_value(
-                self.definition['data']['group_portions'].items(),
+                self.group_portions.items(),
                 random.uniform(0, 1)
             )
-        else:
-            shared_state = json.loads(shared_state)
-            self.group = shared_state['group']
 
-    def get_shared_state(self):
-        return json.dumps({'group': self.group})
+    @property
+    def group(self):
+        return self.group_assignments.get(self.experiment)
+
+    @group.setter
+    def group(self, value):
+        self.group_assignments[self.experiment] = value
+
+    @group.deleter
+    def group(self):
+        del self.group_assignments[self.experiment]
 
     def get_child_descriptors(self):
-        active_locations = set(self.definition['data']['group_content'][self.group])
+        active_locations = set(self.group_content[self.group])
         return [desc for desc in self.descriptor.get_children() if desc.location.url() in active_locations]
 
     def displayable_items(self):
@@ -64,43 +77,11 @@ class ABTestModule(XModule):
 
 # TODO (cpennington): Use Groups should be a first class object, rather than being
 # managed by ABTests
-class ABTestDescriptor(RawDescriptor, XmlDescriptor):
+class ABTestDescriptor(ABTestFields, RawDescriptor, XmlDescriptor):
     module_class = ABTestModule
 
     template_dir_name = "abtest"
 
-    def __init__(self, system, definition=None, **kwargs):
-        """
-        definition is a dictionary with the following layout:
-            {'data': {
-                'experiment': 'the name of the experiment',
-                'group_portions': {
-                    'group_a': 0.1,
-                    'group_b': 0.2
-                },
-                'group_contents': {
-                    'group_a': [
-                        'url://for/content/module/1',
-                        'url://for/content/module/2',
-                    ],
-                    'group_b': [
-                        'url://for/content/module/3',
-                    ],
-                    DEFAULT: [
-                        'url://for/default/content/1'
-                    ]
-                }
-            },
-            'children': [
-                'url://for/content/module/1',
-                'url://for/content/module/2',
-                'url://for/content/module/3',
-                'url://for/default/content/1',
-            ]}
-        """
-        kwargs['shared_state_key'] = definition['data']['experiment']
-        RawDescriptor.__init__(self, system, definition, **kwargs)
-
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         """
@@ -118,19 +99,16 @@ class ABTestDescriptor(RawDescriptor, XmlDescriptor):
                 "ABTests must specify an experiment. Not found in:\n{xml}"
                 .format(xml=etree.tostring(xml_object, pretty_print=True)))
 
-        definition = {
-            'data': {
-                'experiment': experiment,
-                'group_portions': {},
-                'group_content': {DEFAULT: []},
-            },
-            'children': []}
+        group_portions = {}
+        group_content = {}
+        children = []
+
         for group in xml_object:
             if group.tag == 'default':
                 name = DEFAULT
             else:
                 name = group.get('name')
-                definition['data']['group_portions'][name] = float(group.get('portion', 0))
+                group_portions[name] = float(group.get('portion', 0))
 
             child_content_urls = []
             for child in group:
@@ -140,29 +118,33 @@ class ABTestDescriptor(RawDescriptor, XmlDescriptor):
                     log.exception("Unable to load child when parsing ABTest. Continuing...")
                     continue
 
-            definition['data']['group_content'][name] = child_content_urls
-            definition['children'].extend(child_content_urls)
+            group_content[name] = child_content_urls
+            children.extend(child_content_urls)
 
         default_portion = 1 - sum(
-            portion for (name, portion) in definition['data']['group_portions'].items())
+            portion for (name, portion) in group_portions.items()
+        )
 
         if default_portion < 0:
             raise InvalidDefinitionError("ABTest portions must add up to less than or equal to 1")
 
-        definition['data']['group_portions'][DEFAULT] = default_portion
-        definition['children'].sort()
+        group_portions[DEFAULT] = default_portion
+        children.sort()
 
-        return definition
+        return {
+            'group_portions': group_portions,
+            'group_content': group_content,
+        }, children
 
     def definition_to_xml(self, resource_fs):
         xml_object = etree.Element('abtest')
-        xml_object.set('experiment', self.definition['data']['experiment'])
-        for name, group in self.definition['data']['group_content'].items():
+        xml_object.set('experiment', self.experiment)
+        for name, group in self.group_content.items():
             if name == DEFAULT:
                 group_elem = etree.SubElement(xml_object, 'default')
             else:
                 group_elem = etree.SubElement(xml_object, 'group', attrib={
-                    'portion': str(self.definition['data']['group_portions'][name]),
+                    'portion': str(self.group_portions[name]),
                     'name': name,
                 })
 
@@ -172,6 +154,5 @@ class ABTestDescriptor(RawDescriptor, XmlDescriptor):
 
         return xml_object
 
-
     def has_dynamic_children(self):
         return True
diff --git a/common/lib/xmodule/xmodule/annotatable_module.py b/common/lib/xmodule/xmodule/annotatable_module.py
index f093b76f52..db2aa13cb7 100644
--- a/common/lib/xmodule/xmodule/annotatable_module.py
+++ b/common/lib/xmodule/xmodule/annotatable_module.py
@@ -5,13 +5,17 @@ from pkg_resources import resource_string, resource_listdir
 
 from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
-from xmodule.modulestore.mongo import MongoModuleStore
-from xmodule.modulestore.django import modulestore
 from xmodule.contentstore.content import StaticContent
+from xblock.core import Scope, String
 
 log = logging.getLogger(__name__)
 
-class AnnotatableModule(XModule):
+
+class AnnotatableFields(object):
+    data = String(help="XML data for the annotation", scope=Scope.content)
+
+
+class AnnotatableModule(AnnotatableFields, XModule):
     js = {'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee'),
                      resource_string(__name__, 'js/src/collapsible.coffee'),
                      resource_string(__name__, 'js/src/html/display.coffee'),
@@ -22,6 +26,17 @@ class AnnotatableModule(XModule):
     css = {'scss': [resource_string(__name__, 'css/annotatable/display.scss')]}
     icon_class = 'annotatable'
 
+
+    def __init__(self, *args, **kwargs):
+        XModule.__init__(self, *args, **kwargs)
+
+        xmltree = etree.fromstring(self.data)
+
+        self.instructions = self._extract_instructions(xmltree)
+        self.content = etree.tostring(xmltree, encoding='unicode')
+        self.element_id = self.location.html_id()
+        self.highlight_colors = ['yellow', 'orange', 'purple', 'blue', 'green']
+
     def _get_annotation_class_attr(self, index, el):
         """ Returns a dict with the CSS class attribute to set on the annotation
             and an XML key to delete from the element.
@@ -103,7 +118,7 @@ class AnnotatableModule(XModule):
     def get_html(self):
         """ Renders parameters to template. """
         context = {
-            'display_name': self.display_name,
+            'display_name': self.display_name_with_default,
             'element_id': self.element_id,
             'instructions_html': self.instructions,
             'content_html': self._render_content()
@@ -111,19 +126,8 @@ class AnnotatableModule(XModule):
 
         return self.system.render_template('annotatable.html', context)
 
-    def __init__(self, system, location, definition, descriptor,
-                 instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor,
-                         instance_state, shared_state, **kwargs)
 
-        xmltree = etree.fromstring(self.definition['data'])
-
-        self.instructions = self._extract_instructions(xmltree)
-        self.content = etree.tostring(xmltree, encoding='unicode')
-        self.element_id = self.location.html_id()
-        self.highlight_colors = ['yellow', 'orange', 'purple', 'blue', 'green']
-
-class AnnotatableDescriptor(RawDescriptor):
+class AnnotatableDescriptor(AnnotatableFields, RawDescriptor):
     module_class = AnnotatableModule
     stores_state = True
     template_dir_name = "annotatable"
diff --git a/common/lib/xmodule/xmodule/backcompat_module.py b/common/lib/xmodule/xmodule/backcompat_module.py
index 40ffd46d1c..9e7b132e9e 100644
--- a/common/lib/xmodule/xmodule/backcompat_module.py
+++ b/common/lib/xmodule/xmodule/backcompat_module.py
@@ -1,7 +1,7 @@
 """
 These modules exist to translate old format XML into newer, semantic forms
 """
-from x_module import XModuleDescriptor
+from .x_module import XModuleDescriptor
 from lxml import etree
 from functools import wraps
 import logging
diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 2597690572..e66b1d3495 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -6,25 +6,45 @@ import hashlib
 import json
 import logging
 import traceback
-import re
 import sys
 
-from datetime import timedelta
 from lxml import etree
 from pkg_resources import resource_string
 
 from capa.capa_problem import LoncapaProblem
 from capa.responsetypes import StudentInputError
 from capa.util import convert_files_to_filenames
-from progress import Progress
+from .progress import Progress
 from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
 from xmodule.exceptions import NotFoundError
+from xblock.core import Integer, Scope, BlockScope, ModelType, String, Boolean, Object, Float
+from .fields import Timedelta
 
 log = logging.getLogger("mitx.courseware")
 
-#-----------------------------------------------------------------------------
-TIMEDELTA_REGEX = re.compile(r'^((?P<days>\d+?) day(?:s?))?(\s)?((?P<hours>\d+?) hour(?:s?))?(\s)?((?P<minutes>\d+?) minute(?:s)?)?(\s)?((?P<seconds>\d+?) second(?:s)?)?$')
+
+class StringyInteger(Integer):
+    """
+    A model type that converts from strings to integers when reading from json
+    """
+    def from_json(self, value):
+        try:
+            return int(value)
+        except:
+            return None
+
+
+class StringyFloat(Float):
+    """
+    A model type that converts from string to floats when reading from json
+    """
+    def from_json(self, value):
+        try:
+            return float(value)
+        except:
+            return None
+
 
 # Generated this many different variants of problems with rerandomize=per_student
 NUM_RANDOMIZATION_BINS = 20
@@ -45,41 +65,15 @@ def randomization_bin(seed, problem_id):
     return int(h.hexdigest()[:7], 16) % NUM_RANDOMIZATION_BINS
 
 
-def only_one(lst, default="", process=lambda x: x):
-    """
-    If lst is empty, returns default
+class Randomization(String):
+    def from_json(self, value):
+        if value in ("", "true"):
+            return "always"
+        elif value == "false":
+            return "per_student"
+        return value
 
-    If lst has a single element, applies process to that element and returns it.
-
-    Otherwise, raises an exception.
-    """
-    if len(lst) == 0:
-        return default
-    elif len(lst) == 1:
-        return process(lst[0])
-    else:
-        raise Exception('Malformed XML: expected at most one element in list.')
-
-
-def parse_timedelta(time_str):
-    """
-    time_str: A string with the following components:
-        <D> day[s] (optional)
-        <H> hour[s] (optional)
-        <M> minute[s] (optional)
-        <S> second[s] (optional)
-
-    Returns a datetime.timedelta parsed from the string
-    """
-    parts = TIMEDELTA_REGEX.match(time_str)
-    if not parts:
-        return
-    parts = parts.groupdict()
-    time_params = {}
-    for (name, param) in parts.iteritems():
-        if param:
-            time_params[name] = int(param)
-    return timedelta(**time_params)
+    to_json = from_json
 
 
 class ComplexEncoder(json.JSONEncoder):
@@ -89,13 +83,32 @@ class ComplexEncoder(json.JSONEncoder):
         return json.JSONEncoder.default(self, obj)
 
 
-class CapaModule(XModule):
+class CapaFields(object):
+    attempts = StringyInteger(help="Number of attempts taken by the student on this problem", default=0, scope=Scope.student_state)
+    max_attempts = StringyInteger(help="Maximum number of attempts that a student is allowed", scope=Scope.settings)
+    due = String(help="Date that this problem is due by", scope=Scope.settings)
+    graceperiod = Timedelta(help="Amount of time after the due date that submissions will be accepted", scope=Scope.settings)
+    showanswer = String(help="When to show the problem answer to the student", scope=Scope.settings, default="closed")
+    force_save_button = Boolean(help="Whether to force the save button to appear on the page", scope=Scope.settings, default=False)
+    rerandomize = Randomization(help="When to rerandomize the problem", default="always", scope=Scope.settings)
+    data = String(help="XML data for the problem", scope=Scope.content)
+    correct_map = Object(help="Dictionary with the correctness of current student answers", scope=Scope.student_state, default={})
+    student_answers = Object(help="Dictionary with the current student responses", scope=Scope.student_state)
+    done = Boolean(help="Whether the student has answered the problem", scope=Scope.student_state)
+    display_name = String(help="Display name for this module", scope=Scope.settings)
+    seed = StringyInteger(help="Random seed for this student", scope=Scope.student_state)
+    weight = StringyFloat(help="How much to weight this problem by", scope=Scope.settings)
+    markdown = String(help="Markdown source of this module", scope=Scope.settings)
+
+
+class CapaModule(CapaFields, XModule):
     '''
     An XModule implementing LonCapa format problems, implemented by way of
     capa.capa_problem.LoncapaProblem
     '''
     icon_class = 'problem'
 
+
     js = {'coffee': [resource_string(__name__, 'js/src/capa/display.coffee'),
                      resource_string(__name__, 'js/src/collapsible.coffee'),
                      resource_string(__name__, 'js/src/javascript_loader.coffee'),
@@ -107,61 +120,25 @@ class CapaModule(XModule):
     js_module_name = "Problem"
     css = {'scss': [resource_string(__name__, 'css/capa/display.scss')]}
 
-    def __init__(self, system, location, definition, descriptor, instance_state=None,
-                 shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor, instance_state,
-                         shared_state, **kwargs)
+    def __init__(self, system, location, descriptor, model_data):
+        XModule.__init__(self, system, location, descriptor, model_data)
 
-        self.attempts = 0
-        self.max_attempts = None
-
-        dom2 = etree.fromstring(definition['data'])
-
-        display_due_date_string = self.metadata.get('due', None)
-        if display_due_date_string is not None:
-            self.display_due_date = dateutil.parser.parse(display_due_date_string)
-            #log.debug("Parsed " + display_due_date_string +
-            #          " to " + str(self.display_due_date))
+        if self.due:
+            due_date = dateutil.parser.parse(self.due)
         else:
-            self.display_due_date = None
+            due_date = None
 
-        grace_period_string = self.metadata.get('graceperiod', None)
-        if grace_period_string is not None and self.display_due_date:
-            self.grace_period = parse_timedelta(grace_period_string)
-            self.close_date = self.display_due_date + self.grace_period
-            #log.debug("Then parsed " + grace_period_string +
-            #          " to closing date" + str(self.close_date))
+        if self.graceperiod is not None and due_date:
+            self.close_date = due_date + self.graceperiod
         else:
-            self.grace_period = None
-            self.close_date = self.display_due_date
+            self.close_date = due_date
 
-        max_attempts = self.metadata.get('attempts')
-        if max_attempts is not None and max_attempts != '':
-            self.max_attempts = int(max_attempts)
-        else:
-            self.max_attempts = None
-
-        self.show_answer = self.metadata.get('showanswer', 'closed')
-
-        self.force_save_button = self.metadata.get('force_save_button', 'false')
-
-        if self.show_answer == "":
-            self.show_answer = "closed"
-
-        if instance_state is not None:
-            instance_state = json.loads(instance_state)
-        if instance_state is not None and 'attempts' in instance_state:
-            self.attempts = instance_state['attempts']
-
-        self.name = only_one(dom2.xpath('/problem/@name'))
-
-        if self.rerandomize == 'never':
-            self.seed = 1
-        elif self.rerandomize == "per_student" and hasattr(self.system, 'seed'):
-            # see comment on randomization_bin
-            self.seed = randomization_bin(system.seed, self.location.url)
-        else:
-            self.seed = None
+        if self.seed is None:
+            if self.rerandomize == 'never':
+                self.seed = 1
+            elif self.rerandomize == "per_student" and hasattr(self.system, 'seed'):
+                # see comment on randomization_bin
+                self.seed = randomization_bin(system.seed, self.location.url)
 
         # Need the problem location in openendedresponse to send out.  Adding
         # it to the system here seems like the least clunky way to get it
@@ -171,8 +148,7 @@ class CapaModule(XModule):
         try:
             # TODO (vshnayder): move as much as possible of this work and error
             # checking to descriptor load time
-            self.lcp = LoncapaProblem(self.definition['data'], self.location.html_id(),
-                                      instance_state, seed=self.seed, system=self.system)
+            self.lcp = self.new_lcp(self.get_state_for_lcp())
         except Exception as err:
             msg = 'cannot create LoncapaProblem {loc}: {err}'.format(
                 loc=self.location.url(), err=err)
@@ -189,35 +165,38 @@ class CapaModule(XModule):
                 problem_text = ('<problem><text><span class="inline-error">'
                                 'Problem %s has an error:</span>%s</text></problem>' %
                                 (self.location.url(), msg))
-                self.lcp = LoncapaProblem(
-                    problem_text, self.location.html_id(),
-                    instance_state, seed=self.seed, system=self.system)
+                self.lcp = self.new_lcp(self.get_state_for_lcp(), text=problem_text)
             else:
                 # add extra info and raise
                 raise Exception(msg), None, sys.exc_info()[2]
 
-    @property
-    def rerandomize(self):
-        """
-        Property accessor that returns self.metadata['rerandomize'] in a
-        canonical form
-        """
-        rerandomize = self.metadata.get('rerandomize', 'always')
-        if rerandomize in ("", "always", "true"):
-            return "always"
-        elif rerandomize in ("false", "per_student"):
-            return "per_student"
-        elif rerandomize == "never":
-            return "never"
-        elif rerandomize == "onreset":
-            return "onreset"
-        else:
-            raise Exception("Invalid rerandomize attribute " + rerandomize)
+            self.set_state_from_lcp()
 
-    def get_instance_state(self):
-        state = self.lcp.get_state()
-        state['attempts'] = self.attempts
-        return json.dumps(state)
+    def new_lcp(self, state, text=None):
+        if text is None:
+            text = self.data
+
+        return LoncapaProblem(
+            problem_text=text,
+            id=self.location.html_id(),
+            state=state,
+            system=self.system,
+        )
+
+    def get_state_for_lcp(self):
+        return {
+            'done': self.done,
+            'correct_map': self.correct_map,
+            'student_answers': self.student_answers,
+            'seed': self.seed,
+        }
+
+    def set_state_from_lcp(self):
+        lcp_state = self.lcp.get_state()
+        self.done = lcp_state['done']
+        self.correct_map = lcp_state['correct_map']
+        self.student_answers = lcp_state['student_answers']
+        self.seed = lcp_state['seed']
 
     def get_score(self):
         return self.lcp.get_score()
@@ -234,7 +213,7 @@ class CapaModule(XModule):
         if total > 0:
             try:
                 return Progress(score, total)
-            except Exception as err:
+            except Exception:
                 log.exception("Got bad progress")
                 return None
         return None
@@ -291,7 +270,6 @@ class CapaModule(XModule):
                 return False
             else:
                 return True
-
         # Only randomized problems need a "reset" button
         else:
             return False
@@ -310,11 +288,26 @@ class CapaModule(XModule):
             is_survey_question = (self.max_attempts == 0)
             needs_reset = self.is_completed() and self.rerandomize == "always"
 
+            # If the student has unlimited attempts, and their answers
+            # are not randomized, then we do not need a save button
+            # because they can use the "Check" button without consequences.
+            #
+            # The consequences we want to avoid are:
+            # * Using up an attempt (if max_attempts is set)
+            # * Changing the current problem, and no longer being
+            #   able to view it (if rerandomize is "always")
+            #
+            # In those cases. the if statement below is false,
+            # and the save button can still be displayed.
+            #
+            if self.max_attempts is None and self.rerandomize != "always":
+                return False
+
             # If the problem is closed (and not a survey question with max_attempts==0),
-            # then do NOT show the reset button
+            # then do NOT show the save button
             # If we're waiting for the user to reset a randomized problem
-            # then do NOT show the reset button
-            if (self.closed() and not is_survey_question) or needs_reset:
+            # then do NOT show the save button
+            elif (self.closed() and not is_survey_question) or needs_reset:
                 return False
             else:
                 return True
@@ -343,6 +336,8 @@ class CapaModule(XModule):
         # We're in non-debug mode, and possibly even in production. We want
         #   to avoid bricking of problem as much as possible
         else:
+            # We're in non-debug mode, and possibly even in production. We want
+            #   to avoid bricking of problem as much as possible
 
             # Presumably, student submission has corrupted LoncapaProblem HTML.
             #   First, pull down all student answers
@@ -359,9 +354,8 @@ class CapaModule(XModule):
                         student_answers.pop(answer_id)
 
             #   Next, generate a fresh LoncapaProblem
-            self.lcp = LoncapaProblem(self.definition['data'], self.location.html_id(),
-                           state=None,   # Tabula rasa
-                           seed=self.seed, system=self.system)
+            self.lcp = self.new_lcp(None)
+            self.set_state_from_lcp()
 
             # Prepend a scary warning to the student
             warning  = '<div class="capa_reset">'\
@@ -379,8 +373,8 @@ class CapaModule(XModule):
             html = warning
             try:
                 html += self.lcp.get_html()
-            except Exception, err:   # Couldn't do it. Give up
-                log.exception(err)
+            except Exception:  # Couldn't do it. Give up
+                log.exception("Unable to generate html from LoncapaProblem")
                 raise
 
         return html
@@ -403,16 +397,15 @@ class CapaModule(XModule):
         # if we want to show a check button, and False otherwise
         # This works because non-empty strings evaluate to True
         if self.should_show_check_button():
-            check_button = self.check_button_name() 
+            check_button = self.check_button_name()
         else:
             check_button = False
 
-        content = {'name': self.display_name,
+        content = {'name': self.display_name_with_default,
                    'html': html,
-                   'weight': self.descriptor.weight,
+                   'weight': self.weight,
                    }
 
-
         context = {'problem': content,
                    'id': self.id,
                    'check_button': check_button,
@@ -499,28 +492,28 @@ class CapaModule(XModule):
         '''
         Is the user allowed to see an answer?
         '''
-        if self.show_answer == '':
+        if self.showanswer == '':
             return False
-        elif self.show_answer == "never":
+        elif self.showanswer == "never":
             return False
         elif self.system.user_is_staff:
             # This is after the 'never' check because admins can see the answer
             # unless the problem explicitly prevents it
             return True
-        elif self.show_answer == 'attempted':
+        elif self.showanswer == 'attempted':
             return self.attempts > 0
-        elif self.show_answer == 'answered':
+        elif self.showanswer == 'answered':
             # NOTE: this is slightly different from 'attempted' -- resetting the problems
             # makes lcp.done False, but leaves attempts unchanged.
             return self.lcp.done
-        elif self.show_answer == 'closed':
+        elif self.showanswer == 'closed':
             return self.closed()
-        elif self.show_answer == 'finished':
+        elif self.showanswer == 'finished':
             return self.closed() or self.is_correct()
 
-        elif self.show_answer == 'past_due':
+        elif self.showanswer == 'past_due':
             return self.is_past_due()
-        elif self.show_answer == 'always':
+        elif self.showanswer == 'always':
             return True
 
         return False
@@ -539,6 +532,8 @@ class CapaModule(XModule):
         queuekey = get['queuekey']
         score_msg = get['xqueue_body']
         self.lcp.update_score(score_msg, queuekey)
+        self.set_state_from_lcp()
+        self.publish_grade()
 
         return dict()  # No AJAX return is needed
 
@@ -550,13 +545,14 @@ class CapaModule(XModule):
         '''
         event_info = dict()
         event_info['problem_id'] = self.location.url()
-        self.system.track_function('show_answer', event_info)
+        self.system.track_function('showanswer', event_info)
         if not self.answer_available():
             raise NotFoundError('Answer is not available')
         else:
             answers = self.lcp.get_question_answers()
+            self.set_state_from_lcp()
 
-	    # answers (eg <solution>) may have embedded images
+        # answers (eg <solution>) may have embedded images
         #   but be careful, some problems are using non-string answer dicts
         new_answers = dict()
         for answer_id in answers:
@@ -606,7 +602,7 @@ class CapaModule(XModule):
             to 'input_1' in the returned dict)
         '''
         answers = dict()
-        
+
         for key in get:
             # e.g. input_resistor_1 ==> resistor_1
             _, _, name = key.partition('_')
@@ -639,6 +635,18 @@ class CapaModule(XModule):
 
         return answers
 
+    def publish_grade(self):
+        """
+        Publishes the student's current grade to the system as an event
+        """
+        score = self.lcp.get_score()
+        self.system.publish({
+            'event_name': 'grade',
+            'value': score['score'],
+            'max_value': score['total'],
+        })
+
+
     def check_problem(self, get):
         ''' Checks whether answers to a problem are correct, and
             returns a map of correct/incorrect answers:
@@ -652,7 +660,6 @@ class CapaModule(XModule):
 
         answers = self.make_dict_of_responses(get)
         event_info['answers'] = convert_files_to_filenames(answers)
-
         # Too late. Cannot submit
         if self.closed():
             event_info['failure'] = 'closed'
@@ -660,7 +667,7 @@ class CapaModule(XModule):
             raise NotFoundError('Problem is closed')
 
         # Problem submitted. Student should reset before checking again
-        if self.lcp.done and self.rerandomize == "always":
+        if self.done and self.rerandomize == "always":
             event_info['failure'] = 'unreset'
             self.system.track_function('save_problem_check_fail', event_info)
             raise NotFoundError('Problem must be reset before it can be checked again')
@@ -672,12 +679,11 @@ class CapaModule(XModule):
             waittime_between_requests = self.system.xqueue['waittime']
             if (current_time - prev_submit_time).total_seconds() < waittime_between_requests:
                 msg = 'You must wait at least %d seconds between submissions' % waittime_between_requests
-                return {'success': msg, 'html': ''}   # Prompts a modal dialog in ajax callback
+                return {'success': msg, 'html': ''}  # Prompts a modal dialog in ajax callback
 
         try:
-            old_state = self.lcp.get_state()
-            lcp_id = self.lcp.problem_id
             correct_map = self.lcp.grade_answers(answers)
+            self.set_state_from_lcp()
         except StudentInputError as inst:
             log.exception("StudentInputError in capa_module:problem_check")
             return {'success': inst.message}
@@ -686,12 +692,14 @@ class CapaModule(XModule):
                 msg = "Error checking problem: " + str(err)
                 msg += '\nTraceback:\n' + traceback.format_exc()
                 return {'success': msg}
-            log.exception("Error in capa_module problem checking")
-            raise Exception("error in capa_module")
+            raise
 
         self.attempts = self.attempts + 1
         self.lcp.done = True
 
+        self.set_state_from_lcp()
+        self.publish_grade()
+
         # success = correct if ALL questions in this problem are correct
         success = 'correct'
         for answer_id in correct_map:
@@ -705,7 +713,7 @@ class CapaModule(XModule):
         event_info['attempts'] = self.attempts
         self.system.track_function('save_problem_check', event_info)
 
-        if hasattr(self.system, 'psychometrics_handler'):  	# update PsychometricsData using callback
+        if hasattr(self.system, 'psychometrics_handler'):  # update PsychometricsData using callback
             self.system.psychometrics_handler(self.get_instance_state())
 
         # render problem into HTML
@@ -729,7 +737,7 @@ class CapaModule(XModule):
         event_info['answers'] = answers
 
         # Too late. Cannot submit
-        if self.closed() and not self.max_attempts==0:
+        if self.closed() and not self.max_attempts ==0:
             event_info['failure'] = 'closed'
             self.system.track_function('save_problem_fail', event_info)
             return {'success': False,
@@ -737,7 +745,7 @@ class CapaModule(XModule):
 
         # Problem submitted. Student should reset before saving
         # again.
-        if self.lcp.done and self.rerandomize == "always":
+        if self.done and self.rerandomize == "always":
             event_info['failure'] = 'done'
             self.system.track_function('save_problem_fail', event_info)
             return {'success': False,
@@ -745,9 +753,11 @@ class CapaModule(XModule):
 
         self.lcp.student_answers = answers
 
+        self.set_state_from_lcp()
+
         self.system.track_function('save_problem_success', event_info)
         msg = "Your answers have been saved"
-        if not self.max_attempts==0:
+        if not self.max_attempts ==0:
             msg += " but not graded. Hit 'Check' to grade them."
         return {'success': True,
                 'msg': msg}
@@ -773,31 +783,33 @@ class CapaModule(XModule):
             return {'success': False,
                     'error': "Problem is closed"}
 
-        if not self.lcp.done:
+        if not self.done:
             event_info['failure'] = 'not_done'
             self.system.track_function('reset_problem_fail', event_info)
             return {'success': False,
                     'error': "Refresh the page and make an attempt before resetting."}
 
-        self.lcp.do_reset()
         if self.rerandomize in ["always", "onreset"]:
             # reset random number generator seed (note the self.lcp.get_state()
             # in next line)
-            self.lcp.seed = None
-    
+            seed = None
+        else:
+            seed = self.lcp.seed
 
-        self.lcp = LoncapaProblem(self.definition['data'],
-                                  self.location.html_id(), self.lcp.get_state(),
-                                  system=self.system)
+        # Generate a new problem with either the previous seed or a new seed
+        self.lcp = self.new_lcp({'seed': seed})
+
+        # Pull in the new problem seed
+        self.set_state_from_lcp()
 
         event_info['new_state'] = self.lcp.get_state()
         self.system.track_function('reset_problem', event_info)
 
-        return { 'success': True,
+        return {'success': True,
                 'html': self.get_problem_html(encapsulate=False)}
 
 
-class CapaDescriptor(RawDescriptor):
+class CapaDescriptor(CapaFields, RawDescriptor):
     """
     Module implementing problems in the LON-CAPA format,
     as implemented by capa.capa_problem
@@ -818,20 +830,27 @@ class CapaDescriptor(RawDescriptor):
     # actually use type and points?
     metadata_attributes = RawDescriptor.metadata_attributes + ('type', 'points')
 
+    # The capa format specifies that what we call max_attempts in the code
+    # is the attribute `attempts`. This will do that conversion
+    metadata_translations = dict(RawDescriptor.metadata_translations)
+    metadata_translations['attempts'] = 'max_attempts'
+
     def get_context(self):
         _context = RawDescriptor.get_context(self)
-        _context.update({'markdown': self.metadata.get('markdown', ''),
-                         'enable_markdown' : 'markdown' in self.metadata})
+        _context.update({'markdown': self.markdown,
+                         'enable_markdown': self.markdown is not None})
         return _context
 
     @property
     def editable_metadata_fields(self):
-        """Remove any metadata from the editable fields which have their own editor or shouldn't be edited by user."""
-        subset = [field for field in super(CapaDescriptor,self).editable_metadata_fields
-                  if field not in ['markdown', 'empty']]
+        """Remove metadata from the editable fields since it has its own editor"""
+        subset = super(CapaDescriptor, self).editable_metadata_fields
+        if 'markdown' in subset:
+            del subset['markdown']
+        if 'empty' in subset:
+            del subset['empty']
         return subset
 
-
     # VS[compat]
     # TODO (cpennington): Delete this method once all fall 2012 course are being
     # edited in the cms
@@ -841,12 +860,3 @@ class CapaDescriptor(RawDescriptor):
             'problems/' + path[8:],
             path[8:],
         ]
-
-    def __init__(self, *args, **kwargs):
-        super(CapaDescriptor, self).__init__(*args, **kwargs)
-
-        weight_string = self.metadata.get('weight', None)
-        if weight_string:
-            self.weight = float(weight_string)
-        else:
-            self.weight = None
diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 659590b5b4..f05f419a03 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -6,19 +6,47 @@ from pkg_resources import resource_string
 
 from xmodule.raw_module import RawDescriptor
 from .x_module import XModule
+from xblock.core import Integer, Scope, BlockScope, ModelType, String, Boolean, Object, Float, List
 from xmodule.open_ended_grading_classes.combined_open_ended_modulev1 import CombinedOpenEndedV1Module, CombinedOpenEndedV1Descriptor
 
 log = logging.getLogger("mitx.courseware")
 
 
+V1_SETTINGS_ATTRIBUTES = ["display_name", "attempts", "is_graded", "accept_file_upload",
+                 "skip_spelling_checks", "due", "graceperiod", "max_score"]
+
+V1_STUDENT_ATTRIBUTES = ["current_task_number", "task_states", "state",
+                          "student_attempts", "ready_to_reset"]
+
+V1_ATTRIBUTES = V1_SETTINGS_ATTRIBUTES + V1_STUDENT_ATTRIBUTES
+
 VERSION_TUPLES = (
-    ('1', CombinedOpenEndedV1Descriptor, CombinedOpenEndedV1Module),
+    ('1', CombinedOpenEndedV1Descriptor, CombinedOpenEndedV1Module, V1_SETTINGS_ATTRIBUTES, V1_STUDENT_ATTRIBUTES),
 )
 
 DEFAULT_VERSION = 1
 DEFAULT_VERSION = str(DEFAULT_VERSION)
 
-class CombinedOpenEndedModule(XModule):
+
+class CombinedOpenEndedFields(object):
+    display_name = String(help="Display name for this module", default="Open Ended Grading", scope=Scope.settings)
+    current_task_number = Integer(help="Current task that the student is on.", default=0, scope=Scope.student_state)
+    task_states = List(help="List of state dictionaries of each task within this module.", scope=Scope.student_state)
+    state = String(help="Which step within the current task that the student is on.", default="initial", scope=Scope.student_state)
+    student_attempts = Integer(help="Number of attempts taken by the student on this problem", default=0, scope=Scope.student_state)
+    ready_to_reset = Boolean(help="If the problem is ready to be reset or not.",  default=False, scope=Scope.student_state)
+    attempts = Integer(help="Maximum number of attempts that a student is allowed.", default=1, scope=Scope.settings)
+    is_graded = Boolean(help="Whether or not the problem is graded.",  default=False, scope=Scope.settings)
+    accept_file_upload = Boolean(help="Whether or not the problem accepts file uploads.",  default=False, scope=Scope.settings)
+    skip_spelling_checks = Boolean(help="Whether or not to skip initial spelling checks.",  default=True, scope=Scope.settings)
+    due = String(help="Date that this problem is due by", default=None, scope=Scope.settings)
+    graceperiod = String(help="Amount of time after the due date that submissions will be accepted", default=None, scope=Scope.settings)
+    max_score = Integer(help="Maximum score for the problem.", default=1, scope=Scope.settings)
+    version = Integer(help="Current version number", default=DEFAULT_VERSION, scope=Scope.settings)
+    data = String(help="XML data for the problem", scope=Scope.content)
+
+
+class CombinedOpenEndedModule(CombinedOpenEndedFields, XModule):
     """
     This is a module that encapsulates all open ended grading (self assessment, peer assessment, etc).
     It transitions between problems, and support arbitrary ordering.
@@ -49,6 +77,8 @@ class CombinedOpenEndedModule(XModule):
     INTERMEDIATE_DONE = 'intermediate_done'
     DONE = 'done'
 
+    icon_class = 'problem'
+
     js = {'coffee': [resource_string(__name__, 'js/src/combinedopenended/display.coffee'),
                      resource_string(__name__, 'js/src/collapsible.coffee'),
                      resource_string(__name__, 'js/src/javascript_loader.coffee'),
@@ -57,11 +87,8 @@ class CombinedOpenEndedModule(XModule):
 
     css = {'scss': [resource_string(__name__, 'css/combinedopenended/display.scss')]}
 
-    def __init__(self, system, location, definition, descriptor,
-                 instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor,
-            instance_state, shared_state, **kwargs)
-
+    def __init__(self, system, location, descriptor, model_data):
+        XModule.__init__(self, system, location, descriptor, model_data)
         """
         Definition file should have one or many task blocks, a rubric block, and a prompt block:
 
@@ -100,25 +127,15 @@ class CombinedOpenEndedModule(XModule):
         self.system = system
         self.system.set('location', location)
 
-        # Load instance state
-        if instance_state is not None:
-            instance_state = json.loads(instance_state)
-        else:
-            instance_state = {}
-
-        self.version = self.metadata.get('version', DEFAULT_VERSION)
-        version_error_string = "Version of combined open ended module {0} is not correct.  Going with version {1}"
-        if not isinstance(self.version, basestring):
-            try:
-                self.version = str(self.version)
-            except:
-                #This is a dev_facing_error
-                log.info(version_error_string.format(self.version, DEFAULT_VERSION))
-                self.version = DEFAULT_VERSION
+        if self.task_states is None:
+            self.task_states = []
 
         versions = [i[0] for i in VERSION_TUPLES]
         descriptors = [i[1] for i in VERSION_TUPLES]
         modules = [i[2] for i in VERSION_TUPLES]
+        settings_attributes = [i[3] for i in VERSION_TUPLES]
+        student_attributes = [i[4] for i in VERSION_TUPLES]
+        version_error_string = "Could not find version {0}, using version {1} instead"
 
         try:
             version_index = versions.index(self.version)
@@ -128,20 +145,31 @@ class CombinedOpenEndedModule(XModule):
             self.version = DEFAULT_VERSION
             version_index = versions.index(self.version)
 
-        static_data = {
-            'rewrite_content_links' : self.rewrite_content_links,
-        }
+        self.student_attributes = student_attributes[version_index]
+        self.settings_attributes = settings_attributes[version_index]
 
+        attributes = self.student_attributes + self.settings_attributes
+
+        static_data = {
+            'rewrite_content_links': self.rewrite_content_links,
+        }
+        instance_state = {k: getattr(self, k) for k in attributes}
         self.child_descriptor = descriptors[version_index](self.system)
-        self.child_definition = descriptors[version_index].definition_from_xml(etree.fromstring(definition['data']), self.system)
+        self.child_definition = descriptors[version_index].definition_from_xml(etree.fromstring(self.data), self.system)
         self.child_module = modules[version_index](self.system, location, self.child_definition, self.child_descriptor,
-            instance_state = json.dumps(instance_state), metadata = self.metadata, static_data= static_data)
+                                    instance_state=instance_state, static_data=static_data, attributes=attributes)
+        self.save_instance_data()
 
     def get_html(self):
-        return self.child_module.get_html()
+        self.save_instance_data()
+        return_value = self.child_module.get_html()
+        return return_value
 
     def handle_ajax(self, dispatch, get):
-        return self.child_module.handle_ajax(dispatch, get)
+        self.save_instance_data()
+        return_value = self.child_module.handle_ajax(dispatch, get)
+        self.save_instance_data()
+        return return_value
 
     def get_instance_state(self):
         return self.child_module.get_instance_state()
@@ -149,8 +177,8 @@ class CombinedOpenEndedModule(XModule):
     def get_score(self):
         return self.child_module.get_score()
 
-    def max_score(self):
-        return self.child_module.max_score()
+    #def max_score(self):
+    #    return self.child_module.max_score()
 
     def get_progress(self):
         return self.child_module.get_progress()
@@ -159,12 +187,14 @@ class CombinedOpenEndedModule(XModule):
     def due_date(self):
         return self.child_module.due_date
 
-    @property
-    def display_name(self):
-        return self.child_module.display_name
+    def save_instance_data(self):
+        for attribute in self.student_attributes:
+            child_attr = getattr(self.child_module, attribute)
+            if child_attr != getattr(self, attribute):
+                setattr(self, attribute, getattr(self.child_module, attribute))
 
 
-class CombinedOpenEndedDescriptor(RawDescriptor):
+class CombinedOpenEndedDescriptor(CombinedOpenEndedFields, RawDescriptor):
     """
     Module for adding combined open ended questions
     """
diff --git a/common/lib/xmodule/xmodule/conditional_module.py b/common/lib/xmodule/xmodule/conditional_module.py
index 787d355c4a..a9375cae78 100644
--- a/common/lib/xmodule/xmodule/conditional_module.py
+++ b/common/lib/xmodule/xmodule/conditional_module.py
@@ -1,126 +1,147 @@
+"""Conditional module is the xmodule, which you can use for disabling
+some xmodules by conditions.
+"""
+
 import json
 import logging
+from lxml import etree
+from pkg_resources import resource_string
 
 from xmodule.x_module import XModule
 from xmodule.modulestore import Location
 from xmodule.seq_module import SequenceDescriptor
+from xblock.core import String, Scope, List
+from xmodule.modulestore.exceptions import ItemNotFoundError
 
-from pkg_resources import resource_string
 
 log = logging.getLogger('mitx.' + __name__)
 
 
-class ConditionalModule(XModule):
-    '''
+class ConditionalFields(object):
+    show_tag_list = List(help="Poll answers", scope=Scope.content)
+
+
+class ConditionalModule(ConditionalFields, XModule):
+    """
     Blocks child module from showing unless certain conditions are met.
 
     Example:
 
-        <conditional condition="require_completed" required="tag/url_name1&tag/url_name2">
+        <conditional sources="i4x://.../problem_1; i4x://.../problem_2" completed="True">
+            <show sources="i4x://.../test_6; i4x://.../Avi_resources"/>
             <video url_name="secret_video" />
         </conditional>
 
-        <conditional condition="require_attempted" required="tag/url_name1&tag/url_name2">
-            <video url_name="secret_video" />
-        </conditional>
+        <conditional> tag attributes:
+            sources - location id of required modules, separated by ';'
 
-    '''
+            completed - map to `is_completed` module method
+            attempted - map to `is_attempted` module method
+            poll_answer - map to `poll_answer` module attribute
+            voted - map to `voted` module attribute
 
-    js = {'coffee': [resource_string(__name__, 'js/src/conditional/display.coffee'),
+        <conditional> tag attributes:
+            sources - location id of modules, separated by ';'
+    """
+
+    js = {'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee'),
+                     resource_string(__name__, 'js/src/conditional/display.coffee'),
                      resource_string(__name__, 'js/src/collapsible.coffee'),
-                     resource_string(__name__, 'js/src/javascript_loader.coffee'),
+
                     ]}
 
     js_module_name = "Conditional"
     css = {'scss': [resource_string(__name__, 'css/capa/display.scss')]}
 
+    # Map
+    # key: <tag attribute in xml>
+    # value: <name of module attribute>
+    conditions_map = {
+        'poll_answer': 'poll_answer',  # poll_question attr
+        'completed': 'is_completed',  # capa_problem attr
+        'attempted': 'is_attempted',  # capa_problem attr
+        'voted': 'voted'  # poll_question attr
+    }
 
-    def __init__(self, system, location, definition, descriptor, instance_state=None, shared_state=None, **kwargs):
-        """
-        In addition to the normal XModule init, provide:
-
-            self.condition            = string describing condition required
-
-        """
-        XModule.__init__(self, system, location, definition, descriptor, instance_state, shared_state, **kwargs)
-        self.contents = None
-        self.condition = self.metadata.get('condition', '')
-        self._get_required_modules()
-        children = self.get_display_items()
-        if children:
-            self.icon_class = children[0].get_icon_class()
-        #log.debug('conditional module required=%s' % self.required_modules_list)
-
-    def _get_required_modules(self):
-        self.required_modules = []
-        for descriptor in self.descriptor.get_required_module_descriptors():
-            module = self.system.get_module(descriptor)
-            self.required_modules.append(module)
-        #log.debug('required_modules=%s' % (self.required_modules))
+    def _get_condition(self):
+        # Get first valid condition.
+        for xml_attr, attr_name in self.conditions_map.iteritems():
+            xml_value = self.descriptor.xml_attributes.get(xml_attr)
+            if xml_value:
+                return xml_value, attr_name
+        raise Exception('Error in conditional module: unknown condition "%s"'
+            % xml_attr)
 
     def is_condition_satisfied(self):
-        self._get_required_modules()
+        self.required_modules = [self.system.get_module(descriptor) for
+            descriptor in self.descriptor.get_required_module_descriptors()]
 
-        if self.condition == 'require_completed':
-            # all required modules must be completed, as determined by
-            # the modules .is_completed() method
-            for module in self.required_modules:
-                #log.debug('in is_condition_satisfied; student_answers=%s' % module.lcp.student_answers)
-                #log.debug('in is_condition_satisfied; instance_state=%s' % module.instance_state)
-                if not hasattr(module, 'is_completed'):
-                    raise Exception('Error in conditional module: required module %s has no .is_completed() method' % module)
-                if not module.is_completed():
-                    log.debug('conditional module: %s not completed' % module)
-                    return False
-                else:
-                    log.debug('conditional module: %s IS completed' % module)
-            return True
-        elif self.condition == 'require_attempted':
-            # all required modules must be attempted, as determined by
-            # the modules .is_attempted() method
-            for module in self.required_modules:
-                if not hasattr(module, 'is_attempted'):
-                    raise Exception('Error in conditional module: required module %s has no .is_attempted() method' % module)
-                if not module.is_attempted():
-                    log.debug('conditional module: %s not attempted' % module)
-                    return False
-                else:
-                    log.debug('conditional module: %s IS attempted' % module)
-            return True
-        else:
-            raise Exception('Error in conditional module: unknown condition "%s"' % self.condition)
+        xml_value, attr_name = self._get_condition()
 
-        return True
+        if xml_value and self.required_modules:
+            for module in self.required_modules:
+                if not hasattr(module, attr_name):
+                    raise Exception('Error in conditional module: \
+                    required module {module} has no {module_attr}'.format(
+                        module=module, module_attr=attr_name))
+
+                attr = getattr(module, attr_name)
+                if callable(attr):
+                    attr = attr()
+
+                if xml_value != str(attr):
+                    break
+            else:
+                return True
+        return False
 
     def get_html(self):
-        self.is_condition_satisfied()
+        # Calculate html ids of dependencies
+        self.required_html_ids = [descriptor.location.html_id() for
+            descriptor in self.descriptor.get_required_module_descriptors()]
+
         return self.system.render_template('conditional_ajax.html', {
             'element_id': self.location.html_id(),
             'id': self.id,
             'ajax_url': self.system.ajax_url,
+            'depends': ';'.join(self.required_html_ids)
         })
 
     def handle_ajax(self, dispatch, post):
-        '''
-        This is called by courseware.module_render, to handle an AJAX call.
-        '''
-        #log.debug('conditional_module handle_ajax: dispatch=%s' % dispatch)
-
+        """This is called by courseware.moduleodule_render, to handle
+        an AJAX call.
+        """
         if not self.is_condition_satisfied():
-            context = {'module': self}
-            html = self.system.render_template('conditional_module.html', context)
-            return json.dumps({'html': html})
+            message = self.descriptor.xml_attributes.get('message')
+            context = {'module': self,
+                       'message': message}
+            html = self.system.render_template('conditional_module.html',
+                context)
+            return json.dumps({'html': [html], 'message': bool(message)})
 
-        if self.contents is None:
-            self.contents = [child.get_html() for child in self.get_display_items()]
-
-        # for now, just deal with one child
-        html = self.contents[0]
+        html = [child.get_html() for child in self.get_display_items()]
 
         return json.dumps({'html': html})
 
+    def get_icon_class(self):
+        new_class = 'other'
+        if self.is_condition_satisfied():
+            # HACK: This shouldn't be hard-coded to two types
+            # OBSOLETE: This obsoletes 'type'
+            class_priority = ['video', 'problem']
+
+            child_classes = [self.system.get_module(child_descriptor).get_icon_class()
+                        for child_descriptor in self.descriptor.get_children()]
+            for c in class_priority:
+                if c in child_classes:
+                    new_class = c
+        return new_class
+
+
+class ConditionalDescriptor(ConditionalFields, SequenceDescriptor):
+    """Descriptor for conditional xmodule."""
+    _tag_name = 'conditional'
 
-class ConditionalDescriptor(SequenceDescriptor):
     module_class = ConditionalModule
 
     filename_extension = "xml"
@@ -128,26 +149,68 @@ class ConditionalDescriptor(SequenceDescriptor):
     stores_state = True
     has_score = False
 
-    def __init__(self, *args, **kwargs):
-        super(ConditionalDescriptor, self).__init__(*args, **kwargs)
 
-        required_module_list = [tuple(x.split('/', 1)) for x in self.metadata.get('required', '').split('&')]
-        self.required_module_locations = []
-        for rm in required_module_list:
-            try:
-                (tag, name) = rm
-            except Exception as err:
-                msg = "Specification of required module in conditional is broken: %s" % self.metadata.get('required')
-                log.warning(msg)
-                self.system.error_tracker(msg)
-                continue
-            loc = self.location.dict()
-            loc['category'] = tag
-            loc['name'] = name
-            self.required_module_locations.append(Location(loc))
-        log.debug('ConditionalDescriptor required_module_locations=%s' % self.required_module_locations)
+    @staticmethod
+    def parse_sources(xml_element, system, return_descriptor=False):
+        """Parse xml_element 'sources' attr and:
+        if return_descriptor=True - return list of descriptors
+        if return_descriptor=False - return list of locations
+        """
+        result = []
+        sources = xml_element.get('sources')
+        if sources:
+            locations = [location.strip() for location in sources.split(';')]
+            for location in locations:
+                if Location.is_valid(location):  # Check valid location url.
+                    try:
+                        if return_descriptor:
+                            descriptor = system.load_item(location)
+                            result.append(descriptor)
+                        else:
+                            result.append(location)
+                    except ItemNotFoundError:
+                        msg = "Invalid module by location."
+                        log.exception(msg)
+                        system.error_tracker(msg)
+        return result
 
     def get_required_module_descriptors(self):
-        """Returns a list of XModuleDescritpor instances upon which this module depends, but are
-        not children of this module"""
-        return [self.system.load_item(loc) for loc in self.required_module_locations]
+        """Returns a list of XModuleDescritpor instances upon
+        which this module depends.
+        """
+        return ConditionalDescriptor.parse_sources(
+            self.xml_attributes, self.system, True)
+
+    @classmethod
+    def definition_from_xml(cls, xml_object, system):
+        children = []
+        show_tag_list = []
+        for child in xml_object:
+            if child.tag == 'show':
+                location = ConditionalDescriptor.parse_sources(
+                    child, system)
+                children.extend(location)
+                show_tag_list.extend(location)
+            else:
+                try:
+                    descriptor = system.process_xml(etree.tostring(child))
+                    module_url = descriptor.location.url()
+                    children.append(module_url)
+                except:
+                    msg = "Unable to load child when parsing Conditional."
+                    log.exception(msg)
+                    system.error_tracker(msg)
+        return {'show_tag_list': show_tag_list}, children
+
+    def definition_to_xml(self, resource_fs):
+        xml_object = etree.Element(self._tag_name)
+        for child in self.get_children():
+            location = str(child.location)
+            if location in self.show_tag_list:
+                show_str = '<{tag_name} sources="{sources}" />'.format(
+                    tag_name='show', sources=location)
+                xml_object.append(etree.fromstring(show_str))
+            else:
+                xml_object.append(
+                    etree.fromstring(child.export_to_xml(resource_fs)))
+        return xml_object
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 764a35b77a..7c47e0887a 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -9,7 +9,7 @@ from datetime import datetime
 
 from xmodule.modulestore import Location
 from xmodule.seq_module import SequenceDescriptor, SequenceModule
-from xmodule.timeparse import parse_time, stringify_time
+from xmodule.timeparse import parse_time
 from xmodule.util.decorators import lazyproperty
 from xmodule.graders import grader_from_conf
 from datetime import datetime
@@ -19,107 +19,212 @@ import requests
 import time
 import copy
 
+from xblock.core import Scope, ModelType, List, String, Object, Boolean
+from .fields import Date
+
 
 log = logging.getLogger(__name__)
 
 
+class StringOrDate(Date):
+    def from_json(self, value):
+        """
+        Parse an optional metadata key containing a time: if present, complain
+        if it doesn't parse.
+        Return None if not present or invalid.
+        """
+        if value is None:
+            return None
+
+        try:
+            return time.strptime(value, self.time_format)
+        except ValueError:
+            return value
+
+    def to_json(self, value):
+        """
+        Convert a time struct to a string
+        """
+        if value is None:
+            return None
+
+        try:
+            return time.strftime(self.time_format, value)
+        except (ValueError, TypeError):
+            return value
+
+
+
 edx_xml_parser = etree.XMLParser(dtd_validation=False, load_dtd=False,
                                  remove_comments=True, remove_blank_text=True)
 
 _cached_toc = {}
 
+class Textbook(object):
+    def __init__(self, title, book_url):
+        self.title = title
+        self.book_url = book_url
+        self.start_page = int(self.table_of_contents[0].attrib['page'])
 
-class CourseDescriptor(SequenceDescriptor):
-    module_class = SequenceModule
+        # The last page should be the last element in the table of contents,
+        # but it may be nested. So recurse all the way down the last element
+        last_el = self.table_of_contents[-1]
+        while last_el.getchildren():
+            last_el = last_el[-1]
 
-    template_dir_name = 'course'
+        self.end_page = int(last_el.attrib['page'])
 
-    class Textbook:
-        def __init__(self, title, book_url):
-            self.title = title
-            self.book_url = book_url
-            self.table_of_contents = self._get_toc_from_s3()
-            self.start_page = int(self.table_of_contents[0].attrib['page'])
+    @lazyproperty
+    def table_of_contents(self):
+        """
+        Accesses the textbook's table of contents (default name "toc.xml") at the URL self.book_url
 
-            # The last page should be the last element in the table of contents,
-            # but it may be nested. So recurse all the way down the last element
-            last_el = self.table_of_contents[-1]
-            while last_el.getchildren():
-                last_el = last_el[-1]
+        Returns XML tree representation of the table of contents
+        """
+        toc_url = self.book_url + 'toc.xml'
 
-            self.end_page = int(last_el.attrib['page'])
+        # cdodge: I've added this caching of TOC because in Mongo-backed instances (but not Filesystem stores)
+        # course modules have a very short lifespan and are constantly being created and torn down.
+        # Since this module in the __init__() method does a synchronous call to AWS to get the TOC
+        # this is causing a big performance problem. So let's be a bit smarter about this and cache
+        # each fetch and store in-mem for 10 minutes.
+        # NOTE: I have to get this onto sandbox ASAP as we're having runtime failures. I'd like to swing back and
+        # rewrite to use the traditional Django in-memory cache.
+        try:
+            # see if we already fetched this
+            if toc_url in _cached_toc:
+                (table_of_contents, timestamp) = _cached_toc[toc_url]
+                age = datetime.now() - timestamp
+                # expire every 10 minutes
+                if age.seconds < 600:
+                    return table_of_contents
+        except Exception as err:
+            pass
 
-        @property
-        def table_of_contents(self):
-            return self.table_of_contents
+        # Get the table of contents from S3
+        log.info("Retrieving textbook table of contents from %s" % toc_url)
+        try:
+            r = requests.get(toc_url)
+        except Exception as err:
+            msg = 'Error %s: Unable to retrieve textbook table of contents at %s' % (err, toc_url)
+            log.error(msg)
+            raise Exception(msg)
 
-        def _get_toc_from_s3(self):
-            """
-            Accesses the textbook's table of contents (default name "toc.xml") at the URL self.book_url
+        # TOC is XML. Parse it
+        try:
+            table_of_contents = etree.fromstring(r.text)
+        except Exception as err:
+            msg = 'Error %s: Unable to parse XML for textbook table of contents at %s' % (err, toc_url)
+            log.error(msg)
+            raise Exception(msg)
 
-            Returns XML tree representation of the table of contents
-            """
-            toc_url = self.book_url + 'toc.xml'
+        return table_of_contents
 
-            # cdodge: I've added this caching of TOC because in Mongo-backed instances (but not Filesystem stores)
-            # course modules have a very short lifespan and are constantly being created and torn down.
-            # Since this module in the __init__() method does a synchronous call to AWS to get the TOC
-            # this is causing a big performance problem. So let's be a bit smarter about this and cache
-            # each fetch and store in-mem for 10 minutes.
-            # NOTE: I have to get this onto sandbox ASAP as we're having runtime failures. I'd like to swing back and
-            # rewrite to use the traditional Django in-memory cache.
+
+class TextbookList(List):
+    def from_json(self, values):
+        textbooks = []
+        for title, book_url in values:
             try:
-                # see if we already fetched this
-                if toc_url in _cached_toc:
-                    (table_of_contents, timestamp) = _cached_toc[toc_url]
-                    age = datetime.now() - timestamp
-                    # expire every 10 minutes
-                    if age.seconds < 600:
-                        return table_of_contents
-            except Exception as err:
-                pass
-
-            # Get the table of contents from S3
-            log.info("Retrieving textbook table of contents from %s" % toc_url)
-            try:
-                r = requests.get(toc_url)
-            except Exception as err:
-                msg = 'Error %s: Unable to retrieve textbook table of contents at %s' % (err, toc_url)
-                log.error(msg)
-                raise Exception(msg)
-
-            # TOC is XML. Parse it
-            try:
-                table_of_contents = etree.fromstring(r.text)
-                _cached_toc[toc_url] = (table_of_contents, datetime.now())
-            except Exception as err:
-                msg = 'Error %s: Unable to parse XML for textbook table of contents at %s' % (err, toc_url)
-                log.error(msg)
-                raise Exception(msg)
-
-            return table_of_contents
-
-    def __init__(self, system, definition=None, **kwargs):
-        super(CourseDescriptor, self).__init__(system, definition, **kwargs)
-        self.textbooks = []
-        for title, book_url in self.definition['data']['textbooks']:
-            try:
-                self.textbooks.append(self.Textbook(title, book_url))
+                textbooks.append(Textbook(title, book_url))
             except:
                 # If we can't get to S3 (e.g. on a train with no internet), don't break
                 # the rest of the courseware.
                 log.exception("Couldn't load textbook ({0}, {1})".format(title, book_url))
                 continue
 
-        self.wiki_slug = self.definition['data']['wiki_slug'] or self.location.course
+        return textbooks
+
+    def to_json(self, values):
+        json_data = []
+        for val in values:
+            if isinstance(val, Textbook):
+                json_data.append((val.title, val.book_url))
+            elif isinstance(val, tuple):
+                json_data.append(val)
+            else:
+                continue
+        return json_data
+
+
+class CourseFields(object):
+    textbooks = TextbookList(help="List of pairs of (title, url) for textbooks used in this course", scope=Scope.content)
+    wiki_slug = String(help="Slug that points to the wiki for this course", scope=Scope.content)
+    enrollment_start = Date(help="Date that enrollment for this class is opened", scope=Scope.settings)
+    enrollment_end = Date(help="Date that enrollment for this class is closed", scope=Scope.settings)
+    start = Date(help="Start time when this module is visible", scope=Scope.settings)
+    end = Date(help="Date that this class ends", scope=Scope.settings)
+    advertised_start = StringOrDate(help="Date that this course is advertised to start", scope=Scope.settings)
+    grading_policy = Object(help="Grading policy definition for this class", scope=Scope.content)
+    show_calculator = Boolean(help="Whether to show the calculator in this course", default=False, scope=Scope.settings)
+    display_name = String(help="Display name for this module", scope=Scope.settings)
+    tabs = List(help="List of tabs to enable in this course", scope=Scope.settings)
+    end_of_course_survey_url = String(help="Url for the end-of-course survey", scope=Scope.settings)
+    discussion_blackouts = List(help="List of pairs of start/end dates for discussion blackouts", scope=Scope.settings)
+    discussion_topics = Object(
+        help="Map of topics names to ids",
+        scope=Scope.settings,
+        computed_default=lambda c: {'General': {'id': c.location.html_id()}},
+        )
+    testcenter_info = Object(help="Dictionary of Test Center info", scope=Scope.settings)
+    announcement = Date(help="Date this course is announced", scope=Scope.settings)
+    cohort_config = Object(help="Dictionary defining cohort configuration", scope=Scope.settings)
+    is_new = Boolean(help="Whether this course should be flagged as new", scope=Scope.settings)
+    no_grade = Boolean(help="True if this course isn't graded", default=False, scope=Scope.settings)
+    disable_progress_graph = Boolean(help="True if this course shouldn't display the progress graph", default=False, scope=Scope.settings)
+    pdf_textbooks = List(help="List of dictionaries containing pdf_textbook configuration", scope=Scope.settings)
+    html_textbooks = List(help="List of dictionaries containing html_textbook configuration", scope=Scope.settings)
+    remote_gradebook = Object(scope=Scope.settings)
+    allow_anonymous = Boolean(scope=Scope.settings, default=True)
+    allow_anonymous_to_peers = Boolean(scope=Scope.settings, default=False)
+    advanced_modules = List(help="Beta modules used in your course", scope=Scope.settings)
+    has_children = True
+
+    info_sidebar_name = String(scope=Scope.settings, default='Course Handouts')
+
+    # An extra property is used rather than the wiki_slug/number because
+    # there are courses that change the number for different runs. This allows
+    # courses to share the same css_class across runs even if they have
+    # different numbers.
+    #
+    # TODO get rid of this as soon as possible or potentially build in a robust
+    # way to add in course-specific styling. There needs to be a discussion
+    # about the right way to do this, but arjun will address this ASAP. Also
+    # note that the courseware template needs to change when this is removed.
+    css_class = String(help="DO NOT USE THIS", scope=Scope.settings)
+
+    # TODO: This is a quick kludge to allow CS50 (and other courses) to
+    # specify their own discussion forums as external links by specifying a
+    # "discussion_link" in their policy JSON file. This should later get
+    # folded in with Syllabus, Course Info, and additional Custom tabs in a
+    # more sensible framework later.
+    discussion_link = String(help="DO NOT USE THIS", scope=Scope.settings)
+
+    # TODO: same as above, intended to let internal CS50 hide the progress tab
+    # until we get grade integration set up.
+    # Explicit comparison to True because we always want to return a bool.
+    hide_progress_tab = Boolean(help="DO NOT USE THIS", scope=Scope.settings)
+
+
+class CourseDescriptor(CourseFields, SequenceDescriptor):
+    module_class = SequenceModule
+
+    template_dir_name = 'course'
+
+
+    def __init__(self, *args, **kwargs):
+        super(CourseDescriptor, self).__init__(*args, **kwargs)
+
+        if self.wiki_slug is None:
+            self.wiki_slug = self.location.course
 
         msg = None
         if self.start is None:
             msg = "Course loaded without a valid start date. id = %s" % self.id
             # hack it -- start in 1970
-            self.metadata['start'] = stringify_time(time.gmtime(0))
+            self.start = time.gmtime(0)
             log.critical(msg)
-            system.error_tracker(msg)
+            self.system.error_tracker(msg)
 
         # NOTE: relies on the modulestore to call set_grading_policy() right after
         # init.  (Modulestore is in charge of figuring out where to load the policy from)
@@ -128,10 +233,10 @@ class CourseDescriptor(SequenceDescriptor):
         #   disable the syllabus content for courses that do not provide a syllabus
         self.syllabus_present = self.system.resources_fs.exists(path('syllabus'))
         self._grading_policy = {}
-        self.set_grading_policy(self.definition['data'].get('grading_policy', None))
+        self.set_grading_policy(self.grading_policy)
 
         self.test_center_exams = []
-        test_center_info = self.metadata.get('testcenter_info')
+        test_center_info = self.testcenter_info
         if test_center_info is not None:
             for exam_name in test_center_info:
                 try:
@@ -144,11 +249,11 @@ class CourseDescriptor(SequenceDescriptor):
                     log.error(msg)
                     continue
 
-    def defaut_grading_policy(self):
+    def default_grading_policy(self):
         """
         Return a dict which is a copy of the default grading policy
         """
-        default = {"GRADER": [
+        return {"GRADER": [
                 {
                     "type": "Homework",
                     "min_count": 12,
@@ -180,7 +285,6 @@ class CourseDescriptor(SequenceDescriptor):
             "GRADE_CUTOFFS": {
                 "Pass": 0.5
             }}
-        return copy.deepcopy(default)
 
     def set_grading_policy(self, course_policy):
         """
@@ -191,7 +295,7 @@ class CourseDescriptor(SequenceDescriptor):
             course_policy = {}
 
         # Load the global settings as a dictionary
-        grading_policy = self.defaut_grading_policy()
+        grading_policy = self.default_grading_policy()
 
         # Override any global settings with the course settings
         grading_policy.update(course_policy)
@@ -222,7 +326,6 @@ class CourseDescriptor(SequenceDescriptor):
 
         return policy_str
 
-
     @classmethod
     def from_xml(cls, xml_data, system, org=None, course=None):
         instance = super(CourseDescriptor, cls).from_xml(xml_data, system, org, course)
@@ -250,14 +353,13 @@ class CourseDescriptor(SequenceDescriptor):
 
         # cdodge: import the grading policy information that is on disk and put into the
         # descriptor 'definition' bucket as a dictionary so that it is persisted in the DB
-        instance.definition['data']['grading_policy'] = policy
+        instance.grading_policy = policy
 
         # now set the current instance. set_grading_policy() will apply some inheritance rules
         instance.set_grading_policy(policy)
 
         return instance
 
-
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         textbooks = []
@@ -272,12 +374,12 @@ class CourseDescriptor(SequenceDescriptor):
             wiki_slug = wiki_tag.attrib.get("slug", default=None)
             xml_object.remove(wiki_tag)
 
-        definition = super(CourseDescriptor, cls).definition_from_xml(xml_object, system)
+        definition, children = super(CourseDescriptor, cls).definition_from_xml(xml_object, system)
 
-        definition.setdefault('data', {})['textbooks'] = textbooks
-        definition['data']['wiki_slug'] = wiki_slug
+        definition['textbooks'] = textbooks
+        definition['wiki_slug'] = wiki_slug
 
-        return definition
+        return definition, children
 
     def has_ended(self):
         """
@@ -292,30 +394,6 @@ class CourseDescriptor(SequenceDescriptor):
     def has_started(self):
         return time.gmtime() > self.start
 
-    @property
-    def end(self):
-        return self._try_parse_time("end")
-    @end.setter
-    def end(self, value):
-        if isinstance(value, time.struct_time):
-            self.metadata['end'] = stringify_time(value)
-    @property
-    def enrollment_start(self):
-        return self._try_parse_time("enrollment_start")
-
-    @enrollment_start.setter
-    def enrollment_start(self, value):
-        if isinstance(value, time.struct_time):
-            self.metadata['enrollment_start'] = stringify_time(value)
-    @property
-    def enrollment_end(self):
-        return self._try_parse_time("enrollment_end")
-
-    @enrollment_end.setter
-    def enrollment_end(self, value):
-        if isinstance(value, time.struct_time):
-            self.metadata['enrollment_end'] = stringify_time(value)
-
     @property
     def grader(self):
         return grader_from_conf(self.raw_grader)
@@ -328,7 +406,7 @@ class CourseDescriptor(SequenceDescriptor):
     def raw_grader(self, value):
         # NOTE WELL: this change will not update the processed graders. If we need that, this needs to call grader_from_conf
         self._grading_policy['RAW_GRADER'] = value
-        self.definition['data'].setdefault('grading_policy', {})['GRADER'] = value
+        self.grading_policy['GRADER'] = value
 
     @property
     def grade_cutoffs(self):
@@ -337,41 +415,23 @@ class CourseDescriptor(SequenceDescriptor):
     @grade_cutoffs.setter
     def grade_cutoffs(self, value):
         self._grading_policy['GRADE_CUTOFFS'] = value
-        self.definition['data'].setdefault('grading_policy', {})['GRADE_CUTOFFS'] = value
+
+        # XBlock fields don't update after mutation
+        policy = self.grading_policy
+        policy['GRADE_CUTOFFS'] = value
+        self.grading_policy = policy
 
 
     @property
     def lowest_passing_grade(self):
         return min(self._grading_policy['GRADE_CUTOFFS'].values())
 
-    @property
-    def tabs(self):
-        """
-        Return the tabs config, as a python object, or None if not specified.
-        """
-        return self.metadata.get('tabs')
-
-    @property
-    def pdf_textbooks(self):
-        """
-        Return the pdf_textbooks config, as a python object, or None if not specified.
-        """
-        return self.metadata.get('pdf_textbooks')
-
-    @tabs.setter
-    def tabs(self, value):
-        self.metadata['tabs'] = value
-
-    @property
-    def show_calculator(self):
-        return self.metadata.get("show_calculator", None) == "Yes"
-
     @property
     def is_cohorted(self):
         """
         Return whether the course is cohorted.
         """
-        config = self.metadata.get("cohort_config")
+        config = self.cohort_config
         if config is None:
             return False
 
@@ -385,7 +445,7 @@ class CourseDescriptor(SequenceDescriptor):
         if not self.is_cohorted:
             return False
 
-        return bool(self.metadata.get("cohort_config", {}).get(
+        return bool(self.cohort_config.get(
             "auto_cohort", False))
 
     @property
@@ -395,8 +455,10 @@ class CourseDescriptor(SequenceDescriptor):
         specified. Returns specified list even if is_cohorted and/or auto_cohort are
         false.
         """
-        return self.metadata.get("cohort_config", {}).get(
-            "auto_cohort_groups", [])
+        if self.cohort_config is None:
+            return []
+        else:
+            return self.cohort_config.get("auto_cohort_groups", [])
 
 
     @property
@@ -404,7 +466,7 @@ class CourseDescriptor(SequenceDescriptor):
         """
         Return list of topic ids defined in course policy.
         """
-        topics = self.metadata.get("discussion_topics", {})
+        topics = self.discussion_topics
         return [d["id"] for d in topics.values()]
 
 
@@ -415,7 +477,7 @@ class CourseDescriptor(SequenceDescriptor):
         the empty set.  Note that all inline discussions are automatically
         cohorted based on the course's is_cohorted setting.
         """
-        config = self.metadata.get("cohort_config")
+        config = self.cohort_config
         if config is None:
             return set()
 
@@ -424,13 +486,13 @@ class CourseDescriptor(SequenceDescriptor):
 
 
     @property
-    def is_new(self):
+    def is_newish(self):
         """
-        Returns if the course has been flagged as new in the metadata. If
+        Returns if the course has been flagged as new. If
         there is no flag, return a heuristic value considering the
         announcement and the start dates.
         """
-        flag = self.metadata.get('is_new', None)
+        flag = self.is_new
         if flag is None:
             # Use a heuristic if the course has not been flagged
             announcement, start, now = self._sorting_dates()
@@ -450,8 +512,8 @@ class CourseDescriptor(SequenceDescriptor):
     @property
     def sorting_score(self):
         """
-        Returns a number that can be used to sort the courses according
-        the how "new"" they are. The "newness"" score is computed using a
+        Returns a tuple that can be used to sort the courses according
+        the how "new" they are. The "newness" score is computed using a
         heuristic that takes into account the announcement and
         (advertized) start dates of the course if available.
 
@@ -476,12 +538,13 @@ class CourseDescriptor(SequenceDescriptor):
         def to_datetime(timestamp):
             return datetime(*timestamp[:6])
 
-        def get_date(field):
-            timetuple = self._try_parse_time(field)
-            return to_datetime(timetuple) if timetuple else None
-
-        announcement = get_date('announcement')
-        start = get_date('advertised_start') or to_datetime(self.start)
+        announcement = self.announcement
+        if announcement is not None:
+            announcement = to_datetime(announcement)
+        if self.advertised_start is None or isinstance(self.advertised_start, basestring):
+            start = to_datetime(self.start)
+        else:
+            start = to_datetime(self.advertised_start)
         now = to_datetime(time.gmtime())
 
         return announcement, start, now
@@ -506,7 +569,7 @@ class CourseDescriptor(SequenceDescriptor):
 
         all_descriptors - This contains a list of all xmodules that can
             effect grading a student. This is used to efficiently fetch
-            all the xmodule state for a StudentModuleCache without walking
+            all the xmodule state for a ModelDataCache without walking
             the descriptor tree again.
 
 
@@ -524,14 +587,14 @@ class CourseDescriptor(SequenceDescriptor):
         for c in self.get_children():
             sections = []
             for s in c.get_children():
-                if s.metadata.get('graded', False):
+                if s.lms.graded:
                     xmoduledescriptors = list(yield_descriptor_descendents(s))
                     xmoduledescriptors.append(s)
 
                     # The xmoduledescriptors included here are only the ones that have scores.
                     section_description = {'section_descriptor': s, 'xmoduledescriptors': filter(lambda child: child.has_score, xmoduledescriptors)}
 
-                    section_format = s.metadata.get('format', "")
+                    section_format = s.lms.format if s.lms.format is not None else ''
                     graded_sections[section_format] = graded_sections.get(section_format, []) + [section_description]
 
                     all_descriptors.extend(xmoduledescriptors)
@@ -572,58 +635,23 @@ class CourseDescriptor(SequenceDescriptor):
 
     @property
     def start_date_text(self):
-        parsed_advertised_start = self._try_parse_time('advertised_start')
-
-        # If the advertised start isn't a real date string, we assume it's free
-        # form text...
-        if parsed_advertised_start is None and \
-           ('advertised_start' in self.metadata):
-            return self.metadata['advertised_start']
-
-        displayed_start = parsed_advertised_start or self.start
-
-        # If we have neither an advertised start or a real start, just return TBD
-        if not displayed_start:
-            return "TBD"
-
-        return time.strftime("%b %d, %Y", displayed_start)
+        if isinstance(self.advertised_start, basestring):
+            return self.advertised_start
+        elif self.advertised_start is None and self.start is None:
+            return 'TBD'
+        else:
+            return time.strftime("%b %d, %Y", self.advertised_start or self.start)
 
     @property
     def end_date_text(self):
         return time.strftime("%b %d, %Y", self.end)
 
-    # An extra property is used rather than the wiki_slug/number because
-    # there are courses that change the number for different runs. This allows
-    # courses to share the same css_class across runs even if they have
-    # different numbers.
-    #
-    # TODO get rid of this as soon as possible or potentially build in a robust
-    # way to add in course-specific styling. There needs to be a discussion
-    # about the right way to do this, but arjun will address this ASAP. Also
-    # note that the courseware template needs to change when this is removed.
-    @property
-    def css_class(self):
-        return self.metadata.get('css_class', '')
-
-    @property
-    def info_sidebar_name(self):
-        return self.metadata.get('info_sidebar_name', 'Course Handouts')
-
-    @property
-    def discussion_link(self):
-        """TODO: This is a quick kludge to allow CS50 (and other courses) to
-        specify their own discussion forums as external links by specifying a
-        "discussion_link" in their policy JSON file. This should later get
-        folded in with Syllabus, Course Info, and additional Custom tabs in a
-        more sensible framework later."""
-        return self.metadata.get('discussion_link', None)
-
     @property
     def forum_posts_allowed(self):
         try:
             blackout_periods = [(parse_time(start), parse_time(end))
                                 for start, end
-                                in self.metadata.get('discussion_blackouts', [])]
+                                in self.discussion_blackouts]
             now = time.gmtime()
             for start, end in blackout_periods:
                 if start <= now <= end:
@@ -633,23 +661,6 @@ class CourseDescriptor(SequenceDescriptor):
 
         return True
 
-    @property
-    def hide_progress_tab(self):
-        """TODO: same as above, intended to let internal CS50 hide the progress tab
-        until we get grade integration set up."""
-        # Explicit comparison to True because we always want to return a bool.
-        return self.metadata.get('hide_progress_tab') == True
-
-    @property
-    def end_of_course_survey_url(self):
-        """
-        Pull from policy.  Once we have our own survey module set up, can change this to point to an automatically
-        created survey for each class.
-
-        Returns None if no url specified.
-        """
-        return self.metadata.get('end_of_course_survey_url')
-
     class TestCenterExam(object):
         def __init__(self, course_id, exam_name, exam_info):
             self.course_id = course_id
@@ -736,10 +747,6 @@ class CourseDescriptor(SequenceDescriptor):
         exams = [exam for exam in self.test_center_exams if exam.exam_series_code == exam_series_code]
         return exams[0] if len(exams) == 1 else None
 
-    @property
-    def title(self):
-        return self.display_name
-
     @property
     def number(self):
         return self.location.course
diff --git a/common/lib/xmodule/xmodule/css/poll/display.scss b/common/lib/xmodule/xmodule/css/poll/display.scss
new file mode 100644
index 0000000000..cfc03bcf91
--- /dev/null
+++ b/common/lib/xmodule/xmodule/css/poll/display.scss
@@ -0,0 +1,221 @@
+section.poll_question {
+  @media print {
+    display: block;
+    width: auto;
+    padding: 0;
+
+    canvas, img {
+      page-break-inside: avoid;
+    }
+  }
+
+  .inline {
+      display: inline;
+  }
+
+  h3 {
+    margin-top: 0;
+    margin-bottom: 15px;
+    color: #fe57a1;
+    font-size: 1.9em;
+
+    &.problem-header {
+      section.staff {
+        margin-top: 30px;
+        font-size: 80%;
+      }
+    }
+
+    @media print {
+      display: block;
+      width: auto;
+      border-right: 0;
+    }
+  }
+
+  p {
+    text-align: justify;
+    font-weight: bold;
+  }
+
+  .poll_answer {
+    margin-bottom: 20px;
+
+    &.short {
+        clear: both;
+    }
+
+    .question {
+      height: auto;
+      clear: both;
+      min-height: 30px;
+
+      &.short {
+        clear: none;
+        width: 30%;
+        display: inline;
+        float: left;
+      }
+
+      .button {
+        -webkit-appearance: none;
+        -webkit-background-clip: padding-box;
+        -webkit-border-image: none;
+        -webkit-box-align: center;
+        -webkit-box-shadow: rgb(255, 255, 255) 0px 1px 0px 0px inset;
+        -webkit-font-smoothing: antialiased;
+        -webkit-rtl-ordering: logical;
+        -webkit-user-select: text;
+        -webkit-writing-mode: horizontal-tb;
+        background-clip: padding-box;
+        background-color: rgb(238, 238, 238);
+        background-image: -webkit-linear-gradient(top, rgb(238, 238, 238), rgb(210, 210, 210));
+        border-bottom-color: rgb(202, 202, 202);
+        border-bottom-left-radius: 3px;
+        border-bottom-right-radius: 3px;
+        border-bottom-style: solid;
+        border-bottom-width: 1px;
+        border-left-color: rgb(202, 202, 202);
+        border-left-style: solid;
+        border-left-width: 1px;
+        border-right-color: rgb(202, 202, 202);
+        border-right-style: solid;
+        border-right-width: 1px;
+        border-top-color: rgb(202, 202, 202);
+        border-top-left-radius: 3px;
+        border-top-right-radius: 3px;
+        border-top-style: solid;
+        border-top-width: 1px;
+        box-shadow: rgb(255, 255, 255) 0px 1px 0px 0px inset;
+        box-sizing: border-box;
+        color: rgb(51, 51, 51);
+        cursor: pointer;
+
+        /* display: inline-block; */
+        display: inline;
+        float: left;
+
+        font-family: 'Open Sans', Verdana, Geneva, sans-serif;
+        font-size: 13px;
+        font-style: normal;
+        font-variant: normal;
+        font-weight: bold;
+
+        letter-spacing: normal;
+        line-height: 25.59375px;
+        margin-bottom: 15px;
+        margin: 0px;
+        padding: 0px;
+        text-align: center;
+        text-decoration: none;
+        text-indent: 0px;
+        text-shadow: rgb(248, 248, 248) 0px 1px 0px;
+        text-transform: none;
+        vertical-align: top;
+        white-space: pre-line;
+
+        width: 25px;
+        height: 25px;
+
+        word-spacing: 0px;
+        writing-mode: lr-tb;
+      }
+      .button.answered {
+        -webkit-box-shadow: rgb(97, 184, 225) 0px 1px 0px 0px inset;
+        background-color: rgb(29, 157, 217);
+        background-image: -webkit-linear-gradient(top, rgb(29, 157, 217), rgb(14, 124, 176));
+        border-bottom-color: rgb(13, 114, 162);
+        border-left-color: rgb(13, 114, 162);
+        border-right-color: rgb(13, 114, 162);
+        border-top-color: rgb(13, 114, 162);
+        box-shadow: rgb(97, 184, 225) 0px 1px 0px 0px inset;
+        color: rgb(255, 255, 255);
+        text-shadow: rgb(7, 103, 148) 0px 1px 0px;
+      }
+
+      .text {
+        display: inline;
+        float: left;
+        width: 80%;
+        text-align: left;
+        min-height: 30px;
+        margin-left: 20px;
+        height: auto;
+        margin-bottom: 20px;
+        cursor: pointer;
+
+        &.short {
+          width: 100px;
+        }
+      }
+    }
+
+    .stats {
+      min-height: 40px;
+      margin-top: 20px;
+      clear: both;
+
+      &.short {
+        margin-top: 0;
+        clear: none;
+        display: inline;
+        float: right;
+        width: 70%;
+      }
+
+      .bar {
+        width: 75%;
+        height: 20px;
+        border: 1px solid black;
+        display: inline;
+        float: left;
+        margin-right: 10px;
+
+        &.short {
+          width: 65%;
+          height: 20px;
+          margin-top: 3px;
+        }
+
+        .percent {
+          background-color: gray;
+          width: 0px;
+          height: 20px;
+
+          &.short { }
+        }
+      }
+
+      .number {
+        width: 80px;
+        display: inline;
+        float: right;
+        height: 28px;
+        text-align: right;
+
+        &.short {
+          width: 120px;
+          height: auto;
+        }
+      }
+    }
+  }
+
+  .poll_answer.answered {
+    -webkit-box-shadow: rgb(97, 184, 225) 0px 1px 0px 0px inset;
+    background-color: rgb(29, 157, 217);
+    background-image: -webkit-linear-gradient(top, rgb(29, 157, 217), rgb(14, 124, 176));
+    border-bottom-color: rgb(13, 114, 162);
+    border-left-color: rgb(13, 114, 162);
+    border-right-color: rgb(13, 114, 162);
+    border-top-color: rgb(13, 114, 162);
+    box-shadow: rgb(97, 184, 225) 0px 1px 0px 0px inset;
+    color: rgb(255, 255, 255);
+    text-shadow: rgb(7, 103, 148) 0px 1px 0px;
+  }
+
+  .button.reset-button {
+    clear: both;
+    float: right;
+  }
+}
diff --git a/cms/djangoapps/__init__.py b/common/lib/xmodule/xmodule/css/wrapper/display.scss
similarity index 100%
rename from cms/djangoapps/__init__.py
rename to common/lib/xmodule/xmodule/css/wrapper/display.scss
diff --git a/common/lib/xmodule/xmodule/discussion_module.py b/common/lib/xmodule/xmodule/discussion_module.py
index 6ddfcbe6c0..7725a88e77 100644
--- a/common/lib/xmodule/xmodule/discussion_module.py
+++ b/common/lib/xmodule/xmodule/discussion_module.py
@@ -3,35 +3,38 @@ from pkg_resources import resource_string, resource_listdir
 
 from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
-
-import json
+from xblock.core import String, Scope
 
 
-class DiscussionModule(XModule):
+class DiscussionFields(object):
+    discussion_id = String(scope=Scope.settings)
+    discussion_category = String(scope=Scope.settings)
+    discussion_target = String(scope=Scope.settings)
+    sort_key = String(scope=Scope.settings)
+
+
+class DiscussionModule(DiscussionFields, XModule):
     js = {'coffee':
             [resource_string(__name__, 'js/src/time.coffee'),
             resource_string(__name__, 'js/src/discussion/display.coffee')]
         }
     js_module_name = "InlineDiscussion"
+
+
     def get_html(self):
         context = {
             'discussion_id': self.discussion_id,
         }
         return self.system.render_template('discussion/_discussion_module.html', context)
 
-    def __init__(self, system, location, definition, descriptor,
-                 instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor,
-                         instance_state, shared_state, **kwargs)
 
-        if isinstance(instance_state, str):
-            instance_state = json.loads(instance_state)
-        xml_data = etree.fromstring(definition['data'])
-        self.discussion_id = xml_data.attrib['id']
-        self.title = xml_data.attrib['for']
-        self.discussion_category = xml_data.attrib['discussion_category']
-
-
-class DiscussionDescriptor(RawDescriptor):
+class DiscussionDescriptor(DiscussionFields, RawDescriptor):
     module_class = DiscussionModule
     template_dir_name = "discussion"
+
+    # The discussion XML format uses `id` and `for` attributes,
+    # but these would overload other module attributes, so we prefix them
+    # for actual use in the code
+    metadata_translations = dict(RawDescriptor.metadata_translations)
+    metadata_translations['id'] = 'discussion_id'
+    metadata_translations['for'] = 'discussion_target'
diff --git a/common/lib/xmodule/xmodule/editing_module.py b/common/lib/xmodule/xmodule/editing_module.py
index e025179b63..b93727a96b 100644
--- a/common/lib/xmodule/xmodule/editing_module.py
+++ b/common/lib/xmodule/xmodule/editing_module.py
@@ -1,11 +1,16 @@
 from pkg_resources import resource_string
 from xmodule.mako_module import MakoModuleDescriptor
+from xblock.core import Scope, String
 import logging
 
 log = logging.getLogger(__name__)
 
 
-class EditingDescriptor(MakoModuleDescriptor):
+class EditingFields(object):
+    data = String(scope=Scope.content, default='')
+
+
+class EditingDescriptor(EditingFields, MakoModuleDescriptor):
     """
     Module that provides a raw editing view of its data and children.  It does not
     perform any validation on its definition---just passes it along to the browser.
@@ -20,7 +25,7 @@ class EditingDescriptor(MakoModuleDescriptor):
     def get_context(self):
         _context = MakoModuleDescriptor.get_context(self)
         # Add our specific template information (the raw data body)
-        _context.update({'data': self.definition.get('data', '')})
+        _context.update({'data': self.data})
         return _context
 
 
diff --git a/common/lib/xmodule/xmodule/error_module.py b/common/lib/xmodule/xmodule/error_module.py
index 2df47e05e6..d2135302da 100644
--- a/common/lib/xmodule/xmodule/error_module.py
+++ b/common/lib/xmodule/xmodule/error_module.py
@@ -8,6 +8,7 @@ from xmodule.x_module import XModule
 from xmodule.editing_module import JSONEditingDescriptor
 from xmodule.errortracker import exc_info_to_str
 from xmodule.modulestore import Location
+from xblock.core import String, Scope
 
 
 log = logging.getLogger(__name__)
@@ -20,7 +21,14 @@ log = logging.getLogger(__name__)
 # decides whether to create a staff or not-staff module.
 
 
-class ErrorModule(XModule):
+class ErrorFields(object):
+    contents = String(scope=Scope.content)
+    error_msg = String(scope=Scope.content)
+    display_name = String(scope=Scope.settings)
+
+
+class ErrorModule(ErrorFields, XModule):
+
     def get_html(self):
         '''Show an error to staff.
         TODO (vshnayder): proper style, divs, etc.
@@ -28,12 +36,12 @@ class ErrorModule(XModule):
         # staff get to see all the details
         return self.system.render_template('module-error.html', {
             'staff_access': True,
-            'data': self.definition['data']['contents'],
-            'error': self.definition['data']['error_msg'],
+            'data': self.contents,
+            'error': self.error_msg,
             })
 
 
-class NonStaffErrorModule(XModule):
+class NonStaffErrorModule(ErrorFields, XModule):
     def get_html(self):
         '''Show an error to a student.
         TODO (vshnayder): proper style, divs, etc.
@@ -46,7 +54,7 @@ class NonStaffErrorModule(XModule):
             })
 
 
-class ErrorDescriptor(JSONEditingDescriptor):
+class ErrorDescriptor(ErrorFields, JSONEditingDescriptor):
     """
     Module that provides a raw editing view of broken xml.
     """
@@ -66,26 +74,22 @@ class ErrorDescriptor(JSONEditingDescriptor):
                 name=hashlib.sha1(contents).hexdigest()
             )
 
-        definition = {
-            'data': {
-                'error_msg': str(error_msg),
-                'contents': contents,
-            }
-        }
-
         # real metadata stays in the content, but add a display name
-        metadata = {'display_name': 'Error: ' + location.name}
+        model_data = {
+            'error_msg': str(error_msg),
+            'contents': contents,
+            'display_name': 'Error: ' + location.name
+        }
         return ErrorDescriptor(
             system,
-            definition,
-            location=location,
-            metadata=metadata
+            location,
+            model_data,
         )
 
     def get_context(self):
         return {
             'module': self,
-            'data': self.definition['data']['contents'],
+            'data': self.contents,
         }
 
     @classmethod
@@ -101,10 +105,7 @@ class ErrorDescriptor(JSONEditingDescriptor):
     def from_descriptor(cls, descriptor, error_msg='Error not available'):
         return cls._construct(
             descriptor.system,
-            json.dumps({
-                'definition': descriptor.definition,
-                'metadata': descriptor.metadata,
-            }, indent=4),
+            descriptor._model_data,
             error_msg,
             location=descriptor.location,
         )
@@ -148,14 +149,14 @@ class ErrorDescriptor(JSONEditingDescriptor):
         files, etc.  That would just get re-wrapped on import.
         '''
         try:
-            xml = etree.fromstring(self.definition['data']['contents'])
+            xml = etree.fromstring(self.contents)
             return etree.tostring(xml, encoding='unicode')
         except etree.XMLSyntaxError:
             # still not valid.
             root = etree.Element('error')
-            root.text = self.definition['data']['contents']
+            root.text = self.contents
             err_node = etree.SubElement(root, 'error_msg')
-            err_node.text = self.definition['data']['error_msg']
+            err_node.text = self.error_msg
             return etree.tostring(root, encoding='unicode')
 
 
diff --git a/common/lib/xmodule/xmodule/fields.py b/common/lib/xmodule/xmodule/fields.py
new file mode 100644
index 0000000000..fb80752e56
--- /dev/null
+++ b/common/lib/xmodule/xmodule/fields.py
@@ -0,0 +1,69 @@
+import time
+import logging
+import re
+
+from datetime import timedelta
+from xblock.core import ModelType
+
+log = logging.getLogger(__name__)
+
+
+class Date(ModelType):
+    time_format = "%Y-%m-%dT%H:%M"
+
+    def from_json(self, value):
+        """
+        Parse an optional metadata key containing a time: if present, complain
+        if it doesn't parse.
+        Return None if not present or invalid.
+        """
+        if value is None:
+            return None
+
+        try:
+            return time.strptime(value, self.time_format)
+        except ValueError as e:
+            msg = "Field {0} has bad value '{1}': '{2}'".format(
+                self._name, value, e)
+            log.warning(msg)
+            return None
+
+    def to_json(self, value):
+        """
+        Convert a time struct to a string
+        """
+        if value is None:
+            return None
+
+        return time.strftime(self.time_format, value)
+
+
+TIMEDELTA_REGEX = re.compile(r'^((?P<days>\d+?) day(?:s?))?(\s)?((?P<hours>\d+?) hour(?:s?))?(\s)?((?P<minutes>\d+?) minute(?:s)?)?(\s)?((?P<seconds>\d+?) second(?:s)?)?$')
+class Timedelta(ModelType):
+    def from_json(self, time_str):
+        """
+        time_str: A string with the following components:
+            <D> day[s] (optional)
+            <H> hour[s] (optional)
+            <M> minute[s] (optional)
+            <S> second[s] (optional)
+
+        Returns a datetime.timedelta parsed from the string
+        """
+        parts = TIMEDELTA_REGEX.match(time_str)
+        if not parts:
+            return
+        parts = parts.groupdict()
+        time_params = {}
+        for (name, param) in parts.iteritems():
+            if param:
+                time_params[name] = int(param)
+        return timedelta(**time_params)
+
+    def to_json(self, value):
+        values = []
+        for attr in ('days', 'hours', 'minutes', 'seconds'):
+            cur_value = getattr(value, attr, 0)
+            if cur_value > 0:
+                values.append("%d %s" % (cur_value, attr))
+        return ' '.join(values)
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/foldit_module.py b/common/lib/xmodule/xmodule/foldit_module.py
index 920a5aed6d..884f9e2df2 100644
--- a/common/lib/xmodule/xmodule/foldit_module.py
+++ b/common/lib/xmodule/xmodule/foldit_module.py
@@ -7,17 +7,27 @@ from pkg_resources import resource_string
 from xmodule.editing_module import EditingDescriptor
 from xmodule.x_module import XModule
 from xmodule.xml_module import XmlDescriptor
+from xblock.core import Scope, Integer, String
 
 log = logging.getLogger(__name__)
 
-class FolditModule(XModule):
+
+class FolditFields(object):
+    # default to what Spring_7012x uses
+    required_level = Integer(default=4, scope=Scope.settings)
+    required_sublevel = Integer(default=5, scope=Scope.settings)
+    due = String(help="Date that this problem is due by", scope=Scope.settings, default='')
+
+    show_basic_score = String(scope=Scope.settings, default='false')
+    show_leaderboard = String(scope=Scope.settings, default='false')
+
+
+class FolditModule(FolditFields, XModule):
 
     css = {'scss': [resource_string(__name__, 'css/foldit/leaderboard.scss')]}
 
-    def __init__(self, system, location, definition, descriptor,
-                 instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor,
-                         instance_state, shared_state, **kwargs)
+    def __init__(self, *args, **kwargs):
+        XModule.__init__(self, *args, **kwargs)
         """
 
         Example:
@@ -26,25 +36,17 @@ class FolditModule(XModule):
             required_sublevel="3"
             show_leaderboard="false"/>
         """
-        req_level = self.metadata.get("required_level")
-        req_sublevel = self.metadata.get("required_sublevel")
-
-        # default to what Spring_7012x uses
-        self.required_level = req_level if req_level else 4
-        self.required_sublevel = req_sublevel if req_sublevel else 5
-
         def parse_due_date():
             """
             Pull out the date, or None
             """
-            s = self.metadata.get("due")
+            s = self.due
             if s:
                 return parser.parse(s)
             else:
                 return None
 
-        self.due_str = self.metadata.get("due", "None")
-        self.due = parse_due_date()
+        self.due_time = parse_due_date()
 
     def is_complete(self):
         """
@@ -59,7 +61,7 @@ class FolditModule(XModule):
             self.system.anonymous_student_id,
             self.required_level,
             self.required_sublevel,
-            self.due)
+            self.due_time)
         return complete
 
     def completed_puzzles(self):
@@ -86,7 +88,10 @@ class FolditModule(XModule):
         """
         from foldit.models import Score
 
-        return [(e['username'], e['score']) for e in Score.get_tops_n(10)]
+        leaders = [(e['username'], e['score']) for e in Score.get_tops_n(10)]
+        leaders.sort(key=lambda x: -x[1])
+
+        return leaders
 
     def get_html(self):
         """
@@ -96,11 +101,11 @@ class FolditModule(XModule):
             self.required_level,
             self.required_sublevel)
 
-        showbasic = (self.metadata.get("show_basic_score", "").lower() == "true")
-        showleader = (self.metadata.get("show_leaderboard", "").lower() == "true")
+        showbasic = (self.show_basic_score.lower() == "true")
+        showleader = (self.show_leaderboard.lower() == "true")
 
         context = {
-            'due': self.due_str,
+            'due': self.due,
             'success': self.is_complete(),
             'goal_level': goal_level,
             'completed': self.completed_puzzles(),
@@ -122,7 +127,7 @@ class FolditModule(XModule):
             self.required_sublevel)
 
         context = {
-            'due': self.due_str,
+            'due': self.due,
             'success': self.is_complete(),
             'goal_level': goal_level,
             'completed': self.completed_puzzles(),
@@ -152,7 +157,7 @@ class FolditModule(XModule):
 
 
 
-class FolditDescriptor(XmlDescriptor, EditingDescriptor):
+class FolditDescriptor(FolditFields, XmlDescriptor, EditingDescriptor):
     """
     Module for adding Foldit problems to courses
     """
@@ -173,7 +178,8 @@ class FolditDescriptor(XmlDescriptor, EditingDescriptor):
 
     @classmethod
     def definition_from_xml(cls, xml_object, system):
-        """
-        Get the xml_object's attributes.
-        """
-        return {'metadata': xml_object.attrib}
+        return ({}, [])
+
+    def definition_to_xml(self):
+        xml_object = etree.Element('foldit')
+        return xml_object
diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index ef1be96c84..00e8cf1f10 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -14,12 +14,18 @@ from xmodule.xml_module import XmlDescriptor
 from xmodule.x_module import XModule
 from xmodule.stringify import stringify_children
 from pkg_resources import resource_string
+from xblock.core import String, Scope
 
 
 log = logging.getLogger(__name__)
 
 
-class GraphicalSliderToolModule(XModule):
+class GraphicalSliderToolFields(object):
+    render = String(scope=Scope.content)
+    configuration = String(scope=Scope.content)
+
+
+class GraphicalSliderToolModule(GraphicalSliderToolFields, XModule):
     ''' Graphical-Slider-Tool Module
     '''
 
@@ -43,15 +49,6 @@ class GraphicalSliderToolModule(XModule):
     }
     js_module_name = "GraphicalSliderTool"
 
-    def __init__(self, system, location, definition, descriptor, instance_state=None,
-                 shared_state=None, **kwargs):
-        """
-        For XML file format please look at documentation. TODO - receive
-        information where to store XML documentation.
-        """
-        XModule.__init__(self, system, location, definition, descriptor,
-                         instance_state, shared_state, **kwargs)
-
     def get_html(self):
         """ Renders parameters to template. """
 
@@ -60,14 +57,14 @@ class GraphicalSliderToolModule(XModule):
         self.html_class = self.location.category
         self.configuration_json = self.build_configuration_json()
         params = {
-                  'gst_html': self.substitute_controls(self.definition['render']),
+                  'gst_html': self.substitute_controls(self.render),
                   'element_id': self.html_id,
                   'element_class': self.html_class,
                   'configuration_json': self.configuration_json
                   }
-        self.content = self.system.render_template(
+        content = self.system.render_template(
                         'graphical_slider_tool.html', params)
-        return self.content
+        return content
 
     def substitute_controls(self, html_string):
         """ Substitutes control elements (slider, textbox and plot) in
@@ -139,10 +136,10 @@ class GraphicalSliderToolModule(XModule):
         # <root> added for interface compatibility with xmltodict.parse
         # class added for javascript's part purposes
         return json.dumps(xmltodict.parse('<root class="' + self.html_class +
-                '">' + self.definition['configuration'] + '</root>'))
+                '">' + self.configuration + '</root>'))
 
 
-class GraphicalSliderToolDescriptor(MakoModuleDescriptor, XmlDescriptor):
+class GraphicalSliderToolDescriptor(GraphicalSliderToolFields, MakoModuleDescriptor, XmlDescriptor):
     module_class = GraphicalSliderToolModule
     template_dir_name = 'graphical_slider_tool'
 
@@ -177,14 +174,14 @@ class GraphicalSliderToolDescriptor(MakoModuleDescriptor, XmlDescriptor):
         return {
                     'render': parse('render'),
                     'configuration': parse('configuration')
-                }
+                }, []
 
     def definition_to_xml(self, resource_fs):
         '''Return an xml element representing this definition.'''
         xml_object = etree.Element('graphical_slider_tool')
 
         def add_child(k):
-            child_str = '<{tag}>{body}</{tag}>'.format(tag=k, body=self.definition[k])
+            child_str = '<{tag}>{body}</{tag}>'.format(tag=k, body=getattr(self, k))
             child_node = etree.fromstring(child_str)
             xml_object.append(child_node)
 
diff --git a/common/lib/xmodule/xmodule/html_module.py b/common/lib/xmodule/xmodule/html_module.py
index 456ea3cf10..e9cec32e3e 100644
--- a/common/lib/xmodule/xmodule/html_module.py
+++ b/common/lib/xmodule/xmodule/html_module.py
@@ -7,10 +7,9 @@ from lxml import etree
 from path import path
 
 from pkg_resources import resource_string
-from xmodule.contentstore.content import XASSET_SRCREF_PREFIX, StaticContent
+from xblock.core import Scope, String
 from xmodule.editing_module import EditingDescriptor
 from xmodule.html_checker import check_html
-from xmodule.modulestore import Location
 from xmodule.stringify import stringify_children
 from xmodule.x_module import XModule
 from xmodule.xml_module import XmlDescriptor, name_to_pathname
@@ -18,7 +17,11 @@ from xmodule.xml_module import XmlDescriptor, name_to_pathname
 log = logging.getLogger("mitx.courseware")
 
 
-class HtmlModule(XModule):
+class HtmlFields(object):
+    data = String(help="Html contents to display for this module", scope=Scope.content)
+
+
+class HtmlModule(HtmlFields, XModule):
     js = {'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee'),
                      resource_string(__name__, 'js/src/collapsible.coffee'),
                      resource_string(__name__, 'js/src/html/display.coffee')
@@ -28,17 +31,10 @@ class HtmlModule(XModule):
     css = {'scss': [resource_string(__name__, 'css/html/display.scss')]}
 
     def get_html(self):
-        return self.html
-
-    def __init__(self, system, location, definition, descriptor,
-                 instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor,
-                         instance_state, shared_state, **kwargs)
-        self.html = self.definition['data']
+        return self.data
 
 
-
-class HtmlDescriptor(XmlDescriptor, EditingDescriptor):
+class HtmlDescriptor(HtmlFields, XmlDescriptor, EditingDescriptor):
     """
     Module for putting raw html in a course
     """
@@ -91,7 +87,7 @@ class HtmlDescriptor(XmlDescriptor, EditingDescriptor):
         if filename is None:
             definition_xml = copy.deepcopy(xml_object)
             cls.clean_metadata_from_xml(definition_xml)
-            return {'data': stringify_children(definition_xml)}
+            return {'data': stringify_children(definition_xml)}, []
         else:
             # html is special.  cls.filename_extension is 'xml', but
             # if 'filename' is in the definition, that means to load
@@ -105,8 +101,6 @@ class HtmlDescriptor(XmlDescriptor, EditingDescriptor):
             filepath = "{base}/{name}.html".format(base=base, name=filename)
             #log.debug("looking for html file for {0} at {1}".format(location, filepath))
 
-
-
             # VS[compat]
             # TODO (cpennington): If the file doesn't exist at the right path,
             # give the class a chance to fix it up. The file will be written out
@@ -135,7 +129,7 @@ class HtmlDescriptor(XmlDescriptor, EditingDescriptor):
                     # for Fall 2012 LMS migration: keep filename (and unmangled filename)
                     definition['filename'] = [filepath, filename]
 
-                    return definition
+                    return definition, []
 
             except (ResourceNotFoundError) as err:
                 msg = 'Unable to load file contents at path {0}: {1} '.format(
@@ -151,19 +145,18 @@ class HtmlDescriptor(XmlDescriptor, EditingDescriptor):
         string to filename.html.
         '''
         try:
-            return etree.fromstring(self.definition['data'])
+            return etree.fromstring(self.data)
         except etree.XMLSyntaxError:
             pass
 
         # Not proper format.  Write html to file, return an empty tag
         pathname = name_to_pathname(self.url_name)
-        pathdir = path(pathname).dirname()
         filepath = u'{category}/{pathname}.html'.format(category=self.category,
                                                     pathname=pathname)
 
         resource_fs.makedir(os.path.dirname(filepath), recursive=True, allow_recreate=True)
         with resource_fs.open(filepath, 'w') as file:
-            file.write(self.definition['data'].encode('utf-8'))
+            file.write(self.data.encode('utf-8'))
 
         # write out the relative name
         relname = path(pathname).basename()
@@ -175,8 +168,11 @@ class HtmlDescriptor(XmlDescriptor, EditingDescriptor):
     @property
     def editable_metadata_fields(self):
         """Remove any metadata from the editable fields which have their own editor or shouldn't be edited by user."""
-        subset = [field for field in super(HtmlDescriptor,self).editable_metadata_fields
-                  if field not in ['empty']]
+        subset = super(HtmlDescriptor, self).editable_metadata_fields
+
+        if 'empty' in subset:
+            del subset['empty']
+
         return subset
 
 
diff --git a/common/lib/xmodule/xmodule/js/src/conditional/display.coffee b/common/lib/xmodule/xmodule/js/src/conditional/display.coffee
index 33dcb29079..857424c1dc 100644
--- a/common/lib/xmodule/xmodule/js/src/conditional/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/conditional/display.coffee
@@ -1,26 +1,35 @@
 class @Conditional
 
-  constructor: (element) ->
+  constructor: (element, callerElId) ->
     @el = $(element).find('.conditional-wrapper')
-    @id = @el.data('problem-id')
-    @element_id = @el.attr('id')
+
+    @callerElId = callerElId
+
+    if callerElId isnt undefined
+      dependencies = @el.data('depends')
+      if (typeof dependencies is 'string') and (dependencies.length > 0) and (dependencies.indexOf(callerElId) is -1)
+        return
+
     @url = @el.data('url')
-    @render()
+    @render(element)
 
-  $: (selector) ->
-    $(selector, @el)
-
-  updateProgress: (response) =>
-    if response.progress_changed
-        @el.attr progress: response.progress_status
-        @el.trigger('progressChanged')
-
-  render: (content) ->
-    if content
-      @el.html(content)
-      XModule.loadModules(@el)
-    else
+  render: (element) ->
       $.postWithPrefix "#{@url}/conditional_get", (response) =>
-        @el.html(response.html)
-        XModule.loadModules(@el)
+        @el.html ''
+        @el.append(i) for i in response.html
 
+        parentEl = $(element).parent()
+        parentId = parentEl.attr 'id'
+
+        if response.message is false
+          if parentId.indexOf('vert') is 0
+            parentEl.hide()
+          else
+            $(element).hide()
+        else
+          if parentId.indexOf('vert') is 0
+            parentEl.show()
+          else
+            $(element).show()
+
+        XModule.loadModules @el
diff --git a/common/lib/xmodule/xmodule/js/src/poll/logme.js b/common/lib/xmodule/xmodule/js/src/poll/logme.js
new file mode 100644
index 0000000000..c045757044
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/poll/logme.js
@@ -0,0 +1,54 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('logme', [], function () {
+    var debugMode;
+
+    // debugMode can be one of the following:
+    //
+    //     true - All messages passed to logme will be written to the internal
+    //            browser console.
+    //     false - Suppress all output to the internal browser console.
+    //
+    // Obviously, if anywhere there is a direct console.log() call, we can't do
+    // anything about it. That's why use logme() - it will allow to turn off
+    // the output of debug information with a single change to a variable.
+    debugMode = true;
+
+    return logme;
+
+    /*
+     * function: logme
+     *
+     * A helper function that provides logging facilities. We don't want
+     * to call console.log() directly, because sometimes it is not supported
+     * by the browser. Also when everything is routed through this function.
+     * the logging output can be easily turned off.
+     *
+     * logme() supports multiple parameters. Each parameter will be passed to
+     * console.log() function separately.
+     *
+     */
+    function logme() {
+        var i;
+
+        if (
+            (typeof debugMode === 'undefined') ||
+            (debugMode !== true) ||
+            (typeof window.console === 'undefined')
+        ) {
+            return;
+        }
+
+        for (i = 0; i < arguments.length; i++) {
+            window.console.log(arguments[i]);
+        }
+    } // End-of: function logme
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/poll/poll.js b/common/lib/xmodule/xmodule/js/src/poll/poll.js
new file mode 100644
index 0000000000..a2ccbc7c03
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/poll/poll.js
@@ -0,0 +1,5 @@
+window.Poll = function (el) {
+    RequireJS.require(['PollMain'], function (PollMain) {
+        new PollMain(el);
+    });
+};
diff --git a/common/lib/xmodule/xmodule/js/src/poll/poll_main.js b/common/lib/xmodule/xmodule/js/src/poll/poll_main.js
new file mode 100644
index 0000000000..74f2a488d7
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/poll/poll_main.js
@@ -0,0 +1,323 @@
+(function (requirejs, require, define) {
+define('PollMain', ['logme'], function (logme) {
+
+PollMain.prototype = {
+
+'showAnswerGraph': function (poll_answers, total) {
+    var _this, totalValue;
+
+    totalValue = parseFloat(total);
+    if (isFinite(totalValue) === false) {
+        return;
+    }
+
+    _this = this;
+
+    $.each(poll_answers, function (index, value) {
+        var numValue, percentValue;
+
+        numValue = parseFloat(value);
+        if (isFinite(numValue) === false) {
+            return;
+        }
+
+        percentValue = (numValue / totalValue) * 100.0;
+
+        _this.answersObj[index].statsEl.show();
+        _this.answersObj[index].numberEl.html('' + value + ' (' + percentValue.toFixed(1) + '%)');
+        _this.answersObj[index].percentEl.css({
+            'width': '' + percentValue.toFixed(1) + '%'
+        });
+    });
+},
+
+'submitAnswer': function (answer, answerObj) {
+    var _this;
+
+    // Make sure that the user can answer a question only once.
+    if (this.questionAnswered === true) {
+        return;
+    }
+    this.questionAnswered = true;
+
+    _this = this;
+
+    console.log('submit answer');
+
+    answerObj.buttonEl.addClass('answered');
+
+    // Send the data to the server as an AJAX request. Attach a callback that will
+    // be fired on server's response.
+    $.postWithPrefix(
+        _this.ajax_url + '/' + answer,  {},
+        function (response) {
+            console.log('success! response = ');
+            console.log(response);
+
+            _this.showAnswerGraph(response.poll_answers, response.total);
+
+            if (_this.canReset === true) {
+                _this.resetButton.show();
+            }
+
+            // Initialize Conditional constructors.
+            if (_this.wrapperSectionEl !== null) {
+                $(_this.wrapperSectionEl).find('.xmodule_ConditionalModule').each(function (index, value) {
+                    new window.Conditional(value, _this.id.replace(/^poll_/, ''));
+                });
+            }
+        }
+    );
+
+}, // End-of: 'submitAnswer': function (answer, answerEl) {
+
+
+'submitReset': function () {
+    var _this;
+
+    _this = this;
+
+    console.log('submit reset');
+
+    // Send the data to the server as an AJAX request. Attach a callback that will
+    // be fired on server's response.
+    $.postWithPrefix(
+        this.ajax_url + '/' + 'reset_poll',
+        {},
+        function (response) {
+            console.log('success! response = ');
+            console.log(response);
+
+            if (
+                (response.hasOwnProperty('status') !== true) ||
+                (typeof response.status !== 'string') ||
+                (response.status.toLowerCase() !== 'success')) {
+                return;
+            }
+
+            _this.questionAnswered = false;
+            _this.questionEl.find('.button.answered').removeClass('answered');
+            _this.questionEl.find('.stats').hide();
+            _this.resetButton.hide();
+
+            // Initialize Conditional constructors. We will specify the third parameter as 'true'
+            // notifying the constructor that this is a reset operation.
+            if (_this.wrapperSectionEl !== null) {
+                $(_this.wrapperSectionEl).find('.xmodule_ConditionalModule').each(function (index, value) {
+                    new window.Conditional(value, _this.id.replace(/^poll_/, ''));
+                });
+            }
+        }
+    );
+}, // End-of: 'submitAnswer': function (answer, answerEl) {
+
+'postInit': function () {
+    var _this;
+
+    // Access this object inside inner functions.
+    _this = this;
+
+    if (
+        (this.jsonConfig.poll_answer.length > 0) &&
+        (this.jsonConfig.answers.hasOwnProperty(this.jsonConfig.poll_answer) === false)
+    ) {
+        this.questionEl.append(
+            '<h3>Error!</h3>' +
+            '<p>XML data format changed. List of answers was modified, but poll data was not updated.</p>'
+        );
+
+        return;
+    }
+
+    // Get the DOM id of the question.
+    this.id = this.questionEl.attr('id');
+
+    // Get the URL to which we will post the users answer to the question.
+    this.ajax_url = this.questionEl.data('ajax-url');
+
+    this.questionHtmlMarkup = $('<div />').html(this.jsonConfig.question).text();
+    this.questionEl.append(this.questionHtmlMarkup);
+
+    // When the user selects and answer, we will set this flag to true.
+    this.questionAnswered = false;
+
+    this.answersObj = {};
+    this.shortVersion = true;
+
+    $.each(this.jsonConfig.answers, function (index, value) {
+        if (value.length >= 18) {
+            _this.shortVersion = false;
+        }
+    });
+
+    $.each(this.jsonConfig.answers, function (index, value) {
+        var answer;
+
+        answer = {};
+
+        _this.answersObj[index] = answer;
+
+        answer.el = $('<div class="poll_answer"></div>');
+
+        answer.questionEl = $('<div class="question"></div>');
+        answer.buttonEl = $('<div class="button"></div>');
+        answer.textEl = $('<div class="text"></div>');
+        answer.questionEl.append(answer.buttonEl);
+        answer.questionEl.append(answer.textEl);
+
+        answer.el.append(answer.questionEl);
+
+        answer.statsEl = $('<div class="stats"></div>');
+        answer.barEl = $('<div class="bar"></div>');
+        answer.percentEl = $('<div class="percent"></div>');
+        answer.barEl.append(answer.percentEl);
+        answer.numberEl = $('<div class="number"></div>');
+        answer.statsEl.append(answer.barEl);
+        answer.statsEl.append(answer.numberEl);
+
+        answer.statsEl.hide();
+
+        answer.el.append(answer.statsEl);
+
+        answer.textEl.html(value);
+
+        if (_this.shortVersion === true) {
+            $.each(answer, function (index, value) {
+                if (value instanceof jQuery) {
+                    value.addClass('short');
+                }
+            });
+        }
+
+        answer.el.appendTo(_this.questionEl);
+
+        answer.textEl.on('click', function () {
+            _this.submitAnswer(index, answer);
+        });
+
+        answer.buttonEl.on('click', function () {
+            _this.submitAnswer(index, answer);
+        });
+
+        if (index === _this.jsonConfig.poll_answer) {
+            answer.buttonEl.addClass('answered');
+            _this.questionAnswered = true;
+        }
+    });
+
+    console.log(this.jsonConfig.reset);
+
+    if ((typeof this.jsonConfig.reset === 'string') && (this.jsonConfig.reset.toLowerCase() === 'true')) {
+        this.canReset = true;
+
+        this.resetButton = $('<div class="button reset-button">Change your vote</div>');
+
+        if (this.questionAnswered === false) {
+            this.resetButton.hide();
+        }
+
+        this.resetButton.appendTo(this.questionEl);
+
+        this.resetButton.on('click', function () {
+            _this.submitReset();
+        });
+    } else {
+        this.canReset = false;
+    }
+
+    // If it turns out that the user already answered the question, show the answers graph.
+    if (this.questionAnswered === true) {
+        this.showAnswerGraph(this.jsonConfig.poll_answers, this.jsonConfig.total);
+    }
+} // End-of: 'postInit': function () {
+}; // End-of: PollMain.prototype = {
+
+return PollMain;
+
+function PollMain(el) {
+    var _this;
+
+    this.questionEl = $(el).find('.poll_question');
+    if (this.questionEl.length !== 1) {
+        // We require one question DOM element.
+        logme('ERROR: PollMain constructor requires one question DOM element.');
+
+        return;
+    }
+
+    // Just a safety precussion. If we run this code more than once, multiple 'click' callback handlers will be
+    // attached to the same DOM elements. We don't want this to happen.
+    if (this.questionEl.attr('poll_main_processed') === 'true') {
+        logme(
+            'ERROR: PolMain JS constructor was called on a DOM element that has already been processed once.'
+        );
+
+        return;
+    }
+
+    // This element was not processed earlier.
+    // Make sure that next time we will not process this element a second time.
+    this.questionEl.attr('poll_main_processed', 'true');
+
+    // Access this object inside inner functions.
+    _this = this;
+
+    // DOM element which contains the current poll along with any conditionals. By default we assume that such
+    // element is not present. We will try to find it.
+    this.wrapperSectionEl = null;
+
+    (function (tempEl, c1) {
+        while (tempEl.tagName.toLowerCase() !== 'body') {
+            tempEl = $(tempEl).parent()[0];
+            c1 += 1;
+
+            if (
+                (tempEl.tagName.toLowerCase() === 'section') &&
+                ($(tempEl).hasClass('xmodule_WrapperModule') === true)
+            ) {
+                _this.wrapperSectionEl = tempEl;
+
+                break;
+            } else if (c1 > 50) {
+                // In case something breaks, and we enter an endless loop, a sane
+                // limit for loop iterations.
+
+                break;
+            }
+        }
+    }($(el)[0], 0));
+
+    try {
+        this.jsonConfig = JSON.parse(this.questionEl.children('.poll_question_div').html());
+
+        $.postWithPrefix(
+            '' + this.questionEl.data('ajax-url') + '/' + 'get_state',  {},
+            function (response) {
+                _this.jsonConfig.poll_answer = response.poll_answer;
+                _this.jsonConfig.total = response.total;
+
+                $.each(response.poll_answers, function (index, value) {
+                    _this.jsonConfig.poll_answers[index] = value;
+                });
+
+                _this.questionEl.children('.poll_question_div').html(JSON.stringify(_this.jsonConfig));
+
+                _this.postInit();
+            }
+        );
+
+        return;
+    } catch (err) {
+        logme(
+            'ERROR: Invalid JSON config for poll ID "' + this.id + '".',
+            'Error messsage: "' + err.message + '".'
+        );
+
+        return;
+    }
+} // End-of: function PollMain(el) {
+
+}); // End-of: define('PollMain', ['logme'], function (logme) {
+
+// End-of: (function (requirejs, require, define) {
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define));
diff --git a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
index 793e7f4f3c..0e4c9788ba 100644
--- a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
@@ -56,7 +56,7 @@ class @Sequence
       element.removeClass('progress-none')
              .removeClass('progress-some')
              .removeClass('progress-done')
-      
+
       switch progress
         when 'none' then element.addClass('progress-none')
         when 'in_progress' then element.addClass('progress-some')
@@ -65,6 +65,11 @@ class @Sequence
   toggleArrows: =>
     @$('.sequence-nav-buttons a').unbind('click')
 
+    if @contents.length == 0
+      @$('.sequence-nav-buttons .prev a').addClass('disabled')
+      @$('.sequence-nav-buttons .next a').addClass('disabled')
+      return
+
     if @position == 1
       @$('.sequence-nav-buttons .prev a').addClass('disabled')
     else
@@ -105,8 +110,8 @@ class @Sequence
 
     if (1 <= new_position) and (new_position <= @num_contents)
       Logger.log "seq_goto", old: @position, new: new_position, id: @id
-    
-      # On Sequence chage, destroy any existing polling thread 
+
+      # On Sequence chage, destroy any existing polling thread
       #   for queued submissions, see ../capa/display.coffee
       if window.queuePollerID
         window.clearTimeout(window.queuePollerID)
diff --git a/common/lib/xmodule/xmodule/js/src/video/display.coffee b/common/lib/xmodule/xmodule/js/src/video/display.coffee
index 1876330340..aadafbc8d0 100644
--- a/common/lib/xmodule/xmodule/js/src/video/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/video/display.coffee
@@ -4,7 +4,6 @@ class @Video
     @id = @el.attr('id').replace(/video_/, '')
     @start = @el.data('start')
     @end = @el.data('end')
-    @caption_data_dir = @el.data('caption-data-dir')
     @caption_asset_path = @el.data('caption-asset-path')
     @show_captions = @el.data('show-captions') == "true"
     window.player = null
diff --git a/common/lib/xmodule/xmodule/js/src/wrapper/edit.coffee b/common/lib/xmodule/xmodule/js/src/wrapper/edit.coffee
new file mode 100644
index 0000000000..a13c5a8bc7
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/wrapper/edit.coffee
@@ -0,0 +1,10 @@
+class @WrapperDescriptor extends XModule.Descriptor
+  constructor: (@element) ->
+    console.log 'WrapperDescriptor'
+    @$items = $(@element).find(".vert-mod")
+    @$items.sortable(
+      update: (event, ui) => @update()
+    )
+
+  save: ->
+    children: $('.vert-mod li', @element).map((idx, el) -> $(el).data('id')).toArray()
diff --git a/common/lib/xmodule/xmodule/mako_module.py b/common/lib/xmodule/xmodule/mako_module.py
index da96bfa212..84db6ad779 100644
--- a/common/lib/xmodule/xmodule/mako_module.py
+++ b/common/lib/xmodule/xmodule/mako_module.py
@@ -1,5 +1,5 @@
-from x_module import XModuleDescriptor, DescriptorSystem
-import logging
+from .x_module import XModuleDescriptor, DescriptorSystem
+from .modulestore.inheritance import own_metadata
 
 
 class MakoDescriptorSystem(DescriptorSystem):
@@ -21,21 +21,21 @@ class MakoModuleDescriptor(XModuleDescriptor):
     the descriptor as the `module` parameter to that template
     """
 
-    def __init__(self, system, definition=None, **kwargs):
+    def __init__(self, system, location, model_data):
         if getattr(system, 'render_template', None) is None:
             raise TypeError('{system} must have a render_template function'
                             ' in order to use a MakoDescriptor'.format(
                     system=system))
-        super(MakoModuleDescriptor, self).__init__(system, definition, **kwargs)
+        super(MakoModuleDescriptor, self).__init__(system, location, model_data)
 
     def get_context(self):
         """
         Return the context to render the mako template with
         """
-        return {'module': self,
-                'metadata': self.metadata,
-                'editable_metadata_fields': self.editable_metadata_fields
-                }
+        return {
+            'module': self,
+            'editable_metadata_fields': self.editable_metadata_fields,
+        }
 
     def get_html(self):
         return self.system.render_template(
@@ -44,6 +44,10 @@ class MakoModuleDescriptor(XModuleDescriptor):
     # cdodge: encapsulate a means to expose "editable" metadata fields (i.e. not internal system metadata)
     @property
     def editable_metadata_fields(self):
-        subset = [name for name in self.metadata.keys() if name not in self.system_metadata_fields and 
-            name not in self._inherited_metadata]
-        return subset
+        fields = {}
+        for field, value in own_metadata(self).items():
+            if field in self.system_metadata_fields:
+                continue
+
+            fields[field] = value
+        return fields
diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/common/lib/xmodule/xmodule/modulestore/__init__.py
index 525527c93f..022e016a58 100644
--- a/common/lib/xmodule/xmodule/modulestore/__init__.py
+++ b/common/lib/xmodule/xmodule/modulestore/__init__.py
@@ -423,6 +423,7 @@ class ModuleStoreBase(ModuleStore):
         Set up the error-tracking logic.
         '''
         self._location_errors = {}    # location -> ErrorLog
+        self.metadata_inheritance_cache = None
 
     def _get_errorlog(self, location):
         """
diff --git a/common/lib/xmodule/xmodule/modulestore/django.py b/common/lib/xmodule/xmodule/modulestore/django.py
index 0b86c2fea4..b0a65273c7 100644
--- a/common/lib/xmodule/xmodule/modulestore/django.py
+++ b/common/lib/xmodule/xmodule/modulestore/django.py
@@ -33,11 +33,12 @@ def modulestore(name='default'):
         class_ = load_function(settings.MODULESTORE[name]['ENGINE'])
 
         options = {}
+
         options.update(settings.MODULESTORE[name]['OPTIONS'])
         for key in FUNCTION_KEYS:
             if key in options:
                 options[key] = load_function(options[key])
-
+                
         _MODULESTORES[name] = class_(
             **options
         )
diff --git a/common/lib/xmodule/xmodule/modulestore/draft.py b/common/lib/xmodule/xmodule/modulestore/draft.py
index 81f4da2780..71922c08df 100644
--- a/common/lib/xmodule/xmodule/modulestore/draft.py
+++ b/common/lib/xmodule/xmodule/modulestore/draft.py
@@ -15,11 +15,11 @@ def as_draft(location):
 
 def wrap_draft(item):
     """
-    Sets `item.metadata['is_draft']` to `True` if the item is a
-    draft, and false otherwise. Sets the item's location to the
+    Sets `item.cms.is_draft` to `True` if the item is a
+    draft, and `False` otherwise. Sets the item's location to the
     non-draft location in either case
     """
-    item.metadata['is_draft'] = item.location.revision == DRAFT
+    item.cms.is_draft = item.location.revision == DRAFT
     item.location = item.location._replace(revision=None)
     return item
 
@@ -118,7 +118,7 @@ class DraftModuleStore(ModuleStoreBase):
         """
         draft_loc = as_draft(location)
         draft_item = self.get_item(location)
-        if not draft_item.metadata['is_draft']:
+        if not draft_item.cms.is_draft:
             self.clone_item(location, draft_loc)
 
         return super(DraftModuleStore, self).update_item(draft_loc, data)
@@ -133,7 +133,7 @@ class DraftModuleStore(ModuleStoreBase):
         """
         draft_loc = as_draft(location)
         draft_item = self.get_item(location)
-        if not draft_item.metadata['is_draft']:
+        if not draft_item.cms.is_draft:
             self.clone_item(location, draft_loc)
 
         return super(DraftModuleStore, self).update_children(draft_loc, children)
@@ -149,7 +149,7 @@ class DraftModuleStore(ModuleStoreBase):
         draft_loc = as_draft(location)
         draft_item = self.get_item(location)
 
-        if not draft_item.metadata['is_draft']:
+        if not draft_item.cms.is_draft:
             self.clone_item(location, draft_loc)
 
         if 'is_draft' in metadata:
@@ -179,13 +179,11 @@ class DraftModuleStore(ModuleStoreBase):
         Save a current draft to the underlying modulestore
         """
         draft = self.get_item(location)
-        metadata = {}
-        metadata.update(draft.metadata)
-        metadata['published_date'] = tuple(datetime.utcnow().timetuple())
-        metadata['published_by'] = published_by_id
-        super(DraftModuleStore, self).update_item(location, draft.definition.get('data', {}))
-        super(DraftModuleStore, self).update_children(location, draft.definition.get('children', []))
-        super(DraftModuleStore, self).update_metadata(location, metadata)
+        draft.cms.published_date = datetime.utcnow()
+        draft.cms.published_by = published_by_id
+        super(DraftModuleStore, self).update_item(location, draft._model_data._kvs._data)
+        super(DraftModuleStore, self).update_children(location, draft._model_data._kvs._children)
+        super(DraftModuleStore, self).update_metadata(location, draft._model_data._kvs._metadata)
         self.delete_item(location)
 
     def unpublish(self, location):
diff --git a/common/lib/xmodule/xmodule/modulestore/inheritance.py b/common/lib/xmodule/xmodule/modulestore/inheritance.py
new file mode 100644
index 0000000000..d819abe367
--- /dev/null
+++ b/common/lib/xmodule/xmodule/modulestore/inheritance.py
@@ -0,0 +1,67 @@
+from xblock.core import Scope
+
+# A list of metadata that this module can inherit from its parent module
+INHERITABLE_METADATA = (
+    'graded', 'start', 'due', 'graceperiod', 'showanswer', 'rerandomize',
+    # TODO (ichuang): used for Fall 2012 xqa server access
+    'xqa_key',
+    # How many days early to show a course element to beta testers (float)
+    # intended to be set per-course, but can be overridden in for specific
+    # elements.  Can be a float.
+    'days_early_for_beta'
+)
+
+def compute_inherited_metadata(descriptor):
+    """Given a descriptor, traverse all of its descendants and do metadata
+    inheritance.  Should be called on a CourseDescriptor after importing a
+    course.
+
+    NOTE: This means that there is no such thing as lazy loading at the
+    moment--this accesses all the children."""
+    for child in descriptor.get_children():
+        inherit_metadata(child, descriptor._model_data)
+        compute_inherited_metadata(child)
+
+
+def inherit_metadata(descriptor, model_data):
+    """
+    Updates this module with metadata inherited from a containing module.
+    Only metadata specified in self.inheritable_metadata will
+    be inherited
+    """
+    if not hasattr(descriptor, '_inherited_metadata'):
+        setattr(descriptor, '_inherited_metadata', {})
+
+    # Set all inheritable metadata from kwargs that are
+    # in self.inheritable_metadata and aren't already set in metadata
+    for attr in INHERITABLE_METADATA:
+        if attr not in descriptor._model_data and attr in model_data:
+            descriptor._inherited_metadata[attr] = model_data[attr]
+            descriptor._model_data[attr] = model_data[attr]
+
+
+def own_metadata(module):
+    """
+    Return a dictionary that contains only non-inherited field keys,
+    mapped to their values
+    """
+    inherited_metadata = getattr(module, '_inherited_metadata', {})
+    metadata = {}
+    for field in module.fields + module.lms.fields:
+        # Only save metadata that wasn't inherited
+        if field.scope != Scope.settings:
+            continue
+
+        if field.name in inherited_metadata and module._model_data.get(field.name) == inherited_metadata.get(field.name):
+            continue
+
+        if field.name not in module._model_data:
+            continue
+
+        try:
+            metadata[field.name] = module._model_data[field.name]
+        except KeyError:
+            # Ignore any missing keys in _model_data
+            pass
+
+    return metadata
diff --git a/common/lib/xmodule/xmodule/modulestore/mongo.py b/common/lib/xmodule/xmodule/modulestore/mongo.py
index e2a4524188..c5e5bbfdf8 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo.py
@@ -4,6 +4,7 @@ import logging
 import copy
 
 from bson.son import SON
+from collections import namedtuple
 from fs.osfs import OSFS
 from itertools import repeat
 from path import path
@@ -11,20 +12,93 @@ from datetime import datetime, timedelta
 
 from importlib import import_module
 from xmodule.errortracker import null_error_tracker, exc_info_to_str
-from xmodule.x_module import XModuleDescriptor
 from xmodule.mako_module import MakoDescriptorSystem
+from xmodule.x_module import XModuleDescriptor
 from xmodule.error_module import ErrorDescriptor
+from xblock.runtime import DbModel, KeyValueStore, InvalidScopeError
+from xblock.core import Scope
 
 from . import ModuleStoreBase, Location
 from .draft import DraftModuleStore
 from .exceptions import (ItemNotFoundError,
                          DuplicateItemError)
+from .inheritance import own_metadata, INHERITABLE_METADATA, inherit_metadata
+
+log = logging.getLogger(__name__)
 
 # TODO (cpennington): This code currently operates under the assumption that
 # there is only one revision for each item. Once we start versioning inside the CMS,
 # that assumption will have to change
 
 
+class MongoKeyValueStore(KeyValueStore):
+    """
+    A KeyValueStore that maps keyed data access to one of the 3 data areas
+    known to the MongoModuleStore (data, children, and metadata)
+    """
+    def __init__(self, data, children, metadata):
+        self._data = data
+        self._children = children
+        self._metadata = metadata
+
+    def get(self, key):
+        if key.scope == Scope.children:
+            return self._children
+        elif key.scope == Scope.parent:
+            return None
+        elif key.scope == Scope.settings:
+            return self._metadata[key.field_name]
+        elif key.scope == Scope.content:
+            if key.field_name == 'data' and not isinstance(self._data, dict):
+                return self._data
+            else:
+                return self._data[key.field_name]
+        else:
+            raise InvalidScopeError(key.scope)
+
+    def set(self, key, value):
+        if key.scope == Scope.children:
+            self._children = value
+        elif key.scope == Scope.settings:
+            self._metadata[key.field_name] = value
+        elif key.scope == Scope.content:
+            if key.field_name == 'data' and not isinstance(self._data, dict):
+                self._data = value
+            else:
+                self._data[key.field_name] = value
+        else:
+            raise InvalidScopeError(key.scope)
+
+    def delete(self, key):
+        if key.scope == Scope.children:
+            self._children = []
+        elif key.scope == Scope.settings:
+            if key.field_name in self._metadata:
+                del self._metadata[key.field_name]
+        elif key.scope == Scope.content:
+            if key.field_name == 'data' and not isinstance(self._data, dict):
+                self._data = None
+            else:
+                del self._data[key.field_name]
+        else:
+            raise InvalidScopeError(key.scope)
+
+    def has(self, key):
+        if key.scope in (Scope.children, Scope.parent):
+            return True
+        elif key.scope == Scope.settings:
+            return key.field_name in self._metadata
+        elif key.scope == Scope.content:
+            if key.field_name == 'data' and not isinstance(self._data, dict):
+                return True
+            else:
+                return key.field_name in self._data
+        else:
+            return False
+
+MongoUsage = namedtuple('MongoUsage', 'id, def_id')
+
+
 class CachingDescriptorSystem(MakoDescriptorSystem):
     """
     A system that has a cache of module json that it will use to load modules
@@ -72,12 +146,31 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
         else:
             # load the module and apply the inherited metadata
             try:
-                module = XModuleDescriptor.load_from_json(json_data, self, self.default_class)
+                class_ = XModuleDescriptor.load_class(
+                    json_data['location']['category'],
+                    self.default_class
+                )
+                definition = json_data.get('definition', {})
+                metadata = json_data.get('metadata', {})
+                for old_name, new_name in class_.metadata_translations.items():
+                    if old_name in metadata:
+                        metadata[new_name] = metadata[old_name]
+                        del metadata[old_name]
+
+                kvs = MongoKeyValueStore(
+                    definition.get('data', {}),
+                    definition.get('children', []),
+                    metadata,
+                )
+
+                model_data = DbModel(kvs, class_, None, MongoUsage(self.course_id, location))
+                module = class_(self, location, model_data)
                 if self.metadata_inheritance_tree is not None:
-                    metadata_to_inherit = self.metadata_inheritance_tree.get('parent_metadata', {}).get(location.url(),{})
-                    module.inherit_metadata(metadata_to_inherit)
+                    metadata_to_inherit = self.metadata_inheritance_tree.get('parent_metadata', {}).get(location.url(), {})
+                    inherit_metadata(module, metadata_to_inherit)
                 return module
             except:
+                log.warning("Failed to load descriptor", exc_info=True)
                 return ErrorDescriptor.from_json(
                     json_data,
                     self,
@@ -153,26 +246,21 @@ class MongoModuleStore(ModuleStoreBase):
         self.fs_root = path(fs_root)
         self.error_tracker = error_tracker
         self.render_template = render_template
-        self.metadata_inheritance_cache = {}
 
     def get_metadata_inheritance_tree(self, location):
         '''
         TODO (cdodge) This method can be deleted when the 'split module store' work has been completed
         '''
-        
+
         # get all collections in the course, this query should not return any leaf nodes
-        query = { 
+        # note this is a bit ugly as when we add new categories of containers, we have to add it here
+        query = {
                     '_id.org': location.org,
                     '_id.course': location.course,
-                    '$or': [ 
-                    {"_id.category":"course"}, 
-                    {"_id.category":"chapter"},    
-                    {"_id.category":"sequential"},    
-                    {"_id.category":"vertical"}   
-                ]
+                    '_id.category': {'$in': [ 'course', 'chapter', 'sequential', 'vertical']}
                 }
         # we just want the Location, children, and metadata
-        record_filter = {'_id':1,'definition.children':1,'metadata':1}
+        record_filter = {'_id': 1, 'definition.children': 1, 'metadata': 1}
 
         # call out to the DB
         resultset = self.collection.find(query, record_filter)
@@ -190,9 +278,15 @@ class MongoModuleStore(ModuleStoreBase):
         # now traverse the tree and compute down the inherited metadata
         metadata_to_inherit = {}
         def _compute_inherited_metadata(url):
-            my_metadata = results_by_url[url]['metadata']
+            my_metadata = {}
+            # check for presence of metadata key. Note that a given module may not yet be fully formed.
+            # example: update_item -> update_children -> update_metadata sequence on new item create
+            # if we get called here without update_metadata called first then 'metadata' hasn't been set
+            # as we're not fully transactional at the DB layer. Same comment applies to below key name
+            # check
+            my_metadata = results_by_url[url].get('metadata', {})
             for key in my_metadata.keys():
-                if key not in XModuleDescriptor.inheritable_metadata:
+                if key not in INHERITABLE_METADATA:
                     del my_metadata[key]
             results_by_url[url]['metadata'] = my_metadata
 
@@ -201,39 +295,44 @@ class MongoModuleStore(ModuleStoreBase):
             for child in results_by_url[url].get('definition',{}).get('children',[]):
                 if child in results_by_url:
                     new_child_metadata = copy.deepcopy(my_metadata)
-                    new_child_metadata.update(results_by_url[child]['metadata'])
+                    new_child_metadata.update(results_by_url[child].get('metadata', {}))
                     results_by_url[child]['metadata'] = new_child_metadata
                     metadata_to_inherit[child] = new_child_metadata
                     _compute_inherited_metadata(child)
                 else:
                     # this is likely a leaf node, so let's record what metadata we need to inherit
                     metadata_to_inherit[child] = my_metadata
-        
+
         if root is not None:
             _compute_inherited_metadata(root)
 
-        cache = {'parent_metadata': metadata_to_inherit, 
+        return {'parent_metadata': metadata_to_inherit,
             'timestamp' : datetime.now()}
 
-        return cache
-
-    def get_cached_metadata_inheritance_tree(self, location, max_age_allowed):
+    def get_cached_metadata_inheritance_tree(self, location, force_refresh=False):
         '''
         TODO (cdodge) This method can be deleted when the 'split module store' work has been completed
         '''
-        cache_name = '{0}/{1}'.format(location.org, location.course)
-        cache = self.metadata_inheritance_cache.get(cache_name,{'parent_metadata': {}, 
-            'timestamp': datetime.now() - timedelta(hours=1)})
-        age = (datetime.now() - cache['timestamp'])
+        key_name = '{0}/{1}'.format(location.org, location.course)
 
-        if age.seconds >= max_age_allowed:
-            logging.debug('loading entire inheritance tree for {0}'.format(cache_name))
-            cache = self.get_metadata_inheritance_tree(location)
-            self.metadata_inheritance_cache[cache_name] = cache
+        tree = None
+        if self.metadata_inheritance_cache is not None:
+            tree = self.metadata_inheritance_cache.get(key_name)
+        else:
+            # This is to help guard against an accident prod runtime without a cache
+            logging.warning('Running MongoModuleStore without metadata_inheritance_cache. This should not happen in production!')
 
-        return cache
+        if tree is None or force_refresh:
+            tree = self.get_metadata_inheritance_tree(location)
+            if self.metadata_inheritance_cache is not None:
+                self.metadata_inheritance_cache.set(key_name, tree)
 
+        return tree
 
+    def clear_cached_metadata_inheritance_tree(self, location):
+        key_name = '{0}/{1}'.format(location.org, location.course)       
+        if self.metadata_inheritance_cache is not None:
+            self.metadata_inheritance_cache.delete(key_name)
 
     def _clean_item_data(self, item):
         """
@@ -280,7 +379,7 @@ class MongoModuleStore(ModuleStoreBase):
         """
         Load an XModuleDescriptor from item, using the children stored in data_cache
         """
-        data_dir = item.get('metadata', {}).get('data_dir', item['location']['course'])
+        data_dir = getattr(item, 'data_dir', item['location']['course'])
         root = self.fs_root / data_dir
 
         if not root.isdir():
@@ -293,7 +392,7 @@ class MongoModuleStore(ModuleStoreBase):
         # if we are loading a course object, there is no parent to inherit the metadata from
         # so don't bother getting it
         if item['location']['category'] != 'course':
-            metadata_inheritance_tree = self.get_cached_metadata_inheritance_tree(Location(item['location']), 300)
+            metadata_inheritance_tree = self.get_cached_metadata_inheritance_tree(Location(item['location']))
 
         # TODO (cdodge): When the 'split module store' work has been completed, we should remove
         # the 'metadata_inheritance_tree' parameter
@@ -407,14 +506,20 @@ class MongoModuleStore(ModuleStoreBase):
             if location.category == 'static_tab':
                 course = self.get_course_for_item(item.location)
                 existing_tabs = course.tabs or []
-                existing_tabs.append({'type': 'static_tab', 'name': item.metadata.get('display_name'), 'url_slug': item.location.name})
+                existing_tabs.append({
+                    'type': 'static_tab',
+                    'name': item.display_name,
+                    'url_slug': item.location.name
+                })
                 course.tabs = existing_tabs
-                self.update_metadata(course.location, course.metadata)
+                self.update_metadata(course.location, course._model_data._kvs._metadata)
 
             return item
         except pymongo.errors.DuplicateKeyError:
             raise DuplicateItemError(location)
 
+        # recompute (and update) the metadata inheritance tree which is cached
+        self.get_cached_metadata_inheritance_tree(Location(location), force_refresh = True)
 
     def get_course_for_item(self, location, depth=0):
         '''
@@ -435,10 +540,10 @@ class MongoModuleStore(ModuleStoreBase):
         # make sure we found exactly one match on this above course search
         found_cnt = len(courses)
         if found_cnt == 0:
-            raise BaseException('Could not find course at {0}'.format(course_search_location))
+            raise Exception('Could not find course at {0}'.format(course_search_location))
 
         if found_cnt > 1:
-            raise BaseException('Found more than one course at {0}. There should only be one!!! Dump = {1}'.format(course_search_location, courses))
+            raise Exception('Found more than one course at {0}. There should only be one!!! Dump = {1}'.format(course_search_location, courses))
 
         return courses[0]
 
@@ -480,6 +585,8 @@ class MongoModuleStore(ModuleStoreBase):
         """
 
         self._update_single_item(location, {'definition.children': children})
+        # recompute (and update) the metadata inheritance tree which is cached
+        self.get_cached_metadata_inheritance_tree(Location(location), force_refresh = True)
 
     def update_metadata(self, location, metadata):
         """
@@ -501,10 +608,11 @@ class MongoModuleStore(ModuleStoreBase):
                     tab['name'] = metadata.get('display_name')
                     break
             course.tabs = existing_tabs
-            self.update_metadata(course.location, course.metadata)
+            self.update_metadata(course.location, own_metadata(course))
 
         self._update_single_item(location, {'metadata': metadata})
-
+        # recompute (and update) the metadata inheritance tree which is cached
+        self.get_cached_metadata_inheritance_tree(loc, force_refresh = True)      
 
     def delete_item(self, location):
         """
@@ -520,9 +628,11 @@ class MongoModuleStore(ModuleStoreBase):
             course = self.get_course_for_item(item.location)
             existing_tabs = course.tabs or []
             course.tabs = [tab for tab in existing_tabs if tab.get('url_slug') != location.name]
-            self.update_metadata(course.location, course.metadata)
+            self.update_metadata(course.location, own_metadata(course))
 
         self.collection.remove({'_id': Location(location).dict()})
+        # recompute (and update) the metadata inheritance tree which is cached
+        self.get_cached_metadata_inheritance_tree(Location(location), force_refresh = True)  
 
 
     def get_parent_locations(self, location, course_id):
diff --git a/common/lib/xmodule/xmodule/modulestore/store_utilities.py b/common/lib/xmodule/xmodule/modulestore/store_utilities.py
index 5146ac18c8..cb3cd375a7 100644
--- a/common/lib/xmodule/xmodule/modulestore/store_utilities.py
+++ b/common/lib/xmodule/xmodule/modulestore/store_utilities.py
@@ -41,22 +41,24 @@ def clone_course(modulestore, contentstore, source_location, dest_location, dele
 
         print "Cloning module {0} to {1}....".format(original_loc, module.location)
 
-        if 'data' in module.definition:
-            modulestore.update_item(module.location, module.definition['data'])
+        modulestore.update_item(module.location, module._model_data._kvs._data)
 
         # repoint children
-        if 'children' in module.definition:
+        if module.has_children:
             new_children = []
-            for child_loc_url in module.definition['children']:
+            for child_loc_url in module.children:
                 child_loc = Location(child_loc_url)
-                child_loc = child_loc._replace(tag=dest_location.tag, org=dest_location.org,
-                course=dest_location.course)
-                new_children = new_children + [child_loc.url()]
+                child_loc = child_loc._replace(
+                  tag=dest_location.tag,
+                  org=dest_location.org,
+                  course=dest_location.course
+                )
+                new_children.append(child_loc.url())
 
             modulestore.update_children(module.location, new_children)
 
         # save metadata
-        modulestore.update_metadata(module.location, module.metadata)
+        modulestore.update_metadata(module.location, module._model_data._kvs._metadata)
 
     # now iterate through all of the assets and clone them
     # first the thumbnails
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/factories.py b/common/lib/xmodule/xmodule/modulestore/tests/factories.py
index 1259da2690..b842ffe9dd 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/factories.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/factories.py
@@ -4,6 +4,7 @@ from uuid import uuid4
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
 from xmodule.timeparse import stringify_time
+from xmodule.modulestore.inheritance import own_metadata
 
 
 def XMODULE_COURSE_CREATION(class_to_create, **kwargs):
@@ -40,19 +41,18 @@ class XModuleCourseFactory(Factory):
 
         # This metadata code was copied from cms/djangoapps/contentstore/views.py
         if display_name is not None:
-            new_course.metadata['display_name'] = display_name
+            new_course.display_name = display_name
 
-        new_course.metadata['data_dir'] = uuid4().hex
-        new_course.metadata['start'] = stringify_time(gmtime())
+        new_course.start = gmtime()
 
         new_course.tabs = [{"type": "courseware"},
-            {"type": "course_info", "name": "Course Info"}, 
-            {"type": "discussion", "name": "Discussion"},
-            {"type": "wiki", "name": "Wiki"},
-            {"type": "progress", "name": "Progress"}]
+                           {"type": "course_info", "name": "Course Info"},
+                           {"type": "discussion", "name": "Discussion"},
+                           {"type": "wiki", "name": "Wiki"},
+                           {"type": "progress", "name": "Progress"}]
 
         # Update the data in the mongo datastore
-        store.update_metadata(new_course.location.url(), new_course.own_metadata)
+        store.update_metadata(new_course.location.url(), own_metadata(new_course))
 
         return new_course
 
@@ -99,17 +99,14 @@ class XModuleItemFactory(Factory):
 
         new_item = store.clone_item(template, dest_location)
 
-        # TODO: This needs to be deleted when we have proper storage for static content
-        new_item.metadata['data_dir'] = parent.metadata['data_dir']
-
         # replace the display name with an optional parameter passed in from the caller
         if display_name is not None:
-            new_item.metadata['display_name'] = display_name
+            new_item.display_name = display_name
 
-        store.update_metadata(new_item.location.url(), new_item.own_metadata)
+        store.update_metadata(new_item.location.url(), own_metadata(new_item))
 
         if new_item.location.category not in DETACHED_CATEGORIES:
-            store.update_children(parent_location, parent.definition.get('children', []) + [new_item.location.url()])
+            store.update_children(parent_location, parent.children + [new_item.location.url()])
 
         return new_item
 
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_location.py b/common/lib/xmodule/xmodule/modulestore/tests/test_location.py
index 0772951884..f0f0e8bf48 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_location.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_location.py
@@ -119,11 +119,11 @@ def test_equality():
 
 # All the cleaning functions should do the same thing with these
 general_pairs = [('', ''),
-                  (' ', '_'),
-                  ('abc,', 'abc_'),
-                  ('ab    fg!@//\\aj', 'ab_fg_aj'),
-                  (u"ab\xA9", "ab_"),  # no unicode allowed for now
-                  ]
+                 (' ', '_'),
+                 ('abc,', 'abc_'),
+                 ('ab    fg!@//\\aj', 'ab_fg_aj'),
+                 (u"ab\xA9", "ab_"),  # no unicode allowed for now
+                 ]
 
 
 def test_clean():
@@ -131,7 +131,7 @@ def test_clean():
         ('a:b', 'a_b'),  # no colons in non-name components
         ('a-b', 'a-b'),  # dashes ok
         ('a.b', 'a.b'),  # dot ok
-        ]
+    ]
     for input, output in pairs:
         assert_equals(Location.clean(input), output)
 
@@ -141,17 +141,17 @@ def test_clean_for_url_name():
         ('a:b', 'a:b'),  # colons ok in names
         ('a-b', 'a-b'),  # dashes ok in names
         ('a.b', 'a.b'),  # dot ok in names
-        ]
+    ]
     for input, output in pairs:
         assert_equals(Location.clean_for_url_name(input), output)
 
 
 def test_clean_for_html():
     pairs = general_pairs + [
-              ("a:b", "a_b"),   # no colons for html use
-              ("a-b", "a-b"),   # dashes ok (though need to be replaced in various use locations. ugh.)
-              ('a.b', 'a_b'),   # no dots.
-              ]
+        ("a:b", "a_b"),   # no colons for html use
+        ("a-b", "a-b"),   # dashes ok (though need to be replaced in various use locations. ugh.)
+        ('a.b', 'a_b'),   # no dots.
+    ]
     for input, output in pairs:
         assert_equals(Location.clean_for_html(input), output)
 
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore.py
index 94ea622907..469eedac05 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore.py
@@ -12,7 +12,7 @@ def check_path_to_location(modulestore):
          ("edX/toy/2012_Fall", "Overview", "Welcome", None)),
         ("i4x://edX/toy/chapter/Overview",
          ("edX/toy/2012_Fall", "Overview", None, None)),
-        )
+    )
     course_id = "edX/toy/2012_Fall"
 
     for location, expected in should_work:
@@ -20,6 +20,6 @@ def check_path_to_location(modulestore):
 
     not_found = (
         "i4x://edX/toy/video/WelcomeX", "i4x://edX/toy/course/NotHome"
-        )
+    )
     for location in not_found:
         assert_raises(ItemNotFoundError, path_to_location, modulestore, course_id, location)
diff --git a/common/lib/xmodule/xmodule/modulestore/xml.py b/common/lib/xmodule/xmodule/modulestore/xml.py
index 1bd27189e9..677f8b7d6a 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml.py
@@ -23,13 +23,14 @@ from xmodule.html_module import HtmlDescriptor
 
 from . import ModuleStoreBase, Location
 from .exceptions import ItemNotFoundError
+from .inheritance import compute_inherited_metadata
 
 edx_xml_parser = etree.XMLParser(dtd_validation=False, load_dtd=False,
                                  remove_comments=True, remove_blank_text=True)
 
 etree.set_default_parser(edx_xml_parser)
 
-log = logging.getLogger('mitx.' + __name__)
+log = logging.getLogger(__name__)
 
 
 # VS[compat]
@@ -73,7 +74,8 @@ class ImportSystem(XMLParsingSystem, MakoDescriptorSystem):
                 # VS[compat]. Take this out once course conversion is done (perhaps leave the uniqueness check)
 
                 # tags that really need unique names--they store (or should store) state.
-                need_uniq_names = ('problem', 'sequential', 'video', 'course', 'chapter', 'videosequence', 'timelimit')
+                need_uniq_names = ('problem', 'sequential', 'video', 'course', 'chapter',
+                                    'videosequence', 'poll_question', 'timelimit')
 
                 attr = xml_data.attrib
                 tag = xml_data.tag
@@ -161,7 +163,6 @@ class ImportSystem(XMLParsingSystem, MakoDescriptorSystem):
                     etree.tostring(xml_data, encoding='unicode'), self, self.org,
                     self.course, xmlstore.default_class)
             except Exception as err:
-                print err, self.load_error_modules
                 if not self.load_error_modules:
                     raise
 
@@ -174,7 +175,7 @@ class ImportSystem(XMLParsingSystem, MakoDescriptorSystem):
                 # Normally, we don't want lots of exception traces in our logs from common
                 # content problems.  But if you're debugging the xml loading code itself,
                 # uncomment the next line.
-                # log.exception(msg)
+                log.exception(msg)
 
                 self.error_tracker(msg)
                 err_msg = msg + "\n" + exc_info_to_str(sys.exc_info())
@@ -186,12 +187,13 @@ class ImportSystem(XMLParsingSystem, MakoDescriptorSystem):
                     err_msg
                 )
 
-            descriptor.metadata['data_dir'] = course_dir
+            setattr(descriptor, 'data_dir', course_dir)
 
             xmlstore.modules[course_id][descriptor.location] = descriptor
 
-            for child in descriptor.get_children():
-                parent_tracker.add_parent(child.location, descriptor.location)
+            if hasattr(descriptor, 'children'):
+                for child in descriptor.get_children():
+                    parent_tracker.add_parent(child.location, descriptor.location)
             return descriptor
 
         render_template = lambda: ''
@@ -318,8 +320,6 @@ class XMLModuleStore(ModuleStoreBase):
             # Didn't load course.  Instead, save the errors elsewhere.
             self.errored_courses[course_dir] = errorlog
 
-
-
     def __unicode__(self):
         '''
         String representation - for debugging
@@ -345,8 +345,6 @@ class XMLModuleStore(ModuleStoreBase):
             log.warning(msg + " " + str(err))
         return {}
 
-
-
     def load_course(self, course_dir, tracker):
         """
         Load a course into this module store
@@ -430,7 +428,7 @@ class XMLModuleStore(ModuleStoreBase):
             # breaks metadata inheritance via get_children().  Instead
             # (actually, in addition to, for now), we do a final inheritance pass
             # after we have the course descriptor.
-            XModuleDescriptor.compute_inherited_metadata(course_descriptor)
+            compute_inherited_metadata(course_descriptor)
 
             # now import all pieces of course_info which is expected to be stored
             # in <content_dir>/info or <content_dir>/info/<url_name>
@@ -449,7 +447,6 @@ class XMLModuleStore(ModuleStoreBase):
 
 
     def load_extra_content(self, system, course_descriptor, category, base_dir, course_dir, url_name):
-
         self._load_extra_content(system, course_descriptor, category, base_dir, course_dir)
 
          # then look in a override folder based on the course run
@@ -460,26 +457,29 @@ class XMLModuleStore(ModuleStoreBase):
     def _load_extra_content(self, system, course_descriptor, category, path, course_dir):
 
         for filepath in glob.glob(path / '*'):
-            if not os.path.isdir(filepath):
-                with open(filepath) as f:
-                    try:
-                        html = f.read().decode('utf-8')
-                        # tabs are referenced in policy.json through a 'slug' which is just the filename without the .html suffix
-                        slug = os.path.splitext(os.path.basename(filepath))[0]
-                        loc = Location('i4x', course_descriptor.location.org, course_descriptor.location.course, category, slug)
-                        module = HtmlDescriptor(system, definition={'data': html}, **{'location': loc})
-                        # VS[compat]:
-                        # Hack because we need to pull in the 'display_name' for static tabs (because we need to edit them)
-                        # from the course policy
-                        if category == "static_tab":
-                            for tab in course_descriptor.tabs or []:
-                                if tab.get('url_slug') == slug:
-                                    module.metadata['display_name'] = tab['name']
-                        module.metadata['data_dir'] = course_dir
-                        self.modules[course_descriptor.id][module.location] = module
-                    except Exception, e:
-                        logging.exception("Failed to load {0}. Skipping... Exception: {1}".format(filepath, str(e)))
-                        system.error_tracker("ERROR: " + str(e))
+            if not os.path.isfile(filepath):
+                continue
+
+            with open(filepath) as f:
+                try:
+                    html = f.read().decode('utf-8')
+                    # tabs are referenced in policy.json through a 'slug' which is just the filename without the .html suffix
+                    slug = os.path.splitext(os.path.basename(filepath))[0]
+                    loc = Location('i4x', course_descriptor.location.org, course_descriptor.location.course, category, slug)
+                    module = HtmlDescriptor(system, loc, {'data': html})
+                    # VS[compat]:
+                    # Hack because we need to pull in the 'display_name' for static tabs (because we need to edit them)
+                    # from the course policy
+                    if category == "static_tab":
+                        for tab in course_descriptor.tabs or []:
+                            if tab.get('url_slug') == slug:
+                                module.display_name = tab['name']
+                    module.data_dir = course_dir
+                    self.modules[course_descriptor.id][module.location] = module
+                except Exception, e:
+                    logging.exception("Failed to load {0}. Skipping... Exception: {1}".format(filepath, str(e)))
+                    system.error_tracker("ERROR: " + str(e))
+
 
     def get_instance(self, course_id, location, depth=0):
         """
diff --git a/common/lib/xmodule/xmodule/modulestore/xml_exporter.py b/common/lib/xmodule/xmodule/modulestore/xml_exporter.py
index edf4708687..0724211ed3 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml_exporter.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml_exporter.py
@@ -1,6 +1,7 @@
 import logging
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.inheritance import own_metadata
 from fs.osfs import OSFS
 from json import dumps
 
@@ -31,14 +32,12 @@ def export_to_xml(modulestore, contentstore, course_location, root_dir, course_d
     # export the grading policy
     policies_dir = export_fs.makeopendir('policies')
     course_run_policy_dir = policies_dir.makeopendir(course.location.name)
-    if 'grading_policy' in course.definition['data']:
-        with course_run_policy_dir.open('grading_policy.json', 'w') as grading_policy:
-            grading_policy.write(dumps(course.definition['data']['grading_policy']))
+    with course_run_policy_dir.open('grading_policy.json', 'w') as grading_policy:
+        grading_policy.write(dumps(course.grading_policy))
 
     # export all of the course metadata in policy.json
     with course_run_policy_dir.open('policy.json', 'w') as course_policy:
-        policy = {}
-        policy = {'course/' + course.location.name: course.metadata}
+        policy = {'course/' + course.location.name: own_metadata(course)}
         course_policy.write(dumps(policy))
 
 
@@ -50,4 +49,4 @@ def export_extra_content(export_fs, modulestore, course_location, category_type,
         item_dir = export_fs.makeopendir(dirname)
         for item in items:
             with item_dir.open(item.location.name + file_suffix, 'w') as item_file:
-                item_file.write(item.definition['data'].encode('utf8'))
+                item_file.write(item.data.encode('utf8'))
diff --git a/common/lib/xmodule/xmodule/modulestore/xml_importer.py b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
index 0b77900ae9..fa232596f2 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml_importer.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
@@ -8,6 +8,7 @@ from .xml import XMLModuleStore
 from .exceptions import DuplicateItemError
 from xmodule.modulestore import Location
 from xmodule.contentstore.content import StaticContent, XASSET_SRCREF_PREFIX
+from .inheritance import own_metadata
 
 log = logging.getLogger(__name__)
 
@@ -20,6 +21,8 @@ def import_static_content(modules, course_loc, course_data_path, static_content_
     # now import all static assets
     static_dir = course_data_path / subpath
 
+    verbose = True
+
     for dirname, dirnames, filenames in os.walk(static_dir):
         for filename in filenames:
 
@@ -95,6 +98,79 @@ def verify_content_links(module, base_dir, static_content_store, link, remap_dic
     return link
 
 
+def import_module_from_xml(modulestore, static_content_store, course_data_path, module, target_location_namespace=None, verbose=False):
+    # remap module to the new namespace
+    if target_location_namespace is not None:
+        # This looks a bit wonky as we need to also change the 'name' of the imported course to be what
+        # the caller passed in
+        if module.location.category != 'course':
+            module.location = module.location._replace(tag=target_location_namespace.tag, org=target_location_namespace.org,
+                course=target_location_namespace.course)
+        else:
+            module.location = module.location._replace(tag=target_location_namespace.tag, org=target_location_namespace.org,
+                course=target_location_namespace.course, name=target_location_namespace.name)
+
+        # then remap children pointers since they too will be re-namespaced
+        if module.has_children:
+            children_locs = module.children
+            new_locs = []
+            for child in children_locs:
+                child_loc = Location(child)
+                new_child_loc = child_loc._replace(tag=target_location_namespace.tag, org=target_location_namespace.org,
+                    course=target_location_namespace.course)
+
+                new_locs.append(new_child_loc.url())
+
+            module.children = new_locs
+
+    if hasattr(module, 'data'):
+        # cdodge: now go through any link references to '/static/' and make sure we've imported
+        # it as a StaticContent asset
+        try:
+            remap_dict = {}
+
+            # use the rewrite_links as a utility means to enumerate through all links
+            # in the module data. We use that to load that reference into our asset store
+            # IMPORTANT: There appears to be a bug in lxml.rewrite_link which makes us not be able to
+            # do the rewrites natively in that code.
+            # For example, what I'm seeing is <img src='foo.jpg' />   ->   <img src='bar.jpg'>
+            # Note the dropped element closing tag. This causes the LMS to fail when rendering modules - that's
+            # no good, so we have to do this kludge
+            if isinstance(module.data, str) or isinstance(module.data, unicode):   # some module 'data' fields are non strings which blows up the link traversal code
+                lxml_rewrite_links(module.data, lambda link: verify_content_links(module, course_data_path,
+                    static_content_store, link, remap_dict))
+
+                for key in remap_dict.keys():
+                    module.data = module.data.replace(key, remap_dict[key])
+
+        except Exception:
+            logging.exception("failed to rewrite links on {0}. Continuing...".format(module.location))
+
+        modulestore.update_item(module.location, module.data)
+
+    if module.has_children:
+        modulestore.update_children(module.location, module.children)
+
+    modulestore.update_metadata(module.location, own_metadata(module))
+
+
+def import_course_from_xml(modulestore, static_content_store, course_data_path, module, target_location_namespace=None, verbose=False):
+    # cdodge: more hacks (what else). Seems like we have a problem when importing a course (like 6.002) which
+    # does not have any tabs defined in the policy file. The import goes fine and then displays fine in LMS,
+    # but if someone tries to add a new tab in the CMS, then the LMS barfs because it expects that -
+    # if there is *any* tabs - then there at least needs to be some predefined ones
+    if module.tabs is None or len(module.tabs) == 0:
+        module.tabs = [{"type": "courseware"},
+            {"type": "course_info", "name": "Course Info"},
+            {"type": "discussion", "name": "Discussion"},
+            {"type": "wiki", "name": "Wiki"}]  # note, add 'progress' when we can support it on Edge
+
+    # a bit of a hack, but typically the "course image" which is shown on marketing pages is hard coded to /images/course_image.jpg
+    # so let's make sure we import in case there are no other references to it in the modules
+    verify_content_links(module, course_data_path, static_content_store, '/static/images/course_image.jpg')
+    import_module_from_xml(modulestore, static_content_store, course_data_path, module, target_location_namespace, verbose=verbose)
+
+
 def import_from_xml(store, data_dir, course_dirs=None,
                     default_class='xmodule.raw_module.RawDescriptor',
                     load_error_modules=True, static_content_store=None, target_location_namespace=None, verbose=False):
@@ -135,7 +211,7 @@ def import_from_xml(store, data_dir, course_dirs=None,
         # course module is committed first into the store
         for module in module_store.modules[course_id].itervalues():
             if module.category == 'course':
-                course_data_path = path(data_dir) / module.metadata['data_dir']
+                course_data_path = path(data_dir) / module.data_dir
                 course_location = module.location
 
                 module = remap_namespace(module, target_location_namespace)
@@ -151,10 +227,10 @@ def import_from_xml(store, data_dir, course_dirs=None,
                         {"type": "wiki", "name": "Wiki"}]  # note, add 'progress' when we can support it on Edge
 
 
-                store.update_item(module.location, module.definition['data'])
-                if 'children' in module.definition:
-                    store.update_children(module.location, module.definition['children'])
-                store.update_metadata(module.location, dict(module.own_metadata))
+                if hasattr(module, 'data'):
+                    store.update_item(module.location, module.data)
+                store.update_children(module.location, module.children)
+                store.update_metadata(module.location, dict(own_metadata(module)))
 
                 # a bit of a hack, but typically the "course image" which is shown on marketing pages is hard coded to /images/course_image.jpg
                 # so let's make sure we import in case there are no other references to it in the modules
@@ -186,8 +262,8 @@ def import_from_xml(store, data_dir, course_dirs=None,
             if verbose:
                 log.debug('importing module location {0}'.format(module.location))
 
-            if 'data' in module.definition:
-                module_data = module.definition['data']
+            if hasattr(module, 'data'):
+                module_data = module.data
 
                 # cdodge: now go through any link references to '/static/' and make sure we've imported
                 # it as a StaticContent asset
@@ -213,16 +289,15 @@ def import_from_xml(store, data_dir, course_dirs=None,
 
                 store.update_item(module.location, module_data)
 
-            if 'children' in module.definition:
-                store.update_children(module.location, module.definition['children'])
+            if hasattr(module, 'children') and module.children != []:
+                store.update_children(module.location, module.children)
 
             # NOTE: It's important to use own_metadata here to avoid writing
             # inherited metadata everywhere.
-            store.update_metadata(module.location, dict(module.own_metadata))
+            store.update_metadata(module.location, dict(own_metadata(module)))
 
     return module_store, course_items
 
-
 def remap_namespace(module, target_location_namespace):
     if target_location_namespace is None:
         return module
@@ -237,21 +312,21 @@ def remap_namespace(module, target_location_namespace):
             course=target_location_namespace.course, name=target_location_namespace.name)
 
     # then remap children pointers since they too will be re-namespaced
-    children_locs = module.definition.get('children')
-    if children_locs is not None:
-        new_locs = []
-        for child in children_locs:
-            child_loc = Location(child)
-            new_child_loc = child_loc._replace(tag=target_location_namespace.tag, org=target_location_namespace.org,
-                course=target_location_namespace.course)
+    if hasattr(module,'children'):
+        children_locs = module.children
+        if children_locs is not None and children_locs != []:
+            new_locs = []
+            for child in children_locs:
+                child_loc = Location(child)
+                new_child_loc = child_loc._replace(tag=target_location_namespace.tag, org=target_location_namespace.org,
+                    course=target_location_namespace.course)
 
-            new_locs.append(new_child_loc.url())
+                new_locs.append(new_child_loc.url())
 
-        module.definition['children'] = new_locs
+            module.children = new_locs
 
     return module
 
-
 def validate_category_hierarchy(module_store, course_id, parent_category, expected_child_category):
     err_cnt = 0
 
@@ -262,7 +337,7 @@ def validate_category_hierarchy(module_store, course_id, parent_category, expect
             parents.append(module)
 
     for parent in parents:
-        for child_loc in [Location(child) for child in parent.definition.get('children', [])]:
+        for child_loc in [Location(child) for child in parent.children]:
             if child_loc.category != expected_child_category:
                 err_cnt += 1
                 print 'ERROR: child {0} of parent {1} was expected to be category of {2} but was {3}'.format(
@@ -274,7 +349,7 @@ def validate_category_hierarchy(module_store, course_id, parent_category, expect
 def validate_data_source_path_existence(path, is_err=True, extra_msg=None):
     _cnt = 0
     if not os.path.exists(path):
-        print ("{0}: Expected folder at {1}. {2}".format('ERROR' if is_err == True else 'WARNING', path, extra_msg if 
+        print ("{0}: Expected folder at {1}. {2}".format('ERROR' if is_err == True else 'WARNING', path, extra_msg if
             extra_msg is not None else ''))
         _cnt = 1
     return _cnt
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 5c3bfa5b2a..98a54601de 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
@@ -3,16 +3,14 @@ import logging
 from lxml import etree
 from lxml.html import rewrite_links
 from xmodule.timeinfo import TimeInfo
-from xmodule.capa_module import only_one, ComplexEncoder
+from xmodule.capa_module import ComplexEncoder
 from xmodule.editing_module import EditingDescriptor
-from xmodule.html_checker import check_html
 from xmodule.progress import Progress
 from xmodule.stringify import stringify_children
-from xmodule.x_module import XModule
 from xmodule.xml_module import XmlDescriptor
 import self_assessment_module
 import open_ended_module
-from combined_open_ended_rubric import CombinedOpenEndedRubric, GRADER_TYPE_IMAGE_DICT, HUMAN_GRADER_TYPE, LEGEND_LIST
+from .combined_open_ended_rubric import CombinedOpenEndedRubric, GRADER_TYPE_IMAGE_DICT, HUMAN_GRADER_TYPE, LEGEND_LIST
 
 log = logging.getLogger("mitx.courseware")
 
@@ -40,14 +38,15 @@ ACCEPT_FILE_UPLOAD = False
 TRUE_DICT = ["True", True, "TRUE", "true"]
 
 HUMAN_TASK_TYPE = {
-    'selfassessment' : "Self Assessment",
-    'openended' : "edX Assessment",
-    }
+    'selfassessment': "Self Assessment",
+    'openended': "edX Assessment",
+}
 
 #Default value that controls whether or not to skip basic spelling checks in the controller
 #Metadata overrides this
 SKIP_BASIC_CHECKS = False
 
+
 class CombinedOpenEndedV1Module():
     """
     This is a module that encapsulates all open ended grading (self assessment, peer assessment, etc).
@@ -83,7 +82,7 @@ class CombinedOpenEndedV1Module():
     TEMPLATE_DIR = "combinedopenended"
 
     def __init__(self, system, location, definition, descriptor,
-                 instance_state=None, shared_state=None, metadata = None, static_data = None, **kwargs):
+                 instance_state=None, shared_state=None, metadata=None, static_data=None, **kwargs):
 
         """
         Definition file should have one or many task blocks, a rubric block, and a prompt block:
@@ -120,16 +119,9 @@ class CombinedOpenEndedV1Module():
 
         """
 
-        self.metadata = metadata
-        self.display_name = metadata.get('display_name', "Open Ended")
-        self.rewrite_content_links = static_data.get('rewrite_content_links',"")
-
-
-        # Load instance state
-        if instance_state is not None:
-            instance_state = json.loads(instance_state)
-        else:
-            instance_state = {}
+        self.instance_state = instance_state
+        self.display_name = instance_state.get('display_name', "Open Ended")
+        self.rewrite_content_links = static_data.get('rewrite_content_links', "")
 
         #We need to set the location here so the child modules can use it
         system.set('location', location)
@@ -142,20 +134,20 @@ class CombinedOpenEndedV1Module():
         #Overall state of the combined open ended module
         self.state = instance_state.get('state', self.INITIAL)
 
-        self.attempts = instance_state.get('attempts', 0)
+        self.student_attempts = instance_state.get('student_attempts', 0)
 
         #Allow reset is true if student has failed the criteria to move to the next child task
-        self.allow_reset = instance_state.get('ready_to_reset', False)
-        self.max_attempts = int(self.metadata.get('attempts', MAX_ATTEMPTS))
-        self.is_scored = self.metadata.get('is_graded', IS_SCORED) in TRUE_DICT
-        self.accept_file_upload = self.metadata.get('accept_file_upload', ACCEPT_FILE_UPLOAD) in TRUE_DICT
-        self.skip_basic_checks = self.metadata.get('skip_spelling_checks', SKIP_BASIC_CHECKS)
+        self.ready_to_reset = instance_state.get('ready_to_reset', False)
+        self.attempts = self.instance_state.get('attempts', MAX_ATTEMPTS)
+        self.is_scored = self.instance_state.get('is_graded', IS_SCORED) in TRUE_DICT
+        self.accept_file_upload = self.instance_state.get('accept_file_upload', ACCEPT_FILE_UPLOAD) in TRUE_DICT
+        self.skip_basic_checks = self.instance_state.get('skip_spelling_checks', SKIP_BASIC_CHECKS) in TRUE_DICT
 
-        display_due_date_string = self.metadata.get('due', None)
-    
-        grace_period_string = self.metadata.get('graceperiod', None)
+        display_due_date_string = self.instance_state.get('due', None)
+
+        grace_period_string = self.instance_state.get('graceperiod', None)
         try:
-            self.timeinfo = TimeInfo(display_due_date_string, grace_period_string)  
+            self.timeinfo = TimeInfo(display_due_date_string, grace_period_string)
         except:
             log.error("Error parsing due date information in location {0}".format(location))
             raise
@@ -163,7 +155,7 @@ class CombinedOpenEndedV1Module():
 
         # Used for progress / grading.  Currently get credit just for
         # completion (doesn't matter if you self-assessed correct/incorrect).
-        self._max_score = int(self.metadata.get('max_score', MAX_SCORE))
+        self._max_score = self.instance_state.get('max_score', MAX_SCORE)
 
         self.rubric_renderer = CombinedOpenEndedRubric(system, True)
         rubric_string = stringify_children(definition['rubric'])
@@ -172,15 +164,15 @@ class CombinedOpenEndedV1Module():
         #Static data is passed to the child modules to render
         self.static_data = {
             'max_score': self._max_score,
-            'max_attempts': self.max_attempts,
+            'max_attempts': self.attempts,
             'prompt': definition['prompt'],
             'rubric': definition['rubric'],
             'display_name': self.display_name,
             'accept_file_upload': self.accept_file_upload,
-            'close_date' : self.timeinfo.close_date,
-            's3_interface' : self.system.s3_interface,
-            'skip_basic_checks' : self.skip_basic_checks,
-            }
+            'close_date': self.timeinfo.close_date,
+            's3_interface': self.system.s3_interface,
+            'skip_basic_checks': self.skip_basic_checks,
+        }
 
         self.task_xml = definition['task_xml']
         self.location = location
@@ -206,10 +198,10 @@ class CombinedOpenEndedV1Module():
         last_response = last_response_data['response']
 
         loaded_task_state = json.loads(current_task_state)
-        if loaded_task_state['state'] == self.INITIAL:
-            loaded_task_state['state'] = self.ASSESSING
-            loaded_task_state['created'] = True
-            loaded_task_state['history'].append({'answer': last_response})
+        if loaded_task_state['child_state'] == self.INITIAL:
+            loaded_task_state['child_state'] = self.ASSESSING
+            loaded_task_state['child_created'] = True
+            loaded_task_state['child_history'].append({'answer': last_response})
             current_task_state = json.dumps(loaded_task_state)
         return current_task_state
 
@@ -223,15 +215,15 @@ class CombinedOpenEndedV1Module():
         child_modules = {
             'openended': open_ended_module.OpenEndedModule,
             'selfassessment': self_assessment_module.SelfAssessmentModule,
-            }
+        }
         child_descriptors = {
             'openended': open_ended_module.OpenEndedDescriptor,
             'selfassessment': self_assessment_module.SelfAssessmentDescriptor,
-            }
+        }
         children = {
             'modules': child_modules,
             'descriptors': child_descriptors,
-            }
+        }
         return children
 
     def setup_next_task(self, reset=False):
@@ -248,8 +240,8 @@ class CombinedOpenEndedV1Module():
         self.current_task_xml = self.task_xml[self.current_task_number]
 
         if self.current_task_number > 0:
-            self.allow_reset = self.check_allow_reset()
-            if self.allow_reset:
+            self.ready_to_reset = self.check_allow_reset()
+            if self.ready_to_reset:
                 self.current_task_number = self.current_task_number - 1
 
         current_task_type = self.get_tag_name(self.current_task_xml)
@@ -267,31 +259,34 @@ class CombinedOpenEndedV1Module():
         self.current_task_parsed_xml = self.current_task_descriptor.definition_from_xml(etree_xml, self.system)
         if current_task_state is None and self.current_task_number == 0:
             self.current_task = child_task_module(self.system, self.location,
-                self.current_task_parsed_xml, self.current_task_descriptor, self.static_data)
+                                                  self.current_task_parsed_xml, self.current_task_descriptor,
+                                                  self.static_data)
             self.task_states.append(self.current_task.get_instance_state())
             self.state = self.ASSESSING
         elif current_task_state is None and self.current_task_number > 0:
             last_response_data = self.get_last_response(self.current_task_number - 1)
             last_response = last_response_data['response']
             current_task_state = json.dumps({
-                'state': self.ASSESSING,
+                'child_state': self.ASSESSING,
                 'version': self.STATE_VERSION,
                 'max_score': self._max_score,
-                'attempts': 0,
-                'created': True,
-                'history': [{'answer': last_response}],
-                })
+                'child_attempts': 0,
+                'child_created': True,
+                'child_history': [{'answer': last_response}],
+            })
             self.current_task = child_task_module(self.system, self.location,
-                self.current_task_parsed_xml, self.current_task_descriptor, self.static_data,
-                instance_state=current_task_state)
+                                                  self.current_task_parsed_xml, self.current_task_descriptor,
+                                                  self.static_data,
+                                                  instance_state=current_task_state)
             self.task_states.append(self.current_task.get_instance_state())
             self.state = self.ASSESSING
         else:
             if self.current_task_number > 0 and not reset:
                 current_task_state = self.overwrite_state(current_task_state)
             self.current_task = child_task_module(self.system, self.location,
-                self.current_task_parsed_xml, self.current_task_descriptor, self.static_data,
-                instance_state=current_task_state)
+                                                  self.current_task_parsed_xml, self.current_task_descriptor,
+                                                  self.static_data,
+                                                  instance_state=current_task_state)
 
         return True
 
@@ -302,17 +297,17 @@ class CombinedOpenEndedV1Module():
         Input: None
         Output: the allow_reset attribute of the current module.
         """
-        if not self.allow_reset:
+        if not self.ready_to_reset:
             if self.current_task_number > 0:
                 last_response_data = self.get_last_response(self.current_task_number - 1)
                 current_response_data = self.get_current_attributes(self.current_task_number)
 
-                if(current_response_data['min_score_to_attempt'] > last_response_data['score']
-                   or current_response_data['max_score_to_attempt'] < last_response_data['score']):
+                if (current_response_data['min_score_to_attempt'] > last_response_data['score']
+                    or current_response_data['max_score_to_attempt'] < last_response_data['score']):
                     self.state = self.DONE
-                    self.allow_reset = True
+                    self.ready_to_reset = True
 
-        return self.allow_reset
+        return self.ready_to_reset
 
     def get_context(self):
         """
@@ -326,7 +321,7 @@ class CombinedOpenEndedV1Module():
         context = {
             'items': [{'content': task_html}],
             'ajax_url': self.system.ajax_url,
-            'allow_reset': self.allow_reset,
+            'allow_reset': self.ready_to_reset,
             'state': self.state,
             'task_count': len(self.task_xml),
             'task_number': self.current_task_number + 1,
@@ -334,8 +329,8 @@ class CombinedOpenEndedV1Module():
             'display_name': self.display_name,
             'accept_file_upload': self.accept_file_upload,
             'location': self.location,
-            'legend_list' : LEGEND_LIST,
-            }
+            'legend_list': LEGEND_LIST,
+        }
 
         return context
 
@@ -404,7 +399,7 @@ class CombinedOpenEndedV1Module():
 
         task_parsed_xml = task_descriptor.definition_from_xml(etree_xml, self.system)
         task = children['modules'][task_type](self.system, self.location, task_parsed_xml, task_descriptor,
-            self.static_data, instance_state=task_state)
+                                              self.static_data, instance_state=task_state)
         last_response = task.latest_answer()
         last_score = task.latest_score()
         last_post_assessment = task.latest_post_assessment(self.system)
@@ -422,21 +417,21 @@ class CombinedOpenEndedV1Module():
             else:
                 last_post_evaluation = task.format_feedback_with_evaluation(self.system, last_post_assessment)
             last_post_assessment = last_post_evaluation
-            rubric_data = task._parse_score_msg(task.history[-1].get('post_assessment', ""), self.system)
+            rubric_data = task._parse_score_msg(task.child_history[-1].get('post_assessment', ""), self.system)
             rubric_scores = rubric_data['rubric_scores']
             grader_types = rubric_data['grader_types']
             feedback_items = rubric_data['feedback_items']
-            feedback_dicts =  rubric_data['feedback_dicts']
+            feedback_dicts = rubric_data['feedback_dicts']
             grader_ids = rubric_data['grader_ids']
-            submission_ids =  rubric_data['submission_ids']
-        elif task_type== "selfassessment":
+            submission_ids = rubric_data['submission_ids']
+        elif task_type == "selfassessment":
             rubric_scores = last_post_assessment
             grader_types = ['SA']
             feedback_items = ['']
             last_post_assessment = ""
         last_correctness = task.is_last_response_correct()
         max_score = task.max_score()
-        state = task.state
+        state = task.child_state
         if task_type in HUMAN_TASK_TYPE:
             human_task_name = HUMAN_TASK_TYPE[task_type]
         else:
@@ -446,7 +441,7 @@ class CombinedOpenEndedV1Module():
             human_state = task.HUMAN_NAMES[state]
         else:
             human_state = state
-        if len(grader_types)>0:
+        if len(grader_types) > 0:
             grader_type = grader_types[0]
         else:
             grader_type = "IN"
@@ -468,15 +463,15 @@ class CombinedOpenEndedV1Module():
             'correct': last_correctness,
             'min_score_to_attempt': min_score_to_attempt,
             'max_score_to_attempt': max_score_to_attempt,
-            'rubric_scores' : rubric_scores,
-            'grader_types' : grader_types,
-            'feedback_items' : feedback_items,
-            'grader_type' : grader_type,
-            'human_grader_type' : human_grader_name,
-            'feedback_dicts' : feedback_dicts,
-            'grader_ids' : grader_ids,
-            'submission_ids' : submission_ids,
-            }
+            'rubric_scores': rubric_scores,
+            'grader_types': grader_types,
+            'feedback_items': feedback_items,
+            'grader_type': grader_type,
+            'human_grader_type': human_grader_name,
+            'feedback_dicts': feedback_dicts,
+            'grader_ids': grader_ids,
+            'submission_ids': submission_ids,
+        }
         return last_response_dict
 
     def update_task_states(self):
@@ -486,10 +481,10 @@ class CombinedOpenEndedV1Module():
         Output: boolean indicating whether or not the task state changed.
         """
         changed = False
-        if not self.allow_reset:
+        if not self.ready_to_reset:
             self.task_states[self.current_task_number] = self.current_task.get_instance_state()
             current_task_state = json.loads(self.task_states[self.current_task_number])
-            if current_task_state['state'] == self.DONE:
+            if current_task_state['child_state'] == self.DONE:
                 self.current_task_number += 1
                 if self.current_task_number >= (len(self.task_xml)):
                     self.state = self.DONE
@@ -519,20 +514,27 @@ class CombinedOpenEndedV1Module():
         Output: Dictionary to be rendered via ajax that contains the result html.
         """
         all_responses = []
-        loop_up_to_task = self.current_task_number+1
-        for i in xrange(0,loop_up_to_task):
+        loop_up_to_task = self.current_task_number + 1
+        for i in xrange(0, loop_up_to_task):
             all_responses.append(self.get_last_response(i))
-        rubric_scores = [all_responses[i]['rubric_scores'] for i in xrange(0,len(all_responses)) if len(all_responses[i]['rubric_scores'])>0 and all_responses[i]['grader_types'][0] in HUMAN_GRADER_TYPE.keys()]
-        grader_types = [all_responses[i]['grader_types'] for i in xrange(0,len(all_responses)) if len(all_responses[i]['grader_types'])>0 and all_responses[i]['grader_types'][0] in HUMAN_GRADER_TYPE.keys()]
-        feedback_items = [all_responses[i]['feedback_items'] for i in xrange(0,len(all_responses)) if len(all_responses[i]['feedback_items'])>0 and all_responses[i]['grader_types'][0] in HUMAN_GRADER_TYPE.keys()]
-        rubric_html = self.rubric_renderer.render_combined_rubric(stringify_children(self.static_data['rubric']), rubric_scores,
-            grader_types, feedback_items)
+        rubric_scores = [all_responses[i]['rubric_scores'] for i in xrange(0, len(all_responses)) if
+                         len(all_responses[i]['rubric_scores']) > 0 and all_responses[i]['grader_types'][
+                             0] in HUMAN_GRADER_TYPE.keys()]
+        grader_types = [all_responses[i]['grader_types'] for i in xrange(0, len(all_responses)) if
+                        len(all_responses[i]['grader_types']) > 0 and all_responses[i]['grader_types'][
+                            0] in HUMAN_GRADER_TYPE.keys()]
+        feedback_items = [all_responses[i]['feedback_items'] for i in xrange(0, len(all_responses)) if
+                          len(all_responses[i]['feedback_items']) > 0 and all_responses[i]['grader_types'][
+                              0] in HUMAN_GRADER_TYPE.keys()]
+        rubric_html = self.rubric_renderer.render_combined_rubric(stringify_children(self.static_data['rubric']),
+                                                                  rubric_scores,
+                                                                  grader_types, feedback_items)
 
         response_dict = all_responses[-1]
         context = {
             'results': rubric_html,
-            'task_name' : 'Scored Rubric',
-            'class_name' : 'combined-rubric-container'
+            'task_name': 'Scored Rubric',
+            'class_name': 'combined-rubric-container'
         }
         html = self.system.render_template('{0}/combined_open_ended_results.html'.format(self.TEMPLATE_DIR), context)
         return {'html': html, 'success': True}
@@ -544,8 +546,8 @@ class CombinedOpenEndedV1Module():
         Output: Dictionary to be rendered via ajax that contains the result html.
         """
         context = {
-            'legend_list' : LEGEND_LIST,
-            }
+            'legend_list': LEGEND_LIST,
+        }
         html = self.system.render_template('{0}/combined_open_ended_legend.html'.format(self.TEMPLATE_DIR), context)
         return {'html': html, 'success': True}
 
@@ -556,15 +558,16 @@ class CombinedOpenEndedV1Module():
         Output: Dictionary to be rendered via ajax that contains the result html.
         """
         self.update_task_states()
-        loop_up_to_task = self.current_task_number+1
-        all_responses =[]
-        for i in xrange(0,loop_up_to_task):
+        loop_up_to_task = self.current_task_number + 1
+        all_responses = []
+        for i in xrange(0, loop_up_to_task):
             all_responses.append(self.get_last_response(i))
         context_list = []
         for ri in all_responses:
-            for i in xrange(0,len(ri['rubric_scores'])):
-                feedback = ri['feedback_dicts'][i].get('feedback','')
-                rubric_data = self.rubric_renderer.render_rubric(stringify_children(self.static_data['rubric']), ri['rubric_scores'][i])
+            for i in xrange(0, len(ri['rubric_scores'])):
+                feedback = ri['feedback_dicts'][i].get('feedback', '')
+                rubric_data = self.rubric_renderer.render_rubric(stringify_children(self.static_data['rubric']),
+                                                                 ri['rubric_scores'][i])
                 if rubric_data['success']:
                     rubric_html = rubric_data['html']
                 else:
@@ -572,23 +575,23 @@ class CombinedOpenEndedV1Module():
                 context = {
                     'rubric_html': rubric_html,
                     'grader_type': ri['grader_type'],
-                    'feedback' : feedback,
-                    'grader_id' : ri['grader_ids'][i],
-                    'submission_id' : ri['submission_ids'][i],
+                    'feedback': feedback,
+                    'grader_id': ri['grader_ids'][i],
+                    'submission_id': ri['submission_ids'][i],
                 }
                 context_list.append(context)
         feedback_table = self.system.render_template('{0}/open_ended_result_table.html'.format(self.TEMPLATE_DIR), {
-            'context_list' : context_list,
-            'grader_type_image_dict' : GRADER_TYPE_IMAGE_DICT,
-            'human_grader_types' : HUMAN_GRADER_TYPE,
+            'context_list': context_list,
+            'grader_type_image_dict': GRADER_TYPE_IMAGE_DICT,
+            'human_grader_types': HUMAN_GRADER_TYPE,
             'rows': 50,
             'cols': 50,
         })
         context = {
             'results': feedback_table,
-            'task_name' : "Feedback",
-            'class_name' : "result-container",
-            }
+            'task_name': "Feedback",
+            'class_name': "result-container",
+        }
         html = self.system.render_template('{0}/combined_open_ended_results.html'.format(self.TEMPLATE_DIR), context)
         return {'html': html, 'success': True}
 
@@ -617,8 +620,8 @@ class CombinedOpenEndedV1Module():
             'reset': self.reset,
             'get_results': self.get_results,
             'get_combined_rubric': self.get_rubric,
-            'get_status' : self.get_status_ajax,
-            'get_legend' : self.get_legend,
+            'get_status': self.get_status_ajax,
+            'get_legend': self.get_legend,
         }
 
         if dispatch not in handlers:
@@ -635,7 +638,7 @@ class CombinedOpenEndedV1Module():
         Output: Dictionary to be rendered
         """
         self.update_task_states()
-        return {'success': True, 'html': self.get_html_nonsystem(), 'allow_reset': self.allow_reset}
+        return {'success': True, 'html': self.get_html_nonsystem(), 'allow_reset': self.ready_to_reset}
 
     def reset(self, get):
         """
@@ -644,26 +647,26 @@ class CombinedOpenEndedV1Module():
         Output: AJAX dictionary to tbe rendered
         """
         if self.state != self.DONE:
-            if not self.allow_reset:
+            if not self.ready_to_reset:
                 return self.out_of_sync_error(get)
 
-        if self.attempts > self.max_attempts:
+        if self.student_attempts > self.attempts:
             return {
                 'success': False,
                 #This is a student_facing_error
                 'error': ('You have attempted this question {0} times.  '
                           'You are only allowed to attempt it {1} times.').format(
-                    self.attempts, self.max_attempts)
+                    self.student_attempts, self.attempts)
             }
         self.state = self.INITIAL
-        self.allow_reset = False
+        self.ready_to_reset = False
         for i in xrange(0, len(self.task_xml)):
             self.current_task_number = i
             self.setup_next_task(reset=True)
             self.current_task.reset(self.system)
             self.task_states[self.current_task_number] = self.current_task.get_instance_state()
         self.current_task_number = 0
-        self.allow_reset = False
+        self.ready_to_reset = False
         self.setup_next_task()
         return {'success': True, 'html': self.get_html_nonsystem()}
 
@@ -679,9 +682,9 @@ class CombinedOpenEndedV1Module():
             'current_task_number': self.current_task_number,
             'state': self.state,
             'task_states': self.task_states,
-            'attempts': self.attempts,
-            'ready_to_reset': self.allow_reset,
-            }
+            'student_attempts': self.student_attempts,
+            'ready_to_reset': self.ready_to_reset,
+        }
 
         return json.dumps(state)
 
@@ -699,11 +702,12 @@ class CombinedOpenEndedV1Module():
 
         context = {
             'status_list': status,
-            'grader_type_image_dict' : GRADER_TYPE_IMAGE_DICT,
-            'legend_list' : LEGEND_LIST,
-            'render_via_ajax' : render_via_ajax,
+            'grader_type_image_dict': GRADER_TYPE_IMAGE_DICT,
+            'legend_list': LEGEND_LIST,
+            'render_via_ajax': render_via_ajax,
         }
-        status_html = self.system.render_template("{0}/combined_open_ended_status.html".format(self.TEMPLATE_DIR), context)
+        status_html = self.system.render_template("{0}/combined_open_ended_status.html".format(self.TEMPLATE_DIR),
+                                                  context)
 
         return status_html
 
@@ -714,7 +718,7 @@ class CombinedOpenEndedV1Module():
         entirely, in which case they will be in the self.DONE state), and if it is scored or not.
         @return: Boolean corresponding to the above.
         """
-        return (self.state == self.DONE or self.allow_reset) and self.is_scored
+        return (self.state == self.DONE or self.ready_to_reset) and self.is_scored
 
     def get_score(self):
         """
@@ -736,7 +740,7 @@ class CombinedOpenEndedV1Module():
         score_dict = {
             'score': score,
             'total': max_score,
-            }
+        }
 
         return score_dict
 
@@ -765,7 +769,7 @@ class CombinedOpenEndedV1Module():
         return progress_object
 
 
-class CombinedOpenEndedV1Descriptor(XmlDescriptor, EditingDescriptor):
+class CombinedOpenEndedV1Descriptor():
     """
     Module for adding combined open ended questions
     """
@@ -777,6 +781,9 @@ class CombinedOpenEndedV1Descriptor(XmlDescriptor, EditingDescriptor):
     has_score = True
     template_dir_name = "combinedopenended"
 
+    def __init__(self, system):
+        self.system =system
+
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         """
@@ -793,7 +800,9 @@ class CombinedOpenEndedV1Descriptor(XmlDescriptor, EditingDescriptor):
         for child in expected_children:
             if len(xml_object.xpath(child)) == 0:
                 #This is a staff_facing_error
-                raise ValueError("Combined Open Ended definition must include at least one '{0}' tag. Contact the learning sciences group for assistance.".format(child))
+                raise ValueError(
+                    "Combined Open Ended definition must include at least one '{0}' tag. Contact the learning sciences group for assistance.".format(
+                        child))
 
         def parse_task(k):
             """Assumes that xml_object has child k"""
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py
index 8d1bd376fb..bceb12e444 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py
@@ -4,24 +4,26 @@ from lxml import etree
 log = logging.getLogger(__name__)
 
 GRADER_TYPE_IMAGE_DICT = {
-    'SA' : '/static/images/self_assessment_icon.png',
-    'PE' : '/static/images/peer_grading_icon.png',
-    'ML' : '/static/images/ml_grading_icon.png',
-    'IN' : '/static/images/peer_grading_icon.png',
-    'BC' : '/static/images/ml_grading_icon.png',
-    }
+    'SA': '/static/images/self_assessment_icon.png',
+    'PE': '/static/images/peer_grading_icon.png',
+    'ML': '/static/images/ml_grading_icon.png',
+    'IN': '/static/images/peer_grading_icon.png',
+    'BC': '/static/images/ml_grading_icon.png',
+}
 
 HUMAN_GRADER_TYPE = {
-    'SA' : 'Self-Assessment',
-    'PE' : 'Peer-Assessment',
-    'IN' : 'Instructor-Assessment',
-    'ML' : 'AI-Assessment',
-    'BC' : 'AI-Assessment',
-    }
+    'SA': 'Self-Assessment',
+    'PE': 'Peer-Assessment',
+    'IN': 'Instructor-Assessment',
+    'ML': 'AI-Assessment',
+    'BC': 'AI-Assessment',
+}
 
 DO_NOT_DISPLAY = ['BC', 'IN']
 
-LEGEND_LIST = [{'name' : HUMAN_GRADER_TYPE[k], 'image' : GRADER_TYPE_IMAGE_DICT[k]} for k in GRADER_TYPE_IMAGE_DICT.keys() if k not in DO_NOT_DISPLAY ]
+LEGEND_LIST = [{'name': HUMAN_GRADER_TYPE[k], 'image': GRADER_TYPE_IMAGE_DICT[k]} for k in GRADER_TYPE_IMAGE_DICT.keys()
+               if k not in DO_NOT_DISPLAY]
+
 
 class RubricParsingError(Exception):
     def __init__(self, msg):
@@ -29,15 +31,14 @@ class RubricParsingError(Exception):
 
 
 class CombinedOpenEndedRubric(object):
-
     TEMPLATE_DIR = "combinedopenended/openended"
 
-    def __init__ (self, system, view_only = False):
+    def __init__(self, system, view_only=False):
         self.has_score = False
         self.view_only = view_only
         self.system = system
 
-    def render_rubric(self, rubric_xml, score_list = None):
+    def render_rubric(self, rubric_xml, score_list=None):
         '''
         render_rubric: takes in an xml string and outputs the corresponding
             html for that xml, given the type of rubric we're generating
@@ -50,11 +51,11 @@ class CombinedOpenEndedRubric(object):
         success = False
         try:
             rubric_categories = self.extract_categories(rubric_xml)
-            if score_list and len(score_list)==len(rubric_categories):
-                for i in xrange(0,len(rubric_categories)):
+            if score_list and len(score_list) == len(rubric_categories):
+                for i in xrange(0, len(rubric_categories)):
                     category = rubric_categories[i]
-                    for j in xrange(0,len(category['options'])):
-                        if score_list[i]==j:
+                    for j in xrange(0, len(category['options'])):
+                        if score_list[i] == j:
                             rubric_categories[i]['options'][j]['selected'] = True
             rubric_scores = [cat['score'] for cat in rubric_categories]
             max_scores = map((lambda cat: cat['options'][-1]['points']), rubric_categories)
@@ -63,19 +64,20 @@ class CombinedOpenEndedRubric(object):
             if self.view_only:
                 rubric_template = '{0}/open_ended_view_only_rubric.html'.format(self.TEMPLATE_DIR)
             html = self.system.render_template(rubric_template,
-                    {'categories': rubric_categories,
-                     'has_score': self.has_score,
-                     'view_only': self.view_only,
-                     'max_score': max_score,
-                     'combined_rubric' : False
-                    })
+                                               {'categories': rubric_categories,
+                                                'has_score': self.has_score,
+                                                'view_only': self.view_only,
+                                                'max_score': max_score,
+                                                'combined_rubric': False
+                                               })
             success = True
         except:
             #This is a staff_facing_error
-            error_message = "[render_rubric] Could not parse the rubric with xml: {0}. Contact the learning sciences group for assistance.".format(rubric_xml)
+            error_message = "[render_rubric] Could not parse the rubric with xml: {0}. Contact the learning sciences group for assistance.".format(
+                rubric_xml)
             log.exception(error_message)
             raise RubricParsingError(error_message)
-        return {'success' : success, 'html' : html, 'rubric_scores' : rubric_scores}
+        return {'success': success, 'html': html, 'rubric_scores': rubric_scores}
 
     def check_if_rubric_is_parseable(self, rubric_string, location, max_score_allowed, max_score):
         rubric_dict = self.render_rubric(rubric_string)
@@ -83,7 +85,8 @@ class CombinedOpenEndedRubric(object):
         rubric_feedback = rubric_dict['html']
         if not success:
             #This is a staff_facing_error
-            error_message = "Could not parse rubric : {0} for location {1}. Contact the learning sciences group for assistance.".format(rubric_string, location.url())
+            error_message = "Could not parse rubric : {0} for location {1}. Contact the learning sciences group for assistance.".format(
+                rubric_string, location.url())
             log.error(error_message)
             raise RubricParsingError(error_message)
 
@@ -98,10 +101,10 @@ class CombinedOpenEndedRubric(object):
                 log.error(error_message)
                 raise RubricParsingError(error_message)
 
-        if total != max_score:
+        if int(total) != int(max_score):
             #This is a staff_facing_error
             error_msg = "The max score {0} for problem {1} does not match the total number of points in the rubric {2}. Contact the learning sciences group for assistance.".format(
-                    max_score, location, total)
+                max_score, location, total)
             log.error(error_msg)
             raise RubricParsingError(error_msg)
 
@@ -123,12 +126,13 @@ class CombinedOpenEndedRubric(object):
         for category in element:
             if category.tag != 'category':
                 #This is a staff_facing_error
-                raise RubricParsingError("[extract_categories] Expected a <category> tag: got {0} instead. Contact the learning sciences group for assistance.".format(category.tag))
+                raise RubricParsingError(
+                    "[extract_categories] Expected a <category> tag: got {0} instead. Contact the learning sciences group for assistance.".format(
+                        category.tag))
             else:
                 categories.append(self.extract_category(category))
         return categories
 
-
     def extract_category(self, category):
         '''
         construct an individual category
@@ -150,13 +154,17 @@ class CombinedOpenEndedRubric(object):
         # if we are missing the score tag and we are expecting one
         elif self.has_score:
             #This is a staff_facing_error
-            raise RubricParsingError("[extract_category] Category {0} is missing a score. Contact the learning sciences group for assistance.".format(descriptionxml.text))
+            raise RubricParsingError(
+                "[extract_category] Category {0} is missing a score. Contact the learning sciences group for assistance.".format(
+                    descriptionxml.text))
 
 
         # parse description
         if descriptionxml.tag != 'description':
             #This is a staff_facing_error
-            raise RubricParsingError("[extract_category]: expected description tag, got {0} instead. Contact the learning sciences group for assistance.".format(descriptionxml.tag))
+            raise RubricParsingError(
+                "[extract_category]: expected description tag, got {0} instead. Contact the learning sciences group for assistance.".format(
+                    descriptionxml.tag))
 
         description = descriptionxml.text
 
@@ -167,7 +175,9 @@ class CombinedOpenEndedRubric(object):
         for option in optionsxml:
             if option.tag != 'option':
                 #This is a staff_facing_error
-                raise RubricParsingError("[extract_category]: expected option tag, got {0} instead. Contact the learning sciences group for assistance.".format(option.tag))
+                raise RubricParsingError(
+                    "[extract_category]: expected option tag, got {0} instead. Contact the learning sciences group for assistance.".format(
+                        option.tag))
             else:
                 pointstr = option.get("points")
                 if pointstr:
@@ -177,13 +187,16 @@ class CombinedOpenEndedRubric(object):
                         points = int(pointstr)
                     except ValueError:
                         #This is a staff_facing_error
-                        raise RubricParsingError("[extract_category]: expected points to have int, got {0} instead. Contact the learning sciences group for assistance.".format(pointstr))
+                        raise RubricParsingError(
+                            "[extract_category]: expected points to have int, got {0} instead. Contact the learning sciences group for assistance.".format(
+                                pointstr))
                 elif autonumbering:
                     # use the generated one if we're in the right mode
                     points = cur_points
                     cur_points = cur_points + 1
                 else:
-                    raise Exception("[extract_category]: missing points attribute. Cannot continue to auto-create points values after a points value is explicitly defined.")
+                    raise Exception(
+                        "[extract_category]: missing points attribute. Cannot continue to auto-create points values after a points value is explicitly defined.")
 
                 selected = score == points
                 optiontext = option.text
@@ -193,34 +206,34 @@ class CombinedOpenEndedRubric(object):
         options = sorted(options, key=lambda option: option['points'])
         CombinedOpenEndedRubric.validate_options(options)
 
-        return {'description': description, 'options': options, 'score' : score}
+        return {'description': description, 'options': options, 'score': score}
 
-    def render_combined_rubric(self,rubric_xml,scores,score_types,feedback_types):
-        success, score_tuples = CombinedOpenEndedRubric.reformat_scores_for_rendering(scores,score_types,feedback_types)
+    def render_combined_rubric(self, rubric_xml, scores, score_types, feedback_types):
+        success, score_tuples = CombinedOpenEndedRubric.reformat_scores_for_rendering(scores, score_types,
+                                                                                      feedback_types)
         rubric_categories = self.extract_categories(rubric_xml)
         max_scores = map((lambda cat: cat['options'][-1]['points']), rubric_categories)
         max_score = max(max_scores)
-        for i in xrange(0,len(rubric_categories)):
+        for i in xrange(0, len(rubric_categories)):
             category = rubric_categories[i]
-            for j in xrange(0,len(category['options'])):
+            for j in xrange(0, len(category['options'])):
                 rubric_categories[i]['options'][j]['grader_types'] = []
                 for tuple in score_tuples:
-                    if tuple[1] == i and tuple[2] ==j:
+                    if tuple[1] == i and tuple[2] == j:
                         for grader_type in tuple[3]:
                             rubric_categories[i]['options'][j]['grader_types'].append(grader_type)
 
         html = self.system.render_template('{0}/open_ended_combined_rubric.html'.format(self.TEMPLATE_DIR),
-            {'categories': rubric_categories,
-             'has_score': True,
-             'view_only': True,
-             'max_score': max_score,
-             'combined_rubric' : True,
-             'grader_type_image_dict' : GRADER_TYPE_IMAGE_DICT,
-             'human_grader_types' : HUMAN_GRADER_TYPE,
-            })
+                                           {'categories': rubric_categories,
+                                            'has_score': True,
+                                            'view_only': True,
+                                            'max_score': max_score,
+                                            'combined_rubric': True,
+                                            'grader_type_image_dict': GRADER_TYPE_IMAGE_DICT,
+                                            'human_grader_types': HUMAN_GRADER_TYPE,
+                                           })
         return html
 
-
     @staticmethod
     def validate_options(options):
         '''
@@ -228,14 +241,16 @@ class CombinedOpenEndedRubric(object):
         '''
         if len(options) == 0:
             #This is a staff_facing_error
-            raise RubricParsingError("[extract_category]: no options associated with this category. Contact the learning sciences group for assistance.")
+            raise RubricParsingError(
+                "[extract_category]: no options associated with this category. Contact the learning sciences group for assistance.")
         if len(options) == 1:
             return
         prev = options[0]['points']
         for option in options[1:]:
             if prev == option['points']:
                 #This is a staff_facing_error
-                raise RubricParsingError("[extract_category]: found duplicate point values between two different options. Contact the learning sciences group for assistance.")
+                raise RubricParsingError(
+                    "[extract_category]: found duplicate point values between two different options. Contact the learning sciences group for assistance.")
             else:
                 prev = option['points']
 
@@ -250,7 +265,7 @@ class CombinedOpenEndedRubric(object):
         @return:
         """
         success = False
-        if len(scores)==0:
+        if len(scores) == 0:
             #This is a dev_facing_error
             log.error("Score length is 0 when trying to reformat rubric scores for rendering.")
             return success, ""
@@ -264,25 +279,25 @@ class CombinedOpenEndedRubric(object):
         score_lists = []
         score_type_list = []
         feedback_type_list = []
-        for i in xrange(0,len(scores)):
+        for i in xrange(0, len(scores)):
             score_cont_list = scores[i]
-            for j in xrange(0,len(score_cont_list)):
+            for j in xrange(0, len(score_cont_list)):
                 score_list = score_cont_list[j]
                 score_lists.append(score_list)
                 score_type_list.append(score_types[i][j])
                 feedback_type_list.append(feedback_types[i][j])
 
         score_list_len = len(score_lists[0])
-        for i in xrange(0,len(score_lists)):
+        for i in xrange(0, len(score_lists)):
             score_list = score_lists[i]
-            if len(score_list)!=score_list_len:
+            if len(score_list) != score_list_len:
                 return success, ""
 
         score_tuples = []
-        for i in xrange(0,len(score_lists)):
-            for j in xrange(0,len(score_lists[i])):
-                tuple = [1,j,score_lists[i][j],[],[]]
-                score_tuples, tup_ind = CombinedOpenEndedRubric.check_for_tuple_matches(score_tuples,tuple)
+        for i in xrange(0, len(score_lists)):
+            for j in xrange(0, len(score_lists[i])):
+                tuple = [1, j, score_lists[i][j], [], []]
+                score_tuples, tup_ind = CombinedOpenEndedRubric.check_for_tuple_matches(score_tuples, tuple)
                 score_tuples[tup_ind][0] += 1
                 score_tuples[tup_ind][3].append(score_type_list[i])
                 score_tuples[tup_ind][4].append(feedback_type_list[i])
@@ -302,18 +317,12 @@ class CombinedOpenEndedRubric(object):
         category = tuple[1]
         score = tuple[2]
         tup_ind = -1
-        for t in xrange(0,len(tuples)):
+        for t in xrange(0, len(tuples)):
             if tuples[t][1] == category and tuples[t][2] == score:
                 tup_ind = t
                 break
 
         if tup_ind == -1:
-            tuples.append([0,category,score,[],[]])
-            tup_ind = len(tuples)-1
+            tuples.append([0, category, score, [], []])
+            tup_ind = len(tuples) - 1
         return tuples, tup_ind
-
-
-
-
-
-
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
index 1dd5c57ad4..08f2a95387 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
@@ -1,5 +1,5 @@
 import logging
-from grading_service_module import GradingService
+from .grading_service_module import GradingService
 
 log = logging.getLogger(__name__)
 
@@ -8,6 +8,7 @@ class ControllerQueryService(GradingService):
     """
     Interface to staff grading backend.
     """
+
     def __init__(self, config, system):
         config['system'] = system
         super(ControllerQueryService, self).__init__(config)
@@ -59,7 +60,7 @@ class ControllerQueryService(GradingService):
     def get_flagged_problem_list(self, course_id):
         params = {
             'course_id': course_id,
-            }
+        }
 
         response = self.get(self.flagged_problem_list_url, params)
         return response
@@ -70,20 +71,21 @@ class ControllerQueryService(GradingService):
             'student_id': student_id,
             'submission_id': submission_id,
             'action_type': action_type
-            }
+        }
 
         response = self.post(self.take_action_on_flags_url, params)
         return response
 
+
 def convert_seconds_to_human_readable(seconds):
     if seconds < 60:
         human_string = "{0} seconds".format(seconds)
     elif seconds < 60 * 60:
-        human_string = "{0} minutes".format(round(seconds/60,1))
-    elif seconds < (24*60*60):
-        human_string = "{0} hours".format(round(seconds/(60*60),1))
+        human_string = "{0} minutes".format(round(seconds / 60, 1))
+    elif seconds < (24 * 60 * 60):
+        human_string = "{0} hours".format(round(seconds / (60 * 60), 1))
     else:
-        human_string = "{0} days".format(round(seconds/(60*60*24),1))
+        human_string = "{0} days".format(round(seconds / (60 * 60 * 24), 1))
 
     eta_string = "{0}".format(human_string)
     return eta_string
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py
index 8a4caa1291..f3f6568b1e 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py
@@ -5,7 +5,7 @@ import requests
 from requests.exceptions import RequestException, ConnectionError, HTTPError
 import sys
 
-from combined_open_ended_rubric import CombinedOpenEndedRubric
+from .combined_open_ended_rubric import CombinedOpenEndedRubric
 from lxml import etree
 
 log = logging.getLogger(__name__)
@@ -19,6 +19,7 @@ class GradingService(object):
     """
     Interface to staff grading backend.
     """
+
     def __init__(self, config):
         self.username = config['username']
         self.password = config['password']
@@ -34,8 +35,8 @@ class GradingService(object):
         Returns the decoded json dict of the response.
         """
         response = self.session.post(self.login_url,
-            {'username': self.username,
-             'password': self.password, })
+                                     {'username': self.username,
+                                      'password': self.password, })
 
         response.raise_for_status()
 
@@ -47,7 +48,7 @@ class GradingService(object):
         """
         try:
             op = lambda: self.session.post(url, data=data,
-                allow_redirects=allow_redirects)
+                                           allow_redirects=allow_redirects)
             r = self._try_with_login(op)
         except (RequestException, ConnectionError, HTTPError) as err:
             # reraise as promised GradingServiceError, but preserve stacktrace.
@@ -63,8 +64,8 @@ class GradingService(object):
         """
         log.debug(params)
         op = lambda: self.session.get(url,
-            allow_redirects=allow_redirects,
-            params=params)
+                                      allow_redirects=allow_redirects,
+                                      params=params)
         try:
             r = self._try_with_login(op)
         except (RequestException, ConnectionError, HTTPError) as err:
@@ -92,7 +93,7 @@ class GradingService(object):
             r = self._login()
             if r and not r.get('success'):
                 log.warning("Couldn't log into staff_grading backend. Response: %s",
-                    r)
+                            r)
                 # try again
             response = operation()
             response.raise_for_status()
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py
index edae69854f..6956f336a5 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py
@@ -5,6 +5,7 @@ to send them to S3.
 
 try:
     from PIL import Image
+
     ENABLE_PIL = True
 except:
     ENABLE_PIL = False
@@ -51,6 +52,7 @@ class ImageProperties(object):
     """
     Class to check properties of an image and to validate if they are allowed.
     """
+
     def __init__(self, image_data):
         """
         Initializes class variables
@@ -92,7 +94,7 @@ class ImageProperties(object):
             g = rgb[1]
             b = rgb[2]
             check_r = (r > 60)
-            check_g =  (r * 0.4) < g < (r * 0.85)
+            check_g = (r * 0.4) < g < (r * 0.85)
             check_b = (r * 0.2) < b < (r * 0.7)
             colors_okay = check_r and check_b and check_g
         except:
@@ -141,6 +143,7 @@ class URLProperties(object):
     Checks to see if a URL points to acceptable content.  Added to check if students are submitting reasonable
     links to the peer grading image functionality of the external grading service.
     """
+
     def __init__(self, url_string):
         self.url_string = url_string
 
@@ -212,7 +215,7 @@ def run_image_tests(image):
         success = image_properties.run_tests()
     except:
         log.exception("Cannot run image tests in combined open ended xmodule.  May be an issue with a particular image,"
-                    "or an issue with the deployment configuration of PIL/Pillow")
+                      "or an issue with the deployment configuration of PIL/Pillow")
     return success
 
 
@@ -252,7 +255,8 @@ def upload_to_s3(file_to_upload, keyname, s3_interface):
         return True, public_url
     except:
         #This is a dev_facing_error
-        error_message = "Could not connect to S3 to upload peer grading image.  Trying to utilize bucket: {0}".format(bucketname.lower())
+        error_message = "Could not connect to S3 to upload peer grading image.  Trying to utilize bucket: {0}".format(
+            bucketname.lower())
         log.error(error_message)
         return False, error_message
 
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 aa805a5290..1f84d2ab8c 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
@@ -10,7 +10,7 @@ import logging
 from lxml import etree
 import capa.xqueue_interface as xqueue_interface
 
-from xmodule.capa_module import  ComplexEncoder
+from xmodule.capa_module import ComplexEncoder
 from xmodule.editing_module import EditingDescriptor
 from xmodule.progress import Progress
 from xmodule.stringify import stringify_children
@@ -22,7 +22,7 @@ from numpy import median
 
 from datetime import datetime
 
-from combined_open_ended_rubric import CombinedOpenEndedRubric
+from .combined_open_ended_rubric import CombinedOpenEndedRubric
 
 log = logging.getLogger("mitx.courseware")
 
@@ -65,18 +65,17 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         if oeparam is None:
             #This is a staff_facing_error
             raise ValueError(error_message.format('oeparam'))
-        if self.prompt is None:
+        if self.child_prompt is None:
             raise ValueError(error_message.format('prompt'))
-        if self.rubric is None:
+        if self.child_rubric is None:
             raise ValueError(error_message.format('rubric'))
 
-        self._parse(oeparam, self.prompt, self.rubric, system)
+        self._parse(oeparam, self.child_prompt, self.child_rubric, system)
 
-        if self.created == True and self.state == self.ASSESSING:
-            self.created = False
+        if self.child_created == True and self.child_state == self.ASSESSING:
+            self.child_created = False
             self.send_to_grader(self.latest_answer(), system)
-            self.created = False
-
+            self.child_created = False
 
     def _parse(self, oeparam, prompt, rubric, system):
         '''
@@ -90,8 +89,8 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         # Note that OpenEndedResponse is agnostic to the specific contents of grader_payload
         prompt_string = stringify_children(prompt)
         rubric_string = stringify_children(rubric)
-        self.prompt = prompt_string
-        self.rubric = rubric_string
+        self.child_prompt = prompt_string
+        self.child_rubric = rubric_string
 
         grader_payload = oeparam.find('grader_payload')
         grader_payload = grader_payload.text if grader_payload is not None else ''
@@ -104,7 +103,9 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             # response types)
         except TypeError, ValueError:
             #This is a dev_facing_error
-            log.exception("Grader payload from external open ended grading server is not a json object! Object: {0}".format(grader_payload))
+            log.exception(
+                "Grader payload from external open ended grading server is not a json object! Object: {0}".format(
+                    grader_payload))
 
         self.initial_display = find_with_default(oeparam, 'initial_display', '')
         self.answer = find_with_default(oeparam, 'answer_display', 'No answer given.')
@@ -130,7 +131,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         @param system: ModuleSystem
         @return: Success indicator
         """
-        self.state = self.DONE
+        self.child_state = self.DONE
         return {'success': True}
 
     def message_post(self, get, system):
@@ -148,7 +149,9 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         for tag in ['feedback', 'submission_id', 'grader_id', 'score']:
             if tag not in survey_responses:
                 #This is a student_facing_error
-                return {'success': False, 'msg': "Could not find needed tag {0} in the survey responses.  Please try submitting again.".format(tag)}
+                return {'success': False,
+                        'msg': "Could not find needed tag {0} in the survey responses.  Please try submitting again.".format(
+                            tag)}
         try:
             submission_id = int(survey_responses['submission_id'])
             grader_id = int(survey_responses['grader_id'])
@@ -168,7 +171,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         anonymous_student_id = system.anonymous_student_id
         queuekey = xqueue_interface.make_hashkey(str(system.seed) + qtime +
                                                  anonymous_student_id +
-                                                 str(len(self.history)))
+                                                 str(len(self.child_history)))
 
         xheader = xqueue_interface.make_xheader(
             lms_callback_url=system.xqueue['callback_url'],
@@ -188,14 +191,14 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         }
 
         (error, msg) = qinterface.send_to_queue(header=xheader,
-            body=json.dumps(contents))
+                                                body=json.dumps(contents))
 
         #Convert error to a success value
         success = True
         if error:
             success = False
 
-        self.state = self.DONE
+        self.child_state = self.DONE
 
         #This is a student_facing_message
         return {'success': success, 'msg': "Successfully submitted your feedback."}
@@ -219,11 +222,11 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         # Generate header
         queuekey = xqueue_interface.make_hashkey(str(system.seed) + qtime +
                                                  anonymous_student_id +
-                                                 str(len(self.history)))
+                                                 str(len(self.child_history)))
 
         xheader = xqueue_interface.make_xheader(lms_callback_url=system.xqueue['callback_url'],
-            lms_key=queuekey,
-            queue_name=self.queue_name)
+                                                lms_key=queuekey,
+                                                queue_name=self.queue_name)
 
         contents = self.payload.copy()
 
@@ -241,7 +244,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         # Submit request. When successful, 'msg' is the prior length of the queue
         (error, msg) = qinterface.send_to_queue(header=xheader,
-            body=json.dumps(contents))
+                                                body=json.dumps(contents))
 
         # State associated with the queueing request
         queuestate = {'key': queuekey,
@@ -262,11 +265,10 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         self.record_latest_score(new_score_msg['score'])
         self.record_latest_post_assessment(score_msg)
-        self.state = self.POST_ASSESSMENT
+        self.child_state = self.POST_ASSESSMENT
 
         return True
 
-
     def get_answers(self):
         """
         Gets and shows the answer for this problem.
@@ -300,7 +302,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         # We want to display available feedback in a particular order.
         # This dictionary specifies which goes first--lower first.
-        priorities = {  # These go at the start of the feedback
+        priorities = {# These go at the start of the feedback
                       'spelling': 0,
                       'grammar': 1,
                       # needs to be after all the other feedback
@@ -400,7 +402,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         if not response_items['success']:
             return system.render_template("{0}/open_ended_error.html".format(self.TEMPLATE_DIR),
-                {'errors': feedback})
+                                          {'errors': feedback})
 
         feedback_template = system.render_template("{0}/open_ended_feedback.html".format(self.TEMPLATE_DIR), {
             'grader_type': response_items['grader_type'],
@@ -411,7 +413,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         return feedback_template, rubric_scores
 
-
     def _parse_score_msg(self, score_msg, system, join_feedback=True):
         """
          Grader reply is a JSON-dump of the following dict
@@ -437,13 +438,13 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             'valid': False,
             'score': 0,
             'feedback': '',
-            'rubric_scores' : [[0]],
-            'grader_types' : [''],
-            'feedback_items' : [''],
-            'feedback_dicts' : [{}],
-            'grader_ids' : [0],
-            'submission_ids' : [0],
-            }
+            'rubric_scores': [[0]],
+            'grader_types': [''],
+            'feedback_items': [''],
+            'feedback_dicts': [{}],
+            'grader_ids': [0],
+            'submission_ids': [0],
+        }
         try:
             score_result = json.loads(score_msg)
         except (TypeError, ValueError):
@@ -470,7 +471,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                 log.error(error_message)
                 fail['feedback'] = error_message
                 return fail
-            #This is to support peer grading
+                #This is to support peer grading
         if isinstance(score_result['score'], list):
             feedback_items = []
             rubric_scores = []
@@ -527,12 +528,12 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             'valid': True,
             'score': score,
             'feedback': feedback,
-            'rubric_scores' : rubric_scores,
-            'grader_types' : grader_types,
-            'feedback_items' : feedback_items,
-            'feedback_dicts' : feedback_dicts,
-            'grader_ids' : grader_ids,
-            'submission_ids' : submission_ids,
+            'rubric_scores': rubric_scores,
+            'grader_types': grader_types,
+            'feedback_items': feedback_items,
+            'feedback_dicts': feedback_dicts,
+            'grader_ids': grader_ids,
+            'submission_ids': submission_ids,
         }
 
     def latest_post_assessment(self, system, short_feedback=False, join_feedback=True):
@@ -541,16 +542,16 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         @param short_feedback: If the long feedback is wanted or not
         @return: Returns formatted feedback
         """
-        if not self.history:
+        if not self.child_history:
             return ""
 
-        feedback_dict = self._parse_score_msg(self.history[-1].get('post_assessment', ""), system,
-            join_feedback=join_feedback)
+        feedback_dict = self._parse_score_msg(self.child_history[-1].get('post_assessment', ""), system,
+                                              join_feedback=join_feedback)
         if not short_feedback:
             return feedback_dict['feedback'] if feedback_dict['valid'] else ''
         if feedback_dict['valid']:
             short_feedback = self._convert_longform_feedback_to_html(
-                json.loads(self.history[-1].get('post_assessment', "")))
+                json.loads(self.child_history[-1].get('post_assessment', "")))
         return short_feedback if feedback_dict['valid'] else ''
 
     def format_feedback_with_evaluation(self, system, feedback):
@@ -585,7 +586,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             #This is a dev_facing_error
             log.error("Cannot find {0} in handlers in handle_ajax function for open_ended_module.py".format(dispatch))
             #This is a dev_facing_error
-            return json.dumps({'error': 'Error handling action.  Please try again.', 'success' : False})
+            return json.dumps({'error': 'Error handling action.  Please try again.', 'success': False})
 
         before = self.get_progress()
         d = handlers[dispatch](get, system)
@@ -603,7 +604,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         @param system: Modulesystem (needed to align with other ajax functions)
         @return: Returns the current state
         """
-        state = self.state
+        state = self.child_state
         return {'state': state}
 
     def save_answer(self, get, system):
@@ -619,7 +620,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         if closed:
             return msg
 
-        if self.state != self.INITIAL:
+        if self.child_state != self.INITIAL:
             return self.out_of_sync_error(get)
 
         # add new history element with answer and empty score and hint.
@@ -666,24 +667,23 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         """
         #set context variables and render template
         eta_string = None
-        if self.state != self.INITIAL:
+        if self.child_state != self.INITIAL:
             latest = self.latest_answer()
             previous_answer = latest if latest is not None else self.initial_display
             post_assessment = self.latest_post_assessment(system)
             score = self.latest_score()
             correct = 'correct' if self.is_submission_correct(score) else 'incorrect'
-            if self.state == self.ASSESSING:
+            if self.child_state == self.ASSESSING:
                 eta_string = self.get_eta()
         else:
             post_assessment = ""
             correct = ""
             previous_answer = self.initial_display
 
-
         context = {
-            'prompt': self.prompt,
+            'prompt': self.child_prompt,
             'previous_answer': previous_answer,
-            'state': self.state,
+            'state': self.child_state,
             'allow_reset': self._allow_reset(),
             'rows': 30,
             'cols': 80,
@@ -692,13 +692,13 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             'child_type': 'openended',
             'correct': correct,
             'accept_file_upload': self.accept_file_upload,
-            'eta_message' : eta_string,
+            'eta_message': eta_string,
         }
         html = system.render_template('{0}/open_ended.html'.format(self.TEMPLATE_DIR), context)
         return html
 
 
-class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
+class OpenEndedDescriptor():
     """
     Module for adding open ended response questions to courses
     """
@@ -710,6 +710,9 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     has_score = True
     template_dir_name = "openended"
 
+    def __init__(self, system):
+        self.system =system
+
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         """
@@ -723,13 +726,15 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
         for child in ['openendedparam']:
             if len(xml_object.xpath(child)) != 1:
                 #This is a staff_facing_error
-                raise ValueError("Open Ended definition must include exactly one '{0}' tag. Contact the learning sciences group for assistance.".format(child))
+                raise ValueError(
+                    "Open Ended definition must include exactly one '{0}' tag. Contact the learning sciences group for assistance.".format(
+                        child))
 
         def parse(k):
             """Assumes that xml_object has child k"""
             return xml_object.xpath(k)[0]
 
-        return {'oeparam': parse('openendedparam'), }
+        return {'oeparam': parse('openendedparam')}
 
 
     def definition_to_xml(self, resource_fs):
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
index 31d26fd3c3..2e49565bec 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
@@ -1,19 +1,9 @@
-import copy
-from fs.errors import ResourceNotFoundError
-import itertools
 import json
 import logging
-from lxml import etree
-from lxml.html import rewrite_links
 from lxml.html.clean import Cleaner, autolink_html
-from path import path
-import os
-import sys
-import hashlib
-import capa.xqueue_interface as xqueue_interface
 import re
 
-from xmodule.capa_module import only_one, ComplexEncoder
+from xmodule.capa_module import ComplexEncoder
 import open_ended_image_submission
 from xmodule.editing_module import EditingDescriptor
 from xmodule.html_checker import check_html
@@ -22,7 +12,7 @@ from xmodule.stringify import stringify_children
 from xmodule.xml_module import XmlDescriptor
 from xmodule.modulestore import Location
 from capa.util import *
-from peer_grading_service import PeerGradingService, MockPeerGradingService
+from .peer_grading_service import PeerGradingService, MockPeerGradingService
 import controller_query_service
 
 from datetime import datetime
@@ -74,11 +64,15 @@ class OpenEndedChild(object):
         'done': 'Done',
     }
 
-    def __init__(self, system, location, definition, descriptor, static_data, 
+    def __init__(self, system, location, definition, descriptor, static_data,
                  instance_state=None, shared_state=None, **kwargs):
         # Load instance state
+
         if instance_state is not None:
-            instance_state = json.loads(instance_state)
+            try:
+                instance_state = json.loads(instance_state)
+            except:
+                log.error("Could not load instance state for open ended.  Setting it to nothing.: {0}".format(instance_state))
         else:
             instance_state = {}
 
@@ -86,37 +80,34 @@ class OpenEndedChild(object):
         # None for any element, and score and hint can be None for the last (current)
         # element.
         # Scores are on scale from 0 to max_score
-        self.history = instance_state.get('history', [])
 
-        self.state = instance_state.get('state', self.INITIAL)
+        self.child_history=instance_state.get('child_history',[])
+        self.child_state=instance_state.get('child_state', self.INITIAL)
+        self.child_created = instance_state.get('child_created', False)
+        self.child_attempts = instance_state.get('child_attempts', 0)
 
-        self.created = instance_state.get('created', False)
-
-        self.attempts = instance_state.get('attempts', 0)
         self.max_attempts = static_data['max_attempts']
-
-        self.prompt = static_data['prompt']
-        self.rubric = static_data['rubric']
+        self.child_prompt = static_data['prompt']
+        self.child_rubric = static_data['rubric']
         self.display_name = static_data['display_name']
         self.accept_file_upload = static_data['accept_file_upload']
         self.close_date = static_data['close_date']
         self.s3_interface = static_data['s3_interface']
         self.skip_basic_checks = static_data['skip_basic_checks']
+        self._max_score = static_data['max_score']
 
         # Used for progress / grading.  Currently get credit just for
         # completion (doesn't matter if you self-assessed correct/incorrect).
-        self._max_score = static_data['max_score']
         if system.open_ended_grading_interface:
             self.peer_gs = PeerGradingService(system.open_ended_grading_interface, system)
-            self.controller_qs = controller_query_service.ControllerQueryService(system.open_ended_grading_interface,system)
+            self.controller_qs = controller_query_service.ControllerQueryService(system.open_ended_grading_interface,
+                                                                                 system)
         else:
             self.peer_gs = MockPeerGradingService()
-            self.controller_qs = None 
-
-
+            self.controller_qs = None
 
         self.system = system
-        
+
         self.location_string = location
         try:
             self.location_string = self.location_string.url()
@@ -148,40 +139,42 @@ class OpenEndedChild(object):
                 #This is a student_facing_error
                 'error': 'The problem close date has passed, and this problem is now closed.'
             }
-        elif self.attempts > self.max_attempts:
+        elif self.child_attempts > self.max_attempts:
             return True, {
                 'success': False,
                 #This is a student_facing_error
-                'error': 'You have attempted this problem {0} times.  You are allowed {1} attempts.'.format(self.attempts, self.max_attempts)
+                'error': 'You have attempted this problem {0} times.  You are allowed {1} attempts.'.format(
+                    self.child_attempts, self.max_attempts
+                )
             }
         else:
             return False, {}
 
     def latest_answer(self):
         """Empty string if not available"""
-        if not self.history:
+        if not self.child_history:
             return ""
-        return self.history[-1].get('answer', "")
+        return self.child_history[-1].get('answer', "")
 
     def latest_score(self):
         """None if not available"""
-        if not self.history:
+        if not self.child_history:
             return None
-        return self.history[-1].get('score')
+        return self.child_history[-1].get('score')
 
     def latest_post_assessment(self, system):
         """Empty string if not available"""
-        if not self.history:
+        if not self.child_history:
             return ""
-        return self.history[-1].get('post_assessment', "")
+        return self.child_history[-1].get('post_assessment', "")
 
     @staticmethod
     def sanitize_html(answer):
         try:
             answer = autolink_html(answer)
             cleaner = Cleaner(style=True, links=True, add_nofollow=False, page_structure=True, safe_attrs_only=True,
-                host_whitelist=open_ended_image_submission.TRUSTED_IMAGE_DOMAINS,
-                whitelist_tags=set(['embed', 'iframe', 'a', 'img']))
+                              host_whitelist=open_ended_image_submission.TRUSTED_IMAGE_DOMAINS,
+                              whitelist_tags=set(['embed', 'iframe', 'a', 'img']))
             clean_html = cleaner.clean_html(answer)
             clean_html = re.sub(r'</p>$', '', re.sub(r'^<p>', '', clean_html))
         except:
@@ -195,30 +188,30 @@ class OpenEndedChild(object):
         @return: None
         """
         answer = OpenEndedChild.sanitize_html(answer)
-        self.history.append({'answer': answer})
+        self.child_history.append({'answer': answer})
 
     def record_latest_score(self, score):
         """Assumes that state is right, so we're adding a score to the latest
         history element"""
-        self.history[-1]['score'] = score
+        self.child_history[-1]['score'] = score
 
     def record_latest_post_assessment(self, post_assessment):
         """Assumes that state is right, so we're adding a score to the latest
         history element"""
-        self.history[-1]['post_assessment'] = post_assessment
+        self.child_history[-1]['post_assessment'] = post_assessment
 
     def change_state(self, new_state):
         """
         A centralized place for state changes--allows for hooks.  If the
         current state matches the old state, don't run any hooks.
         """
-        if self.state == new_state:
+        if self.child_state == new_state:
             return
 
-        self.state = new_state
+        self.child_state = new_state
 
-        if self.state == self.DONE:
-            self.attempts += 1
+        if self.child_state == self.DONE:
+            self.child_attempts += 1
 
     def get_instance_state(self):
         """
@@ -227,17 +220,17 @@ class OpenEndedChild(object):
 
         state = {
             'version': self.STATE_VERSION,
-            'history': self.history,
-            'state': self.state,
+            'child_history': self.child_history,
+            'child_state': self.child_state,
             'max_score': self._max_score,
-            'attempts': self.attempts,
-            'created': False,
+            'child_attempts': self.child_attempts,
+            'child_created': False,
         }
         return json.dumps(state)
 
     def _allow_reset(self):
         """Can the module be reset?"""
-        return (self.state == self.DONE and self.attempts < self.max_attempts)
+        return (self.child_state == self.DONE and self.child_attempts < self.max_attempts)
 
     def max_score(self):
         """
@@ -269,10 +262,10 @@ class OpenEndedChild(object):
         '''
         if self._max_score > 0:
             try:
-                return Progress(self.get_score()['score'], self._max_score)
+                return Progress(int(self.get_score()['score']), int(self._max_score))
             except Exception as err:
                 #This is a dev_facing_error
-                log.exception("Got bad progress from open ended child module. Max Score: {1}".format(self._max_score))
+                log.exception("Got bad progress from open ended child module. Max Score: {0}".format(self._max_score))
                 return None
         return None
 
@@ -282,7 +275,7 @@ class OpenEndedChild(object):
         """
         #This is a dev_facing_error
         log.warning("Open ended child state out sync. state: %r, get: %r. %s",
-            self.state, get, msg)
+                    self.child_state, get, msg)
         #This is a student_facing_error
         return {'success': False,
                 'error': 'The problem state got out-of-sync.  Please try reloading the page.'}
@@ -308,7 +301,7 @@ class OpenEndedChild(object):
         @return: Boolean correct.
         """
         correct = False
-        if(isinstance(score, (int, long, float, complex))):
+        if (isinstance(score, (int, long, float, complex))):
             score_ratio = int(score) / float(self.max_score())
             correct = (score_ratio >= 0.66)
         return correct
@@ -342,7 +335,8 @@ class OpenEndedChild(object):
 
             try:
                 image_data.seek(0)
-                success, s3_public_url = open_ended_image_submission.upload_to_s3(image_data, image_key, self.s3_interface)
+                success, s3_public_url = open_ended_image_submission.upload_to_s3(image_data, image_key,
+                                                                                  self.s3_interface)
             except:
                 log.exception("Could not upload image to S3.")
 
@@ -404,9 +398,9 @@ class OpenEndedChild(object):
             #In this case, an image was submitted by the student, but the image could not be uploaded to S3.  Likely
             #a config issue (development vs deployment).  For now, just treat this as a "success"
             log.exception("Student AJAX post to combined open ended xmodule indicated that it contained an image, "
-                        "but the image was not able to be uploaded to S3.  This could indicate a config"
-                        "issue with this deployment, but it could also indicate a problem with S3 or with the"
-                        "student image itself.")
+                          "but the image was not able to be uploaded to S3.  This could indicate a config"
+                          "issue with this deployment, but it could also indicate a problem with S3 or with the"
+                          "student image itself.")
             overall_success = True
         elif not has_file_to_upload:
             #If there is no file to upload, probably the student has embedded the link in the answer text
@@ -445,7 +439,7 @@ class OpenEndedChild(object):
         response = {}
         #This is a student_facing_error
         error_string = ("You need to peer grade {0} more in order to make another submission.  "
-        "You have graded {1}, and {2} are required.  You have made {3} successful peer grading submissions.")
+                        "You have graded {1}, and {2} are required.  You have made {3} successful peer grading submissions.")
         try:
             response = self.peer_gs.get_data_for_location(self.location_string, student_id)
             count_graded = response['count_graded']
@@ -454,16 +448,18 @@ class OpenEndedChild(object):
             success = True
         except:
             #This is a dev_facing_error
-            log.error("Could not contact external open ended graders for location {0} and student {1}".format(self.location_string,student_id))
+            log.error("Could not contact external open ended graders for location {0} and student {1}".format(
+                self.location_string, student_id))
             #This is a student_facing_error
             error_message = "Could not contact the graders.  Please notify course staff."
             return success, allowed_to_submit, error_message
-        if count_graded>=count_required:
+        if count_graded >= count_required:
             return success, allowed_to_submit, ""
         else:
             allowed_to_submit = False
             #This is a student_facing_error
-            error_message = error_string.format(count_required-count_graded, count_graded, count_required, student_sub_count)
+            error_message = error_string.format(count_required - count_graded, count_graded, count_required,
+                                                student_sub_count)
             return success, allowed_to_submit, error_message
 
     def get_eta(self):
@@ -478,7 +474,7 @@ class OpenEndedChild(object):
 
         success = response['success']
         if isinstance(success, basestring):
-            success = (success.lower()=="true")
+            success = (success.lower() == "true")
 
         if success:
             eta = controller_query_service.convert_seconds_to_human_readable(response['eta'])
@@ -487,6 +483,3 @@ class OpenEndedChild(object):
             eta_string = ""
 
         return eta_string
-
-
-
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
index 42c54f0463..85c7a98132 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
@@ -1,7 +1,7 @@
 import json
 import logging
 
-from grading_service_module import GradingService
+from .grading_service_module import GradingService
 
 log = logging.getLogger(__name__)
 
@@ -14,6 +14,7 @@ class PeerGradingService(GradingService):
     """
     Interface with the grading controller for peer grading
     """
+
     def __init__(self, config, system):
         config['system'] = system
         super(PeerGradingService, self).__init__(config)
@@ -36,10 +37,11 @@ class PeerGradingService(GradingService):
 
     def get_next_submission(self, problem_location, grader_id):
         response = self.get(self.get_next_submission_url,
-            {'location': problem_location, 'grader_id': grader_id})
+                            {'location': problem_location, 'grader_id': grader_id})
         return self.try_to_decode(self._render_rubric(response))
 
-    def save_grade(self, location, grader_id, submission_id, score, feedback, submission_key, rubric_scores, submission_flagged):
+    def save_grade(self, location, grader_id, submission_id, score, feedback, submission_key, rubric_scores,
+                   submission_flagged):
         data = {'grader_id': grader_id,
                 'submission_id': submission_id,
                 'score': score,
@@ -89,6 +91,7 @@ class PeerGradingService(GradingService):
             pass
         return text
 
+
 """
 This is a mock peer grading service that can be used for unit tests
 without making actual service calls to the grading controller
@@ -122,7 +125,7 @@ class MockPeerGradingService(object):
                            'max_score': 4})
 
     def save_calibration_essay(self, problem_location, grader_id,
-                               calibration_essay_id, submission_key, score, 
+                               calibration_essay_id, submission_key, score,
                                feedback, rubric_scores):
         return {'success': True, 'actual_score': 2}
 
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 f4be426667..5fb901d49c 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
@@ -3,13 +3,11 @@ import logging
 from lxml import etree
 
 from xmodule.capa_module import ComplexEncoder
-from xmodule.editing_module import EditingDescriptor
 from xmodule.progress import Progress
 from xmodule.stringify import stringify_children
-from xmodule.xml_module import XmlDescriptor
 import openendedchild
 
-from combined_open_ended_rubric import CombinedOpenEndedRubric
+from .combined_open_ended_rubric import CombinedOpenEndedRubric
 
 log = logging.getLogger("mitx.courseware")
 
@@ -31,8 +29,12 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         </submitmessage>
     </selfassessment>
     """
-
     TEMPLATE_DIR = "combinedopenended/selfassessment"
+    # states
+    INITIAL = 'initial'
+    ASSESSING = 'assessing'
+    REQUEST_HINT = 'request_hint'
+    DONE = 'done'
 
     def setup_response(self, system, location, definition, descriptor):
         """
@@ -43,8 +45,8 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         @param descriptor: SelfAssessmentDescriptor
         @return: None
         """
-        self.prompt = stringify_children(self.prompt)
-        self.rubric = stringify_children(self.rubric)
+        self.child_prompt = stringify_children(self.child_prompt)
+        self.child_rubric = stringify_children(self.child_rubric)
 
     def get_html(self, system):
         """
@@ -53,18 +55,18 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         @return: Rendered HTML
         """
         #set context variables and render template
-        if self.state != self.INITIAL:
+        if self.child_state != self.INITIAL:
             latest = self.latest_answer()
             previous_answer = latest if latest is not None else ''
         else:
             previous_answer = ''
 
         context = {
-            'prompt': self.prompt,
+            'prompt': self.child_prompt,
             'previous_answer': previous_answer,
             'ajax_url': system.ajax_url,
             'initial_rubric': self.get_rubric_html(system),
-            'state': self.state,
+            'state': self.child_state,
             'allow_reset': self._allow_reset(),
             'child_type': 'selfassessment',
             'accept_file_upload': self.accept_file_upload,
@@ -73,7 +75,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         html = system.render_template('{0}/self_assessment_prompt.html'.format(self.TEMPLATE_DIR), context)
         return html
 
-
     def handle_ajax(self, dispatch, get, system):
         """
         This is called by courseware.module_render, to handle an AJAX call.
@@ -95,7 +96,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
             #This is a dev_facing_error
             log.error("Cannot find {0} in handlers in handle_ajax function for open_ended_module.py".format(dispatch))
             #This is a dev_facing_error
-            return json.dumps({'error': 'Error handling action.  Please try again.', 'success' : False})
+            return json.dumps({'error': 'Error handling action.  Please try again.', 'success': False})
 
         before = self.get_progress()
         d = handlers[dispatch](get, system)
@@ -110,11 +111,11 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         """
         Return the appropriate version of the rubric, based on the state.
         """
-        if self.state == self.INITIAL:
+        if self.child_state == self.INITIAL:
             return ''
 
         rubric_renderer = CombinedOpenEndedRubric(system, False)
-        rubric_dict = rubric_renderer.render_rubric(self.rubric)
+        rubric_dict = rubric_renderer.render_rubric(self.child_rubric)
         success = rubric_dict['success']
         rubric_html = rubric_dict['html']
 
@@ -123,13 +124,13 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
                    'max_score': self._max_score,
         }
 
-        if self.state == self.ASSESSING:
+        if self.child_state == self.ASSESSING:
             context['read_only'] = False
-        elif self.state in (self.POST_ASSESSMENT, self.DONE):
+        elif self.child_state in (self.POST_ASSESSMENT, self.DONE):
             context['read_only'] = True
         else:
             #This is a dev_facing_error
-            raise ValueError("Self assessment module is in an illegal state '{0}'".format(self.state))
+            raise ValueError("Self assessment module is in an illegal state '{0}'".format(self.child_state))
 
         return system.render_template('{0}/self_assessment_rubric.html'.format(self.TEMPLATE_DIR), context)
 
@@ -137,10 +138,10 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         """
         Return the appropriate version of the hint view, based on state.
         """
-        if self.state in (self.INITIAL, self.ASSESSING):
+        if self.child_state in (self.INITIAL, self.ASSESSING):
             return ''
 
-        if self.state == self.DONE:
+        if self.child_state == self.DONE:
             # display the previous hint
             latest = self.latest_post_assessment(system)
             hint = latest if latest is not None else ''
@@ -149,17 +150,16 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
 
         context = {'hint': hint}
 
-        if self.state == self.POST_ASSESSMENT:
+        if self.child_state == self.POST_ASSESSMENT:
             context['read_only'] = False
-        elif self.state == self.DONE:
+        elif self.child_state == self.DONE:
             context['read_only'] = True
         else:
             #This is a dev_facing_error
-            raise ValueError("Self Assessment module is in an illegal state '{0}'".format(self.state))
+            raise ValueError("Self Assessment module is in an illegal state '{0}'".format(self.child_state))
 
         return system.render_template('{0}/self_assessment_hint.html'.format(self.TEMPLATE_DIR), context)
 
-
     def save_answer(self, get, system):
         """
         After the answer is submitted, show the rubric.
@@ -177,7 +177,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         if closed:
             return msg
 
-        if self.state != self.INITIAL:
+        if self.child_state != self.INITIAL:
             return self.out_of_sync_error(get)
 
         error_message = ""
@@ -218,13 +218,13 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         'message_html' only if success is true
         """
 
-        if self.state != self.ASSESSING:
+        if self.child_state != self.ASSESSING:
             return self.out_of_sync_error(get)
 
         try:
             score = int(get['assessment'])
             score_list = get.getlist('score_list[]')
-            for i in xrange(0,len(score_list)):
+            for i in xrange(0, len(score_list)):
                 score_list[i] = int(score_list[i])
         except ValueError:
             #This is a dev_facing_error
@@ -241,7 +241,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         self.change_state(self.DONE)
         d['allow_reset'] = self._allow_reset()
 
-        d['state'] = self.state
+        d['state'] = self.child_state
         return d
 
     def save_hint(self, get, system):
@@ -255,7 +255,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         with the error key only present if success is False and message_html
         only if True.
         '''
-        if self.state != self.POST_ASSESSMENT:
+        if self.child_state != self.POST_ASSESSMENT:
             # Note: because we only ask for hints on wrong answers, may not have
             # the same number of hints and answers.
             return self.out_of_sync_error(get)
@@ -268,7 +268,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
                 'allow_reset': self._allow_reset()}
 
     def latest_post_assessment(self, system):
-        latest_post_assessment =  super(SelfAssessmentModule, self).latest_post_assessment(system)
+        latest_post_assessment = super(SelfAssessmentModule, self).latest_post_assessment(system)
         try:
             rubric_scores = json.loads(latest_post_assessment)
         except:
@@ -278,7 +278,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         return [rubric_scores]
 
 
-class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
+class SelfAssessmentDescriptor():
     """
     Module for adding self assessment questions to courses
     """
@@ -290,6 +290,9 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
     has_score = True
     template_dir_name = "selfassessment"
 
+    def __init__(self, system):
+        self.system =system
+
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         """
@@ -305,7 +308,9 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
         for child in expected_children:
             if len(xml_object.xpath(child)) != 1:
                 #This is a staff_facing_error
-                raise ValueError("Self assessment definition must include exactly one '{0}' tag. Contact the learning sciences group for assistance.".format(child))
+                raise ValueError(
+                    "Self assessment definition must include exactly one '{0}' tag. Contact the learning sciences group for assistance.".format(
+                        child))
 
         def parse(k):
             """Assumes that xml_object has child k"""
@@ -318,7 +323,7 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
         elt = etree.Element('selfassessment')
 
         def add_child(k):
-            child_str = '<{tag}>{body}</{tag}>'.format(tag=k, body=self.definition[k])
+            child_str = '<{tag}>{body}</{tag}>'.format(tag=k, body=getattr(self, k))
             child_node = etree.fromstring(child_str)
             elt.append(child_node)
 
diff --git a/common/lib/xmodule/xmodule/peer_grading_module.py b/common/lib/xmodule/xmodule/peer_grading_module.py
index 1e52dcf070..e18f2ceca3 100644
--- a/common/lib/xmodule/xmodule/peer_grading_module.py
+++ b/common/lib/xmodule/xmodule/peer_grading_module.py
@@ -5,14 +5,14 @@ from lxml import etree
 
 from datetime import datetime
 from pkg_resources import resource_string
-from .capa_module import  ComplexEncoder
-from .editing_module import EditingDescriptor
+from .capa_module import ComplexEncoder
 from .stringify import stringify_children
 from .x_module import XModule
-from .xml_module import XmlDescriptor
+from xmodule.raw_module import RawDescriptor
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
-from timeinfo import TimeInfo
+from .timeinfo import TimeInfo
+from xblock.core import Object, Integer, Boolean, String, Scope
 
 from xmodule.open_ended_grading_classes.peer_grading_service import PeerGradingService, GradingServiceError, MockPeerGradingService
 
@@ -27,76 +27,67 @@ IS_GRADED = True
 EXTERNAL_GRADER_NO_CONTACT_ERROR = "Failed to contact external graders.  Please notify course staff."
 
 
-class PeerGradingModule(XModule):
+class PeerGradingFields(object):
+    use_for_single_location = Boolean(help="Whether to use this for a single location or as a panel.", default=USE_FOR_SINGLE_LOCATION, scope=Scope.settings)
+    link_to_location = String(help="The location this problem is linked to.", default=LINK_TO_LOCATION, scope=Scope.settings)
+    is_graded = Boolean(help="Whether or not this module is scored.",default=IS_GRADED, scope=Scope.settings)
+    display_due_date_string = String(help="Due date that should be displayed.", default=None, scope=Scope.settings)
+    grace_period_string = String(help="Amount of grace to give on the due date.", default=None, scope=Scope.settings)
+    max_grade = Integer(help="The maximum grade that a student can receieve for this problem.", default=MAX_SCORE, scope=Scope.settings)
+    student_data_for_location = Object(help="Student data for a given peer grading problem.", default=json.dumps({}),scope=Scope.student_state)
+
+
+class PeerGradingModule(PeerGradingFields, XModule):
     _VERSION = 1
 
     js = {'coffee': [resource_string(__name__, 'js/src/peergrading/peer_grading.coffee'),
                      resource_string(__name__, 'js/src/peergrading/peer_grading_problem.coffee'),
                      resource_string(__name__, 'js/src/collapsible.coffee'),
                      resource_string(__name__, 'js/src/javascript_loader.coffee'),
-                     ]}
+    ]}
     js_module_name = "PeerGrading"
 
     css = {'scss': [resource_string(__name__, 'css/combinedopenended/display.scss')]}
 
-    def __init__(self, system, location, definition, descriptor,
-                 instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor,
-            instance_state, shared_state, **kwargs)
-
-        # Load instance state
-        if instance_state is not None:
-            instance_state = json.loads(instance_state)
-        else:
-            instance_state = {}
+    def __init__(self, system, location, descriptor, model_data):
+        XModule.__init__(self, system, location, descriptor, model_data)
 
         #We need to set the location here so the child modules can use it
         system.set('location', location)
         self.system = system
-        if(self.system.open_ended_grading_interface):
+        if (self.system.open_ended_grading_interface):
             self.peer_gs = PeerGradingService(self.system.open_ended_grading_interface, self.system)
         else:
             self.peer_gs = MockPeerGradingService()
 
-
-        self.use_for_single_location = self.metadata.get('use_for_single_location', USE_FOR_SINGLE_LOCATION)
-        if isinstance(self.use_for_single_location, basestring):
-            self.use_for_single_location = (self.use_for_single_location in TRUE_DICT)
-
-        self.link_to_location = self.metadata.get('link_to_location', USE_FOR_SINGLE_LOCATION)
-        if self.use_for_single_location == True:
+        if self.use_for_single_location in TRUE_DICT:
             try:
                 self.linked_problem = modulestore().get_instance(self.system.course_id, self.link_to_location)
             except:
                 log.error("Linked location {0} for peer grading module {1} does not exist".format(
                     self.link_to_location, self.location))
                 raise
-            due_date = self.linked_problem.metadata.get('peer_grading_due', None)
+            due_date = self.linked_problem._model_data.get('peer_grading_due', None)
             if due_date:
-                self.metadata['due'] = due_date
-
-        self.is_graded = self.metadata.get('is_graded', IS_GRADED)
-        if isinstance(self.is_graded, basestring):
-            self.is_graded = (self.is_graded in TRUE_DICT)
-
-        display_due_date_string = self.metadata.get('due', None)
-        grace_period_string = self.metadata.get('graceperiod', None)
+                self._model_data['due'] = due_date
 
         try:
-            self.timeinfo = TimeInfo(display_due_date_string, grace_period_string)  
+            self.timeinfo = TimeInfo(self.display_due_date_string, self.grace_period_string)
         except:
             log.error("Error parsing due date information in location {0}".format(location))
             raise
 
         self.display_due_date = self.timeinfo.display_due_date
 
+        try:
+            self.student_data_for_location = json.loads(self.student_data_for_location)
+        except:
+            pass
 
         self.ajax_url = self.system.ajax_url
         if not self.ajax_url.endswith("/"):
             self.ajax_url = self.ajax_url + "/"
 
-        self.student_data_for_location = instance_state.get('student_data_for_location', {})
-        self.max_grade = instance_state.get('max_grade', MAX_SCORE)
         if not isinstance(self.max_grade, (int, long)):
             #This could result in an exception, but not wrapping in a try catch block so it moves up the stack
             self.max_grade = int(self.max_grade)
@@ -131,7 +122,7 @@ class PeerGradingModule(XModule):
         """
         if self.closed():
             return self.peer_grading_closed()
-        if not self.use_for_single_location:
+        if self.use_for_single_location not in TRUE_DICT:
             return self.peer_grading()
         else:
             return self.peer_grading_problem({'location': self.link_to_location})['html']
@@ -148,13 +139,13 @@ class PeerGradingModule(XModule):
             'save_grade': self.save_grade,
             'save_calibration_essay': self.save_calibration_essay,
             'problem': self.peer_grading_problem,
-            }
+        }
 
         if dispatch not in handlers:
             #This is a dev_facing_error
             log.error("Cannot find {0} in handlers in handle_ajax function for open_ended_module.py".format(dispatch))
             #This is a dev_facing_error
-            return json.dumps({'error': 'Error handling action.  Please try again.', 'success' : False})
+            return json.dumps({'error': 'Error handling action.  Please try again.', 'success': False})
 
         d = handlers[dispatch](get)
 
@@ -182,7 +173,7 @@ class PeerGradingModule(XModule):
         pass
 
     def get_score(self):
-        if not self.use_for_single_location or not self.is_graded:
+        if self.use_for_single_location not in TRUE_DICT or self.is_graded not in TRUE_DICT:
             return None
 
         try:
@@ -191,9 +182,10 @@ class PeerGradingModule(XModule):
         except:
             success, response = self.query_data_for_location()
             if not success:
-                log.exception("No instance data found and could not get data from controller for loc {0} student {1}".format(
-                    self.system.location.url(), self.system.anonymous_student_id
-                ))
+                log.exception(
+                    "No instance data found and could not get data from controller for loc {0} student {1}".format(
+                        self.system.location.url(), self.system.anonymous_student_id
+                    ))
                 return None
             count_graded = response['count_graded']
             count_required = response['count_required']
@@ -204,7 +196,7 @@ class PeerGradingModule(XModule):
         score_dict = {
             'score': int(count_graded >= count_required),
             'total': self.max_grade,
-            }
+        }
 
         return score_dict
 
@@ -215,7 +207,7 @@ class PeerGradingModule(XModule):
               randomization, and 5/7 on another
         '''
         max_grade = None
-        if self.use_for_single_location and self.is_graded:
+        if self.use_for_single_location in TRUE_DICT and self.is_graded in TRUE_DICT:
             max_grade = self.max_grade
         return max_grade
 
@@ -253,7 +245,7 @@ class PeerGradingModule(XModule):
             .format(self.peer_gs.url, location, grader_id))
             #This is a student_facing_error
             return {'success': False,
-                               'error': EXTERNAL_GRADER_NO_CONTACT_ERROR}
+                    'error': EXTERNAL_GRADER_NO_CONTACT_ERROR}
 
     def save_grade(self, get):
         """
@@ -271,7 +263,8 @@ class PeerGradingModule(XModule):
             error: if there was an error in the submission, this is the error message
         """
 
-        required = set(['location', 'submission_id', 'submission_key', 'score', 'feedback', 'rubric_scores[]', 'submission_flagged'])
+        required = set(['location', 'submission_id', 'submission_key', 'score', 'feedback', 'rubric_scores[]',
+                        'submission_flagged'])
         success, message = self._check_required(get, required)
         if not success:
             return self._err_response(message)
@@ -287,14 +280,14 @@ class PeerGradingModule(XModule):
 
         try:
             response = self.peer_gs.save_grade(location, grader_id, submission_id,
-                score, feedback, submission_key, rubric_scores, submission_flagged)
+                                               score, feedback, submission_key, rubric_scores, submission_flagged)
             return response
         except GradingServiceError:
             #This is a dev_facing_error
             log.exception("""Error saving grade to open ended grading service.  server url: {0}, location: {1}, submission_id:{2},
                             submission_key: {3}, score: {4}"""
             .format(self.peer_gs.url,
-                location, submission_id, submission_key, score)
+                    location, submission_id, submission_key, score)
             )
             #This is a student_facing_error
             return {
@@ -382,7 +375,7 @@ class PeerGradingModule(XModule):
             .format(self.peer_gs.url, location))
             #This is a student_facing_error
             return {'success': False,
-                               'error': EXTERNAL_GRADER_NO_CONTACT_ERROR}
+                    'error': EXTERNAL_GRADER_NO_CONTACT_ERROR}
         # if we can't parse the rubric into HTML,
         except etree.XMLSyntaxError:
             #This is a dev_facing_error
@@ -390,7 +383,7 @@ class PeerGradingModule(XModule):
             .format(rubric))
             #This is a student_facing_error
             return {'success': False,
-                               'error': 'Error displaying submission.  Please notify course staff.'}
+                    'error': 'Error displaying submission.  Please notify course staff.'}
 
 
     def save_calibration_essay(self, get):
@@ -426,11 +419,13 @@ class PeerGradingModule(XModule):
 
         try:
             response = self.peer_gs.save_calibration_essay(location, grader_id, calibration_essay_id,
-                submission_key, score, feedback, rubric_scores)
+                                                           submission_key, score, feedback, rubric_scores)
             return response
         except GradingServiceError:
             #This is a dev_facing_error
-            log.exception("Error saving calibration grade, location: {0}, submission_id: {1}, submission_key: {2}, grader_id: {3}".format(location, submission_id, submission_key, grader_id))
+            log.exception(
+                "Error saving calibration grade, location: {0}, submission_id: {1}, submission_key: {2}, grader_id: {3}".format(
+                    location, submission_id, submission_key, grader_id))
             #This is a student_facing_error
             return self._err_response('There was an error saving your score.  Please notify course staff.')
 
@@ -440,7 +435,7 @@ class PeerGradingModule(XModule):
         '''
         html = self.system.render_template('peer_grading/peer_grading_closed.html', {
             'use_for_single_location': self.use_for_single_location
-            })
+        })
         return html
 
 
@@ -465,11 +460,13 @@ class PeerGradingModule(XModule):
         except GradingServiceError:
             #This is a student_facing_error
             error_text = EXTERNAL_GRADER_NO_CONTACT_ERROR
+            log.error(error_text)
             success = False
         # catch error if if the json loads fails
         except ValueError:
             #This is a student_facing_error
             error_text = "Could not get list of problems to peer grade.  Please notify course staff."
+            log.error(error_text)
             success = False
         except:
             log.exception("Could not contact peer grading service.")
@@ -492,8 +489,8 @@ class PeerGradingModule(XModule):
             problem_location = problem['location']
             descriptor = _find_corresponding_module_for_location(problem_location)
             if descriptor:
-                problem['due'] = descriptor.metadata.get('peer_grading_due', None)
-                grace_period_string = descriptor.metadata.get('graceperiod', None)
+                problem['due'] = descriptor._model_data.get('peer_grading_due', None)
+                grace_period_string = descriptor._model_data.get('graceperiod', None)
                 try:
                     problem_timeinfo = TimeInfo(problem['due'], grace_period_string)
                 except:
@@ -503,12 +500,11 @@ class PeerGradingModule(XModule):
                     problem['closed'] = True
                 else:
                     problem['closed'] = False
-            else: 
+            else:
                 # if we can't find the due date, assume that it doesn't have one
                 problem['due'] = None
                 problem['closed'] = False
 
-
         ajax_url = self.ajax_url
         html = self.system.render_template('peer_grading/peer_grading.html', {
             'course_id': self.system.course_id,
@@ -519,7 +515,7 @@ class PeerGradingModule(XModule):
             # Checked above
             'staff_access': False,
             'use_single_location': self.use_for_single_location,
-            })
+        })
 
         return html
 
@@ -528,10 +524,11 @@ class PeerGradingModule(XModule):
         Show individual problem interface
         '''
         if get is None or get.get('location') is None:
-            if not self.use_for_single_location:
+            if self.use_for_single_location not in TRUE_DICT:
                 #This is an error case, because it must be set to use a single location to be called without get parameters
                 #This is a dev_facing_error
-                log.error("Peer grading problem in peer_grading_module called with no get parameters, but use_for_single_location is False.")
+                log.error(
+                    "Peer grading problem in peer_grading_module called with no get parameters, but use_for_single_location is False.")
                 return {'html': "", 'success': False}
             problem_location = self.link_to_location
 
@@ -547,7 +544,7 @@ class PeerGradingModule(XModule):
             # Checked above
             'staff_access': False,
             'use_single_location': self.use_for_single_location,
-            })
+        })
 
         return {'html': html, 'success': True}
 
@@ -560,14 +557,14 @@ class PeerGradingModule(XModule):
 
         state = {
             'student_data_for_location': self.student_data_for_location,
-            }
+        }
 
         return json.dumps(state)
 
 
-class PeerGradingDescriptor(XmlDescriptor, EditingDescriptor):
+class PeerGradingDescriptor(PeerGradingFields, RawDescriptor):
     """
-    Module for adding combined open ended questions
+    Module for adding peer grading questions
     """
     mako_template = "widgets/raw-edit.html"
     module_class = PeerGradingModule
@@ -576,40 +573,3 @@ class PeerGradingDescriptor(XmlDescriptor, EditingDescriptor):
     stores_state = True
     has_score = True
     template_dir_name = "peer_grading"
-
-    js = {'coffee': [resource_string(__name__, 'js/src/html/edit.coffee')]}
-    js_module_name = "HTMLEditingDescriptor"
-
-    @classmethod
-    def definition_from_xml(cls, xml_object, system):
-        """
-        Pull out the individual tasks, the rubric, and the prompt, and parse
-
-        Returns:
-        {
-        'rubric': 'some-html',
-        'prompt': 'some-html',
-        'task_xml': dictionary of xml strings,
-        }
-        """
-        expected_children = []
-        for child in expected_children:
-            if len(xml_object.xpath(child)) == 0:
-                #This is a staff_facing_error
-                raise ValueError("Peer grading definition must include at least one '{0}' tag.  Contact the learning sciences group for assistance.".format(child))
-
-        def parse_task(k):
-            """Assumes that xml_object has child k"""
-            return [stringify_children(xml_object.xpath(k)[i]) for i in xrange(0, len(xml_object.xpath(k)))]
-
-        def parse(k):
-            """Assumes that xml_object has child k"""
-            return xml_object.xpath(k)[0]
-
-        return {}
-
-
-    def definition_to_xml(self, resource_fs):
-        '''Return an xml element representing this definition.'''
-        elt = etree.Element('peergrading')
-        return elt
diff --git a/common/lib/xmodule/xmodule/plugin.py b/common/lib/xmodule/xmodule/plugin.py
new file mode 100644
index 0000000000..5cf9c647aa
--- /dev/null
+++ b/common/lib/xmodule/xmodule/plugin.py
@@ -0,0 +1,64 @@
+import pkg_resources
+import logging
+
+log = logging.getLogger(__name__)
+
+class PluginNotFoundError(Exception):
+    pass
+
+
+class Plugin(object):
+    """
+    Base class for a system that uses entry_points to load plugins.
+
+    Implementing classes are expected to have the following attributes:
+
+        entry_point: The name of the entry point to load plugins from
+    """
+
+    _plugin_cache = None
+
+    @classmethod
+    def load_class(cls, identifier, default=None):
+        """
+        Loads a single class instance specified by identifier. If identifier
+        specifies more than a single class, then logs a warning and returns the
+        first class identified.
+
+        If default is not None, will return default if no entry_point matching
+        identifier is found. Otherwise, will raise a ModuleMissingError
+        """
+        if cls._plugin_cache is None:
+            cls._plugin_cache = {}
+
+        if identifier not in cls._plugin_cache:
+            identifier = identifier.lower()
+            classes = list(pkg_resources.iter_entry_points(
+                    cls.entry_point, name=identifier))
+
+            if len(classes) > 1:
+                log.warning("Found multiple classes for {entry_point} with "
+                            "identifier {id}: {classes}. "
+                            "Returning the first one.".format(
+                    entry_point=cls.entry_point,
+                    id=identifier,
+                    classes=", ".join(
+                            class_.module_name for class_ in classes)))
+
+            if len(classes) == 0:
+                if default is not None:
+                    return default
+                raise PluginNotFoundError(identifier)
+
+            cls._plugin_cache[identifier] = classes[0].load()
+        return cls._plugin_cache[identifier]
+
+    @classmethod
+    def load_classes(cls):
+        """
+        Returns a list of containing the identifiers and their corresponding classes for all
+        of the available instances of this plugin
+        """
+        return [(class_.name, class_.load())
+                for class_
+                in pkg_resources.iter_entry_points(cls.entry_point)]
diff --git a/common/lib/xmodule/xmodule/poll_module.py b/common/lib/xmodule/xmodule/poll_module.py
new file mode 100644
index 0000000000..0fb3bfb496
--- /dev/null
+++ b/common/lib/xmodule/xmodule/poll_module.py
@@ -0,0 +1,205 @@
+"""Poll module is ungraded xmodule used by students to
+to do set of polls.
+
+On the client side we show:
+If student does not yet anwered - Question with set of choices.
+If student have answered - Question with statistics for each answers.
+
+Student can't change his answer.
+"""
+
+import cgi
+import json
+import logging
+from copy import deepcopy
+from collections import OrderedDict
+
+from lxml import etree
+from pkg_resources import resource_string
+
+from xmodule.x_module import XModule
+from xmodule.stringify import stringify_children
+from xmodule.mako_module import MakoModuleDescriptor
+from xmodule.xml_module import XmlDescriptor
+from xblock.core import Scope, String, Object, Boolean, List
+
+log = logging.getLogger(__name__)
+
+
+class PollFields(object):
+    # Name of poll to use in links to this poll
+    display_name = String(help="Display name for this module", scope=Scope.settings)
+
+    voted = Boolean(help="Whether this student has voted on the poll", scope=Scope.student_state, default=False)
+    poll_answer = String(help="Student answer", scope=Scope.student_state, default='')
+    poll_answers = Object(help="All possible answers for the poll fro other students", scope=Scope.content)
+
+    answers = List(help="Poll answers from xml", scope=Scope.content, default=[])
+    question = String(help="Poll question", scope=Scope.content, default='')
+
+
+class PollModule(PollFields, XModule):
+    """Poll Module"""
+    js = {
+      'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee')],
+      'js': [resource_string(__name__, 'js/src/poll/logme.js'),
+             resource_string(__name__, 'js/src/poll/poll.js'),
+             resource_string(__name__, 'js/src/poll/poll_main.js')]
+         }
+    css = {'scss': [resource_string(__name__, 'css/poll/display.scss')]}
+    js_module_name = "Poll"
+
+    def handle_ajax(self, dispatch, get):
+        """Ajax handler.
+
+        Args:
+            dispatch: string request slug
+            get: dict request get parameters
+
+        Returns:
+            json string
+        """
+        if dispatch in self.poll_answers and not self.voted:
+            # FIXME: fix this, when xblock will support mutable types.
+            # Now we use this hack.
+            temp_poll_answers = self.poll_answers
+            temp_poll_answers[dispatch] += 1
+            self.poll_answers = temp_poll_answers
+
+            self.voted = True
+            self.poll_answer = dispatch
+            return json.dumps({'poll_answers': self.poll_answers,
+                               'total': sum(self.poll_answers.values()),
+                               'callback': {'objectName': 'Conditional'}
+                               })
+        elif dispatch == 'get_state':
+            return json.dumps({'poll_answer': self.poll_answer,
+                               'poll_answers': self.poll_answers,
+                               'total': sum(self.poll_answers.values())
+                               })
+        elif dispatch == 'reset_poll' and self.voted and \
+                self.descriptor.xml_attributes.get('reset', 'True').lower() != 'false':
+            self.voted = False
+
+            # FIXME: fix this, when xblock will support mutable types.
+            # Now we use this hack.
+            temp_poll_answers = self.poll_answers
+            temp_poll_answers[self.poll_answer] -= 1
+            self.poll_answers = temp_poll_answers
+
+            self.poll_answer = ''
+            return json.dumps({'status': 'success'})
+        else:  # return error message
+            return json.dumps({'error': 'Unknown Command!'})
+
+    def get_html(self):
+        """Renders parameters to template."""
+        params = {
+                  'element_id': self.location.html_id(),
+                  'element_class': self.location.category,
+                  'ajax_url': self.system.ajax_url,
+                  'configuration_json': self.dump_poll(),
+                  }
+        self.content = self.system.render_template('poll.html', params)
+        return self.content
+
+    def dump_poll(self):
+        """Dump poll information.
+
+        Returns:
+            string - Serialize json.
+        """
+        # FIXME: hack for resolving caching `default={}` during definition
+        # poll_answers field
+        if self.poll_answers is None:
+            self.poll_answers = {}
+
+        answers_to_json = OrderedDict()
+
+        # FIXME: fix this, when xblock support mutable types.
+        # Now we use this hack.
+        temp_poll_answers = self.poll_answers
+
+         # Fill self.poll_answers, prepare data for template context.
+        for answer in self.answers:
+            # Set default count for answer = 0.
+            if answer['id'] not in temp_poll_answers:
+                temp_poll_answers[answer['id']] = 0
+            answers_to_json[answer['id']] = cgi.escape(answer['text'])
+        self.poll_answers = temp_poll_answers
+
+        return json.dumps({'answers': answers_to_json,
+            'question': cgi.escape(self.question),
+            # to show answered poll after reload:
+            'poll_answer': self.poll_answer,
+            'poll_answers': self.poll_answers if self.voted else {},
+            'total': sum(self.poll_answers.values()) if self.voted else 0,
+            'reset': str(self.descriptor.xml_attributes.get('reset', 'true')).lower()})
+
+
+class PollDescriptor(PollFields, MakoModuleDescriptor, XmlDescriptor):
+    _tag_name = 'poll_question'
+    _child_tag_name = 'answer'
+
+    module_class = PollModule
+    template_dir_name = 'poll'
+    stores_state = True
+
+    @classmethod
+    def definition_from_xml(cls, xml_object, system):
+        """Pull out the data into dictionary.
+
+        Args:
+            xml_object: xml from file.
+            system: `system` object.
+
+        Returns:
+            (definition, children) - tuple
+            definition - dict:
+                {
+                    'answers': <List of answers>,
+                    'question': <Question string>
+                }
+        """
+        # Check for presense of required tags in xml.
+        if len(xml_object.xpath(cls._child_tag_name)) == 0:
+            raise ValueError("Poll_question definition must include \
+                at least one 'answer' tag")
+
+        xml_object_copy = deepcopy(xml_object)
+        answers = []
+        for element_answer in xml_object_copy.findall(cls._child_tag_name):
+            answer_id = element_answer.get('id', None)
+            if answer_id:
+                answers.append({
+                    'id': answer_id,
+                    'text': stringify_children(element_answer)
+                })
+            xml_object_copy.remove(element_answer)
+
+        definition = {
+            'answers': answers,
+            'question': stringify_children(xml_object_copy)
+        }
+        children = []
+
+        return (definition, children)
+
+    def definition_to_xml(self, resource_fs):
+        """Return an xml element representing to this definition."""
+        poll_str = '<{tag_name}>{text}</{tag_name}>'.format(
+            tag_name=self._tag_name, text=self.question)
+        xml_object = etree.fromstring(poll_str)
+        xml_object.set('display_name', self.display_name)
+
+        def add_child(xml_obj, answer):
+            child_str = '<{tag_name} id="{id}">{text}</{tag_name}>'.format(
+                tag_name=self._child_tag_name, id=answer['id'],
+                text=answer['text'])
+            child_node = etree.fromstring(child_str)
+            xml_object.append(child_node)
+
+        for answer in self.answers:
+            add_child(xml_object, answer)
+
+        return xml_object
diff --git a/common/lib/xmodule/xmodule/randomize_module.py b/common/lib/xmodule/xmodule/randomize_module.py
index b336789193..6620ab3cf7 100644
--- a/common/lib/xmodule/xmodule/randomize_module.py
+++ b/common/lib/xmodule/xmodule/randomize_module.py
@@ -1,19 +1,19 @@
-import json
 import logging
 import random
 
-from xmodule.mako_module import MakoModuleDescriptor
 from xmodule.x_module import XModule
-from xmodule.xml_module import XmlDescriptor
-from xmodule.modulestore import Location
 from xmodule.seq_module import SequenceDescriptor
 
-from pkg_resources import resource_string
+from xblock.core import Scope, Integer
 
 log = logging.getLogger('mitx.' + __name__)
 
 
-class RandomizeModule(XModule):
+class RandomizeFields(object):
+    choice = Integer(help="Which random child was chosen", scope=Scope.student_state)
+
+
+class RandomizeModule(RandomizeFields, XModule):
     """
     Chooses a random child module.  Chooses the same one every time for each student.
 
@@ -35,30 +35,23 @@ class RandomizeModule(XModule):
         grading interaction is a tangle between super and subclasses of descriptors and
         modules.
 """
-
-    def __init__(self, system, location, definition, descriptor,
-                 instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor,
-                         instance_state, shared_state, **kwargs)
+    def __init__(self, *args, **kwargs):
+        XModule.__init__(self, *args, **kwargs)
 
         # NOTE: calling self.get_children() creates a circular reference--
         # it calls get_child_descriptors() internally, but that doesn't work until
         # we've picked a choice
         num_choices = len(self.descriptor.get_children())
 
-        self.choice = None
-        if instance_state is not None:
-            state = json.loads(instance_state)
-            self.choice = state.get('choice', None)
-            if self.choice > num_choices:
-                # Oops.  Children changed. Reset.
-                self.choice = None
+        if self.choice > num_choices:
+            # Oops.  Children changed. Reset.
+            self.choice = None
 
         if self.choice is None:
             # choose one based on the system seed, or randomly if that's not available
             if num_choices > 0:
-                if system.seed is not None:
-                    self.choice = system.seed % num_choices
+                if self.system.seed is not None:
+                    self.choice = self.system.seed % num_choices
                 else:
                     self.choice = random.randrange(0, num_choices)
 
@@ -72,11 +65,6 @@ class RandomizeModule(XModule):
             self.child_descriptor = None
             self.child = None
 
-
-    def get_instance_state(self):
-        return json.dumps({'choice': self.choice})
-
-
     def get_child_descriptors(self):
         """
         For grading--return just the chosen child.
@@ -98,7 +86,7 @@ class RandomizeModule(XModule):
         return self.child.get_icon_class() if self.child else 'other'
 
 
-class RandomizeDescriptor(SequenceDescriptor):
+class RandomizeDescriptor(RandomizeFields, SequenceDescriptor):
     # the editing interface can be the same as for sequences -- just a container
     module_class = RandomizeModule
 
@@ -107,6 +95,7 @@ class RandomizeDescriptor(SequenceDescriptor):
     stores_state = True
 
     def definition_to_xml(self, resource_fs):
+
         xml_object = etree.Element('randomize')
         for child in self.get_children():
             xml_object.append(
diff --git a/common/lib/xmodule/xmodule/raw_module.py b/common/lib/xmodule/xmodule/raw_module.py
index 4a2bfbceaf..2c6e157018 100644
--- a/common/lib/xmodule/xmodule/raw_module.py
+++ b/common/lib/xmodule/xmodule/raw_module.py
@@ -3,6 +3,7 @@ from xmodule.editing_module import XMLEditingDescriptor
 from xmodule.xml_module import XmlDescriptor
 import logging
 import sys
+from xblock.core import String, Scope
 
 log = logging.getLogger(__name__)
 
@@ -12,17 +13,19 @@ class RawDescriptor(XmlDescriptor, XMLEditingDescriptor):
     Module that provides a raw editing view of its data and children.  It
     requires that the definition xml is valid.
     """
+    data = String(help="XML data for the module", scope=Scope.content)
+
     @classmethod
     def definition_from_xml(cls, xml_object, system):
-        return {'data': etree.tostring(xml_object, pretty_print=True, encoding='unicode')}
+        return {'data': etree.tostring(xml_object, pretty_print=True, encoding='unicode')}, []
 
     def definition_to_xml(self, resource_fs):
         try:
-            return etree.fromstring(self.definition['data'])
+            return etree.fromstring(self.data)
         except etree.XMLSyntaxError as err:
             # Can't recover here, so just add some info and
             # re-raise
-            lines = self.definition['data'].split('\n')
+            lines = self.data.split('\n')
             line, offset = err.position
             msg = ("Unable to create xml for problem {loc}. "
                    "Context: '{context}'".format(
diff --git a/common/lib/xmodule/xmodule/schematic_module.py b/common/lib/xmodule/xmodule/schematic_module.py
index 21dd33a897..d15d629c24 100644
--- a/common/lib/xmodule/xmodule/schematic_module.py
+++ b/common/lib/xmodule/xmodule/schematic_module.py
@@ -1,6 +1,6 @@
 import json
 
-from x_module import XModule, XModuleDescriptor
+from .x_module import XModule, XModuleDescriptor
 
 
 class ModuleDescriptor(XModuleDescriptor):
diff --git a/common/lib/xmodule/xmodule/seq_module.py b/common/lib/xmodule/xmodule/seq_module.py
index 36011744f5..f8e982f1a0 100644
--- a/common/lib/xmodule/xmodule/seq_module.py
+++ b/common/lib/xmodule/xmodule/seq_module.py
@@ -8,6 +8,7 @@ from xmodule.xml_module import XmlDescriptor
 from xmodule.x_module import XModule
 from xmodule.progress import Progress
 from xmodule.exceptions import NotFoundError
+from xblock.core import Integer, Scope
 from pkg_resources import resource_string
 
 log = logging.getLogger(__name__)
@@ -17,7 +18,15 @@ log = logging.getLogger(__name__)
 class_priority = ['video', 'problem']
 
 
-class SequenceModule(XModule):
+class SequenceFields(object):
+    has_children = True
+
+    # NOTE: Position is 1-indexed.  This is silly, but there are now student
+    # positions saved on prod, so it's not easy to fix.
+    position = Integer(help="Last tab viewed in this sequence", scope=Scope.student_state)
+
+
+class SequenceModule(SequenceFields, XModule):
     ''' Layout module which lays out content in a temporal sequence
     '''
     js = {'coffee': [resource_string(__name__,
@@ -26,22 +35,13 @@ class SequenceModule(XModule):
     css = {'scss': [resource_string(__name__, 'css/sequence/display.scss')]}
     js_module_name = "Sequence"
 
-    def __init__(self, system, location, definition, descriptor, instance_state=None,
-                 shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor,
-                         instance_state, shared_state, **kwargs)
-        # NOTE: Position is 1-indexed.  This is silly, but there are now student
-        # positions saved on prod, so it's not easy to fix.
-        self.position = 1
 
-        if instance_state is not None:
-            state = json.loads(instance_state)
-            if 'position' in state:
-                self.position = int(state['position'])
+    def __init__(self, *args, **kwargs):
+        XModule.__init__(self, *args, **kwargs)
 
         # if position is specified in system, then use that instead
-        if system.get('position'):
-            self.position = int(system.get('position'))
+        if self.system.get('position'):
+            self.position = int(self.system.get('position'))
 
         self.rendered = False
 
@@ -70,6 +70,11 @@ class SequenceModule(XModule):
         raise NotFoundError('Unexpected dispatch type')
 
     def render(self):
+        # 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
@@ -79,9 +84,9 @@ class SequenceModule(XModule):
             childinfo = {
                 'content': child.get_html(),
                 'title': "\n".join(
-                    grand_child.display_name.strip()
+                    grand_child.display_name
                     for grand_child in child.get_children()
-                    if 'display_name'  in grand_child.metadata
+                    if grand_child.display_name is not None
                 ),
                 'progress_status': Progress.to_js_status_str(progress),
                 'progress_detail': Progress.to_js_detail_str(progress),
@@ -89,7 +94,7 @@ class SequenceModule(XModule):
                 'id': child.id,
             }
             if childinfo['title'] == '':
-                childinfo['title'] = child.metadata.get('display_name', '')
+                childinfo['title'] = child.display_name_with_default
             contents.append(childinfo)
 
         params = {'items': contents,
@@ -112,11 +117,11 @@ class SequenceModule(XModule):
         return new_class
 
 
-class SequenceDescriptor(MakoModuleDescriptor, XmlDescriptor):
+class SequenceDescriptor(SequenceFields, MakoModuleDescriptor, XmlDescriptor):
     mako_template = 'widgets/sequence-edit.html'
     module_class = SequenceModule
 
-    stores_state = True   # For remembering where in the sequence the student is
+    stores_state = True  # For remembering where in the sequence the student is
 
     js = {'coffee': [resource_string(__name__, 'js/src/sequence/edit.coffee')]}
     js_module_name = "SequenceDescriptor"
@@ -132,7 +137,7 @@ class SequenceDescriptor(MakoModuleDescriptor, XmlDescriptor):
                 if system.error_tracker is not None:
                     system.error_tracker("ERROR: " + str(e))
                 continue
-        return {'children': children}
+        return {}, children
 
     def definition_to_xml(self, resource_fs):
         xml_object = etree.Element('sequential')
diff --git a/common/lib/xmodule/xmodule/stringify.py b/common/lib/xmodule/xmodule/stringify.py
index 5a640e91b1..35587d3b09 100644
--- a/common/lib/xmodule/xmodule/stringify.py
+++ b/common/lib/xmodule/xmodule/stringify.py
@@ -1,4 +1,5 @@
-from itertools import chain
+# -*- coding: utf-8 -*-
+
 from lxml import etree
 
 
diff --git a/common/lib/xmodule/xmodule/template_module.py b/common/lib/xmodule/xmodule/template_module.py
index 5f376945eb..d79d2a163e 100644
--- a/common/lib/xmodule/xmodule/template_module.py
+++ b/common/lib/xmodule/xmodule/template_module.py
@@ -28,11 +28,6 @@ class CustomTagModule(XModule):
         More information given in <a href="/book/234">the text</a>
     """
 
-    def __init__(self, system, location, definition, descriptor,
-                 instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor,
-                         instance_state, shared_state, **kwargs)
-
     def get_html(self):
         return self.descriptor.rendered_html
 
@@ -62,19 +57,15 @@ class CustomTagDescriptor(RawDescriptor):
         # cdodge: look up the template as a module
         template_loc = self.location._replace(category='custom_tag_template', name=template_name)
 
-        template_module = self.system.load_item(template_loc)
-        template_module_data = template_module.definition['data']
+        template_module = modulestore().get_instance(system.course_id, template_loc)
+        template_module_data = template_module.data
         template = Template(template_module_data)
         return template.render(**params)
 
 
-    def __init__(self, system, definition, **kwargs):
-        '''Render and save the template for this descriptor instance'''
-        super(CustomTagDescriptor, self).__init__(system, definition, **kwargs)
-
     @property
     def rendered_html(self):
-        return self.render_template(self.system, self.definition['data'])
+        return self.render_template(self.system, self.data)
 
     def export_to_file(self):
         """
diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py
index 43c2bbe24d..1a10654f6c 100644
--- a/common/lib/xmodule/xmodule/tests/__init__.py
+++ b/common/lib/xmodule/xmodule/tests/__init__.py
@@ -54,6 +54,7 @@ def test_system():
         debug=True,
         xqueue={'interface': None, 'callback_url': '/', 'default_queuename': 'testqueue', 'waittime': 10},
         node_path=os.environ.get("NODE_PATH", "/usr/local/lib/node_modules"),
+        xblock_model_data=lambda descriptor: descriptor._model_data,
         anonymous_student_id='student',
         open_ended_grading_interface= open_ended_grading_interface
     )
diff --git a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py
index 30f9c9ff92..43eae8e43e 100644
--- a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py
@@ -28,13 +28,11 @@ class AnnotatableModuleTestCase(unittest.TestCase):
             <annotation title="footnote" body="the end">The Iliad of Homer by Samuel Butler</annotation>
         </annotatable>
     '''
-    definition = { 'data': sample_xml }
     descriptor = Mock()
-    instance_state = None
-    shared_state = None
+    module_data = {'data': sample_xml}
 
     def setUp(self):
-        self.annotatable = AnnotatableModule(test_system(), self.location, self.definition, self.descriptor, self.instance_state, self.shared_state)
+        self.annotatable = AnnotatableModule(test_system(), self.location, self.descriptor, self.module_data)
 
     def test_annotation_data_attr(self):
         el = etree.fromstring('<annotation title="bar" body="foo" problem="0">test</annotation>')
diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py
index cb77921957..d2458cb3d0 100644
--- a/common/lib/xmodule/xmodule/tests/test_capa_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py
@@ -59,7 +59,8 @@ class CapaFactory(object):
                force_save_button=None,
                attempts=None,
                problem_state=None,
-               correct=False
+               correct=False,
+               done=None
                ):
         """
         All parameters are optional, and are added to the created problem if specified.
@@ -77,48 +78,42 @@ class CapaFactory(object):
 
             attempts: also added to instance state.  Will be converted to an int.
         """
-        definition = {'data': CapaFactory.sample_problem_xml, }
         location = Location(["i4x", "edX", "capa_test", "problem",
-                             "SampleProblem%d" % CapaFactory.next_num()])
-        metadata = {}
-        if graceperiod is not None:
-            metadata['graceperiod'] = graceperiod
-        if due is not None:
-            metadata['due'] = due
-        if max_attempts is not None:
-            metadata['attempts'] = max_attempts
-        if showanswer is not None:
-            metadata['showanswer'] = showanswer
-        if force_save_button is not None:
-            metadata['force_save_button'] = force_save_button
-        if rerandomize is not None:
-            metadata['rerandomize'] = rerandomize
+                             "SampleProblem{0}".format(CapaFactory.next_num())])
+        model_data = {'data': CapaFactory.sample_problem_xml}
 
+        if graceperiod is not None:
+            model_data['graceperiod'] = graceperiod
+        if due is not None:
+            model_data['due'] = due
+        if max_attempts is not None:
+            model_data['max_attempts'] = max_attempts
+        if showanswer is not None:
+            model_data['showanswer'] = showanswer
+        if force_save_button is not None:
+            model_data['force_save_button'] = force_save_button
+        if rerandomize is not None:
+            model_data['rerandomize'] = rerandomize
+        if done is not None:
+            model_data['done'] = done
 
         descriptor = Mock(weight="1")
-        instance_state_dict = {}
         if problem_state is not None:
-            instance_state_dict = problem_state
-
+            model_data.update(problem_state)
         if attempts is not None:
             # converting to int here because I keep putting "0" and "1" in the tests
             # since everything else is a string.
-            instance_state_dict['attempts'] = int(attempts)
-
-        if len(instance_state_dict) > 0:
-            instance_state = json.dumps(instance_state_dict)
-        else:
-            instance_state = None
+            model_data['attempts'] = int(attempts)
 
         system = test_system()
         system.render_template = Mock(return_value="<div>Test Template HTML</div>")
-        module = CapaModule(system, location,
-                            definition, descriptor,
-                                      instance_state, None, metadata=metadata)
+        module = CapaModule(system, location, descriptor, model_data)
 
         if correct:
             # TODO: probably better to actually set the internal state properly, but...
             module.get_score = lambda: {'score': 1, 'total': 1}
+        else:
+            module.get_score = lambda: {'score': 0, 'total': 1}
 
         return module
 
@@ -356,7 +351,7 @@ class CapaModuleTest(unittest.TestCase):
         valid_get_dict = self._querydict_from_dict({'input_2[]': ['test1', 'test2']})
         result = CapaModule.make_dict_of_responses(valid_get_dict)
         self.assertTrue('2' in result)
-        self.assertEqual(['test1','test2'], result['2'])
+        self.assertEqual(['test1', 'test2'], result['2'])
 
         # If we use [] at the end of a key name, we should always
         # get a list, even if there's just one value
@@ -374,7 +369,7 @@ class CapaModuleTest(unittest.TestCase):
         # One of the values would overwrite the other, so detect this
         # and raise an exception
         invalid_get_dict = self._querydict_from_dict({'input_1[]': 'test 1',
-                                                    'input_1': 'test 2' })
+                                                    'input_1': 'test 2'})
         with self.assertRaises(ValueError):
             result = CapaModule.make_dict_of_responses(invalid_get_dict)
 
@@ -412,7 +407,7 @@ class CapaModuleTest(unittest.TestCase):
             mock_html.return_value = "Test HTML"
 
             # Check the problem
-            get_request_dict = { CapaFactory.input_key(): '3.14' }
+            get_request_dict = { CapaFactory.input_key(): '3.14'}
             result = module.check_problem(get_request_dict)
 
         # Expect that the problem is marked correct
@@ -424,7 +419,6 @@ class CapaModuleTest(unittest.TestCase):
         # Expect that the number of attempts is incremented by 1
         self.assertEqual(module.attempts, 2)
 
-
     def test_check_problem_incorrect(self):
 
         module = CapaFactory.create(attempts=0)
@@ -434,7 +428,7 @@ class CapaModuleTest(unittest.TestCase):
             mock_is_correct.return_value = False
 
             # Check the problem
-            get_request_dict = { CapaFactory.input_key(): '0' }
+            get_request_dict = { CapaFactory.input_key(): '0'}
             result = module.check_problem(get_request_dict)
 
         # Expect that the problem is marked correct
@@ -452,38 +446,33 @@ class CapaModuleTest(unittest.TestCase):
         with patch('xmodule.capa_module.CapaModule.closed') as mock_closed:
             mock_closed.return_value = True
             with self.assertRaises(xmodule.exceptions.NotFoundError):
-                get_request_dict = { CapaFactory.input_key(): '3.14' }
+                get_request_dict = { CapaFactory.input_key(): '3.14'}
                 module.check_problem(get_request_dict)
 
         # Expect that number of attempts NOT incremented
         self.assertEqual(module.attempts, 3)
 
-
     def test_check_problem_resubmitted_with_randomize(self):
         # Randomize turned on
         module = CapaFactory.create(rerandomize='always', attempts=0)
 
         # Simulate that the problem is completed
-        module.lcp.done = True
+        module.done = True
 
         # Expect that we cannot submit
         with self.assertRaises(xmodule.exceptions.NotFoundError):
-            get_request_dict = { CapaFactory.input_key(): '3.14' }
+            get_request_dict = {CapaFactory.input_key(): '3.14'}
             module.check_problem(get_request_dict)
 
         # Expect that number of attempts NOT incremented
         self.assertEqual(module.attempts, 0)
 
-
     def test_check_problem_resubmitted_no_randomize(self):
         # Randomize turned off
-        module = CapaFactory.create(rerandomize='never', attempts=0)
-
-        # Simulate that the problem is completed
-        module.lcp.done = True
+        module = CapaFactory.create(rerandomize='never', attempts=0, done=True)
 
         # Expect that we can submit successfully
-        get_request_dict = { CapaFactory.input_key(): '3.14' }
+        get_request_dict = {CapaFactory.input_key(): '3.14'}
         result = module.check_problem(get_request_dict)
 
         self.assertEqual(result['success'], 'correct')
@@ -491,7 +480,6 @@ class CapaModuleTest(unittest.TestCase):
         # Expect that number of attempts IS incremented
         self.assertEqual(module.attempts, 1)
 
-
     def test_check_problem_queued(self):
         module = CapaFactory.create(attempts=1)
 
@@ -504,7 +492,7 @@ class CapaModuleTest(unittest.TestCase):
             mock_is_queued.return_value = True
             mock_get_queuetime.return_value = datetime.datetime.now()
 
-            get_request_dict = { CapaFactory.input_key(): '3.14' }
+            get_request_dict = { CapaFactory.input_key(): '3.14'}
             result = module.check_problem(get_request_dict)
 
             # Expect an AJAX alert message in 'success'
@@ -521,7 +509,7 @@ class CapaModuleTest(unittest.TestCase):
         with patch('capa.capa_problem.LoncapaProblem.grade_answers') as mock_grade:
             mock_grade.side_effect = capa.responsetypes.StudentInputError('test error')
 
-            get_request_dict = { CapaFactory.input_key(): '3.14' }
+            get_request_dict = { CapaFactory.input_key(): '3.14'}
             result = module.check_problem(get_request_dict)
 
             # Expect an AJAX alert message in 'success'
@@ -532,13 +520,8 @@ class CapaModuleTest(unittest.TestCase):
 
 
     def test_reset_problem(self):
-        module = CapaFactory.create()
-
-        # Mock the module's capa problem
-        # to simulate that the problem is done
-        mock_problem = MagicMock(capa.capa_problem.LoncapaProblem)
-        mock_problem.done = True
-        module.lcp = mock_problem
+        module = CapaFactory.create(done=True)
+        module.new_lcp = Mock(wraps=module.new_lcp)
 
         # Stub out HTML rendering
         with patch('xmodule.capa_module.CapaModule.get_problem_html') as mock_html:
@@ -556,7 +539,7 @@ class CapaModuleTest(unittest.TestCase):
         self.assertEqual(result['html'], "<div>Test HTML</div>")
 
         # Expect that the problem was reset
-        mock_problem.do_reset.assert_called_once_with()
+        module.new_lcp.assert_called_once_with({'seed': None})
 
 
     def test_reset_problem_closed(self):
@@ -575,10 +558,8 @@ class CapaModuleTest(unittest.TestCase):
 
 
     def test_reset_problem_not_done(self):
-        module = CapaFactory.create()
-
         # Simulate that the problem is NOT done
-        module.lcp.done = False
+        module = CapaFactory.create(done=False)
 
         # Try to reset the problem
         get_request_dict = {}
@@ -589,17 +570,14 @@ class CapaModuleTest(unittest.TestCase):
 
 
     def test_save_problem(self):
-        module = CapaFactory.create()
-
-        # Simulate that the problem is not done (not attempted or reset)
-        module.lcp.done = False
+        module = CapaFactory.create(done=False)
 
         # Save the problem
-        get_request_dict = { CapaFactory.input_key(): '3.14' }
+        get_request_dict = { CapaFactory.input_key(): '3.14'}
         result = module.save_problem(get_request_dict)
 
         # Expect that answers are saved to the problem
-        expected_answers = { CapaFactory.answer_key(): '3.14' }
+        expected_answers = { CapaFactory.answer_key(): '3.14'}
         self.assertEqual(module.lcp.student_answers, expected_answers)
 
         # Expect that the result is success
@@ -607,17 +585,14 @@ class CapaModuleTest(unittest.TestCase):
 
 
     def test_save_problem_closed(self):
-        module = CapaFactory.create()
-
-        # Simulate that the problem is NOT done (not attempted or reset)
-        module.lcp.done = False
+        module = CapaFactory.create(done=False)
 
         # Simulate that the problem is closed
         with patch('xmodule.capa_module.CapaModule.closed') as mock_closed:
             mock_closed.return_value = True
 
             # Try to save the problem
-            get_request_dict = { CapaFactory.input_key(): '3.14' }
+            get_request_dict = { CapaFactory.input_key(): '3.14'}
             result = module.save_problem(get_request_dict)
 
         # Expect that the result is failure
@@ -625,13 +600,10 @@ class CapaModuleTest(unittest.TestCase):
 
 
     def test_save_problem_submitted_with_randomize(self):
-        module = CapaFactory.create(rerandomize='always')
-
-        # Simulate that the problem is completed
-        module.lcp.done = True
+        module = CapaFactory.create(rerandomize='always', done=True)
 
         # Try to save
-        get_request_dict = { CapaFactory.input_key(): '3.14' }
+        get_request_dict = { CapaFactory.input_key(): '3.14'}
         result = module.save_problem(get_request_dict)
 
         # Expect that we cannot save
@@ -639,13 +611,10 @@ class CapaModuleTest(unittest.TestCase):
 
 
     def test_save_problem_submitted_no_randomize(self):
-        module = CapaFactory.create(rerandomize='never')
-
-        # Simulate that the problem is completed
-        module.lcp.done = True
+        module = CapaFactory.create(rerandomize='never', done=True)
 
         # Try to save
-        get_request_dict = { CapaFactory.input_key(): '3.14' }
+        get_request_dict = { CapaFactory.input_key(): '3.14'}
         result = module.save_problem(get_request_dict)
 
         # Expect that we succeed
@@ -657,7 +626,7 @@ class CapaModuleTest(unittest.TestCase):
         # Just in case, we also check what happens if we have
         # more attempts than allowed.
         attempts = random.randint(1, 10)
-        module = CapaFactory.create(attempts=attempts-1, max_attempts=attempts)
+        module = CapaFactory.create(attempts=attempts -1, max_attempts=attempts)
         self.assertEqual(module.check_button_name(), "Final Check")
 
         module = CapaFactory.create(attempts=attempts, max_attempts=attempts)
@@ -667,14 +636,14 @@ class CapaModuleTest(unittest.TestCase):
         self.assertEqual(module.check_button_name(), "Final Check")
 
         # Otherwise, button name is "Check"
-        module = CapaFactory.create(attempts=attempts-2, max_attempts=attempts)
+        module = CapaFactory.create(attempts=attempts -2, max_attempts=attempts)
         self.assertEqual(module.check_button_name(), "Check")
 
-        module = CapaFactory.create(attempts=attempts-3, max_attempts=attempts)
+        module = CapaFactory.create(attempts=attempts -3, max_attempts=attempts)
         self.assertEqual(module.check_button_name(), "Check")
 
         # If no limit on attempts, then always show "Check"
-        module = CapaFactory.create(attempts=attempts-3)
+        module = CapaFactory.create(attempts=attempts -3)
         self.assertEqual(module.check_button_name(), "Check")
 
         module = CapaFactory.create(attempts=0)
@@ -682,7 +651,7 @@ class CapaModuleTest(unittest.TestCase):
 
     def test_should_show_check_button(self):
 
-        attempts = random.randint(1,10)
+        attempts = random.randint(1, 10)
 
         # If we're after the deadline, do NOT show check button
         module = CapaFactory.create(due=self.yesterday_str)
@@ -699,8 +668,7 @@ class CapaModuleTest(unittest.TestCase):
         # If user submitted a problem but hasn't reset,
         # do NOT show the check button
         # Note:  we can only reset when rerandomize="always"
-        module = CapaFactory.create(rerandomize="always")
-        module.lcp.done = True
+        module = CapaFactory.create(rerandomize="always", done=True)
         self.assertFalse(module.should_show_check_button())
 
         # Otherwise, DO show the check button
@@ -711,105 +679,101 @@ class CapaModuleTest(unittest.TestCase):
         # and we do NOT have a reset button, then we can show the check button
         # Setting rerandomize to "never" ensures that the reset button
         # is not shown
-        module = CapaFactory.create(rerandomize="never")
-        module.lcp.done = True
+        module = CapaFactory.create(rerandomize="never", done=True)
         self.assertTrue(module.should_show_check_button())
 
 
     def test_should_show_reset_button(self):
 
-        attempts = random.randint(1,10)
+        attempts = random.randint(1, 10)
 
         # If we're after the deadline, do NOT show the reset button
-        module = CapaFactory.create(due=self.yesterday_str)
-        module.lcp.done = True
+        module = CapaFactory.create(due=self.yesterday_str, done=True)
         self.assertFalse(module.should_show_reset_button())
 
         # If the user is out of attempts, do NOT show the reset button
-        module = CapaFactory.create(attempts=attempts, max_attempts=attempts)
-        module.lcp.done = True
+        module = CapaFactory.create(attempts=attempts, max_attempts=attempts, done=True)
         self.assertFalse(module.should_show_reset_button())
 
         # If we're NOT randomizing, then do NOT show the reset button
-        module = CapaFactory.create(rerandomize="never")
-        module.lcp.done = True
+        module = CapaFactory.create(rerandomize="never", done=True)
         self.assertFalse(module.should_show_reset_button())
 
         # If the user hasn't submitted an answer yet,
         # then do NOT show the reset button
-        module = CapaFactory.create()
-        module.lcp.done = False
+        module = CapaFactory.create(done=False)
         self.assertFalse(module.should_show_reset_button())
 
         # Otherwise, DO show the reset button
-        module = CapaFactory.create()
-        module.lcp.done = True
+        module = CapaFactory.create(done=True)
         self.assertTrue(module.should_show_reset_button())
 
         # If survey question for capa (max_attempts = 0),
         # DO show the reset button
-        module = CapaFactory.create(max_attempts=0)
-        module.lcp.done = True
+        module = CapaFactory.create(max_attempts=0, done=True)
         self.assertTrue(module.should_show_reset_button())
 
 
     def test_should_show_save_button(self):
 
-        attempts = random.randint(1,10)
+        attempts = random.randint(1, 10)
 
         # If we're after the deadline, do NOT show the save button
-        module = CapaFactory.create(due=self.yesterday_str)
-        module.lcp.done = True
+        module = CapaFactory.create(due=self.yesterday_str, done=True)
         self.assertFalse(module.should_show_save_button())
 
         # If the user is out of attempts, do NOT show the save button
-        module = CapaFactory.create(attempts=attempts, max_attempts=attempts)
-        module.lcp.done = True
+        module = CapaFactory.create(attempts=attempts, max_attempts=attempts, done=True)
         self.assertFalse(module.should_show_save_button())
 
         # If user submitted a problem but hasn't reset, do NOT show the save button
-        module = CapaFactory.create(rerandomize="always")
-        module.lcp.done = True
+        module = CapaFactory.create(rerandomize="always", done=True)
+        self.assertFalse(module.should_show_save_button())
+
+        # If the user has unlimited attempts and we are not randomizing,
+        # then do NOT show a save button
+        # because they can keep using "Check"
+        module = CapaFactory.create(max_attempts=None, rerandomize="never", done=False)
+        self.assertFalse(module.should_show_save_button())
+
+        module = CapaFactory.create(max_attempts=None, rerandomize="never", done=True)
         self.assertFalse(module.should_show_save_button())
 
         # Otherwise, DO show the save button
-        module = CapaFactory.create()
-        module.lcp.done = False
+        module = CapaFactory.create(done=False)
         self.assertTrue(module.should_show_save_button())
 
-        # If we're not randomizing, then we can re-save
-        module = CapaFactory.create(rerandomize="never")
-        module.lcp.done = True
+        # If we're not randomizing and we have limited attempts,  then we can save
+        module = CapaFactory.create(rerandomize="never", max_attempts=2, done=True)
         self.assertTrue(module.should_show_save_button())
 
         # If survey question for capa (max_attempts = 0),
         # DO show the save button
-        module = CapaFactory.create(max_attempts=0)
-        module.lcp.done = False
+        module = CapaFactory.create(max_attempts=0, done=False)
         self.assertTrue(module.should_show_save_button())
 
     def test_should_show_save_button_force_save_button(self):
         # If we're after the deadline, do NOT show the save button
         # even though we're forcing a save
         module = CapaFactory.create(due=self.yesterday_str,
-                                    force_save_button="true")
-        module.lcp.done = True
+                                    force_save_button="true",
+                                    done=True)
         self.assertFalse(module.should_show_save_button())
 
         # If the user is out of attempts, do NOT show the save button
-        attempts = random.randint(1,10)
+        attempts = random.randint(1, 10)
         module = CapaFactory.create(attempts=attempts,
                                     max_attempts=attempts,
-                                    force_save_button="true")
-        module.lcp.done = True
+                                    force_save_button="true",
+                                    done=True)
         self.assertFalse(module.should_show_save_button())
 
         # Otherwise, if we force the save button,
         # then show it even if we would ordinarily
         # require a reset first
         module = CapaFactory.create(force_save_button="true",
-                                    rerandomize="always")
-        module.lcp.done = True
+                                    rerandomize="always",
+                                    done=True)
         self.assertTrue(module.should_show_save_button())
 
     def test_no_max_attempts(self):
@@ -823,9 +787,9 @@ class CapaModuleTest(unittest.TestCase):
 
         # We've tested the show/hide button logic in other tests,
         # so here we hard-wire the values
-        show_check_button = bool(random.randint(0,1) % 2)
-        show_reset_button = bool(random.randint(0,1) % 2)
-        show_save_button = bool(random.randint(0,1) % 2)
+        show_check_button = bool(random.randint(0, 1) % 2)
+        show_reset_button = bool(random.randint(0, 1) % 2)
+        show_save_button = bool(random.randint(0, 1) % 2)
 
         module.should_show_check_button = Mock(return_value=show_check_button)
         module.should_show_reset_button = Mock(return_value=show_reset_button)
@@ -848,7 +812,7 @@ class CapaModuleTest(unittest.TestCase):
         self.assertEqual(html, "<div>Test Template HTML</div>")
 
         # Check the rendering context
-        render_args,_ = module.system.render_template.call_args
+        render_args, _ = module.system.render_template.call_args
         self.assertEqual(len(render_args), 2)
 
         template_name = render_args[0]
@@ -889,7 +853,7 @@ class CapaModuleTest(unittest.TestCase):
         html = module.get_problem_html()
 
         # Check the rendering context
-        render_args,_ = module.system.render_template.call_args
+        render_args, _ = module.system.render_template.call_args
         context = render_args[1]
         self.assertTrue("error" in context['problem']['html'])
 
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 a524ac2fd9..09c86baf27 100644
--- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
+++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
@@ -14,6 +14,7 @@ from datetime import datetime
 from . import test_system
 
 import test_util_open_ended
+
 """
 Tests for the various pieces of the CombinedOpenEndedGrading system
 
@@ -39,41 +40,38 @@ class OpenEndedChildTest(unittest.TestCase):
     max_score = 1
 
     static_data = {
-            'max_attempts': 20,
-            'prompt': prompt,
-            'rubric': rubric,
-            'max_score': max_score,
-            'display_name': 'Name',
-            'accept_file_upload': False,
-            'close_date': None,
-            's3_interface' : "",
-            'open_ended_grading_interface' : {},
-            'skip_basic_checks' : False,
-            }
+        'max_attempts': 20,
+        'prompt': prompt,
+        'rubric': rubric,
+        'max_score': max_score,
+        'display_name': 'Name',
+        'accept_file_upload': False,
+        'close_date': None,
+        's3_interface': "",
+        'open_ended_grading_interface': {},
+        'skip_basic_checks': False,
+    }
     definition = Mock()
     descriptor = Mock()
 
     def setUp(self):
         self.test_system = test_system()
         self.openendedchild = OpenEndedChild(self.test_system, self.location,
-                self.definition, self.descriptor, self.static_data, self.metadata) 
+                                            self.definition, self.descriptor, self.static_data, self.metadata)
 
 
     def test_latest_answer_empty(self):
         answer = self.openendedchild.latest_answer()
         self.assertEqual(answer, "")
 
-
     def test_latest_score_empty(self):
         answer = self.openendedchild.latest_score()
         self.assertEqual(answer, None)
 
-
     def test_latest_post_assessment_empty(self):
         answer = self.openendedchild.latest_post_assessment(self.test_system)
         self.assertEqual(answer, "")
 
-
     def test_new_history_entry(self):
         new_answer = "New Answer"
         self.openendedchild.new_history_entry(new_answer)
@@ -99,7 +97,6 @@ class OpenEndedChildTest(unittest.TestCase):
         score = self.openendedchild.latest_score()
         self.assertEqual(score, 4)
 
-
     def test_record_latest_post_assessment(self):
         new_answer = "New Answer"
         self.openendedchild.new_history_entry(new_answer)
@@ -107,7 +104,7 @@ class OpenEndedChildTest(unittest.TestCase):
         post_assessment = "Post assessment"
         self.openendedchild.record_latest_post_assessment(post_assessment)
         self.assertEqual(post_assessment,
-                self.openendedchild.latest_post_assessment(self.test_system))
+                         self.openendedchild.latest_post_assessment(self.test_system))
 
     def test_get_score(self):
         new_answer = "New Answer"
@@ -124,24 +121,22 @@ class OpenEndedChildTest(unittest.TestCase):
         self.assertEqual(score['score'], new_score)
         self.assertEqual(score['total'], self.static_data['max_score'])
 
-
     def test_reset(self):
         self.openendedchild.reset(self.test_system)
         state = json.loads(self.openendedchild.get_instance_state())
-        self.assertEqual(state['state'], OpenEndedChild.INITIAL)
-
+        self.assertEqual(state['child_state'], OpenEndedChild.INITIAL)
 
     def test_is_last_response_correct(self):
         new_answer = "New Answer"
         self.openendedchild.new_history_entry(new_answer)
         self.openendedchild.record_latest_score(self.static_data['max_score'])
         self.assertEqual(self.openendedchild.is_last_response_correct(),
-                'correct')
+                         'correct')
 
         self.openendedchild.new_history_entry(new_answer)
         self.openendedchild.record_latest_score(0)
         self.assertEqual(self.openendedchild.is_last_response_correct(),
-                'incorrect')
+                         'incorrect')
 
 
 class OpenEndedModuleTest(unittest.TestCase):
@@ -159,18 +154,18 @@ class OpenEndedModuleTest(unittest.TestCase):
     max_score = 4
 
     static_data = {
-            'max_attempts': 20,
-            'prompt': prompt,
-            'rubric': rubric,
-            'max_score': max_score,
-            'display_name': 'Name',
-            'accept_file_upload': False,
-            'rewrite_content_links' : "",
-            'close_date': None,
-            's3_interface' : test_util_open_ended.S3_INTERFACE,
-            'open_ended_grading_interface' : test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
-            'skip_basic_checks' : False,
-            }
+        'max_attempts': 20,
+        'prompt': prompt,
+        'rubric': rubric,
+        'max_score': max_score,
+        'display_name': 'Name',
+        'accept_file_upload': False,
+        'rewrite_content_links': "",
+        'close_date': None,
+        's3_interface': test_util_open_ended.S3_INTERFACE,
+        'open_ended_grading_interface': test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
+        'skip_basic_checks': False,
+    }
 
     oeparam = etree.XML('''
       <openendedparam>
@@ -188,25 +183,26 @@ class OpenEndedModuleTest(unittest.TestCase):
         self.test_system.location = self.location
         self.mock_xqueue = MagicMock()
         self.mock_xqueue.send_to_queue.return_value = (None, "Message")
-        self.test_system.xqueue = {'interface': self.mock_xqueue, 'callback_url': '/', 'default_queuename': 'testqueue', 'waittime': 1}
+        self.test_system.xqueue = {'interface': self.mock_xqueue, 'callback_url': '/', 'default_queuename': 'testqueue',
+                                   'waittime': 1}
         self.openendedmodule = OpenEndedModule(self.test_system, self.location,
-                self.definition, self.descriptor, self.static_data, self.metadata) 
+                                               self.definition, self.descriptor, self.static_data, self.metadata)
 
     def test_message_post(self):
         get = {'feedback': 'feedback text',
-                'submission_id': '1',
-                'grader_id': '1',
-                'score': 3}
+               'submission_id': '1',
+               'grader_id': '1',
+               'score': 3}
         qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
         student_info = {'anonymous_student_id': self.test_system.anonymous_student_id,
-                'submission_time': qtime}
+                        'submission_time': qtime}
         contents = {
-                'feedback': get['feedback'],
-                'submission_id': int(get['submission_id']),
-                'grader_id': int(get['grader_id']),
-                'score': get['score'],
-                'student_info': json.dumps(student_info)
-                }
+            'feedback': get['feedback'],
+            'submission_id': int(get['submission_id']),
+            'grader_id': int(get['grader_id']),
+            'score': get['score'],
+            'student_info': json.dumps(student_info)
+        }
 
         result = self.openendedmodule.message_post(get, self.test_system)
         self.assertTrue(result['success'])
@@ -214,19 +210,19 @@ class OpenEndedModuleTest(unittest.TestCase):
         self.mock_xqueue.send_to_queue.assert_called_with(body=json.dumps(contents), header=ANY)
 
         state = json.loads(self.openendedmodule.get_instance_state())
-        self.assertIsNotNone(state['state'], OpenEndedModule.DONE)
+        self.assertIsNotNone(state['child_state'], OpenEndedModule.DONE)
 
     def test_send_to_grader(self):
         submission = "This is a student submission"
         qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
         student_info = {'anonymous_student_id': self.test_system.anonymous_student_id,
-                'submission_time': qtime}
+                        'submission_time': qtime}
         contents = self.openendedmodule.payload.copy()
         contents.update({
             'student_info': json.dumps(student_info),
             'student_response': submission,
             'max_score': self.max_score
-            })
+        })
         result = self.openendedmodule.send_to_grader(submission, self.test_system)
         self.assertTrue(result)
         self.mock_xqueue.send_to_queue.assert_called_with(body=json.dumps(contents), header=ANY)
@@ -234,36 +230,36 @@ class OpenEndedModuleTest(unittest.TestCase):
     def update_score_single(self):
         self.openendedmodule.new_history_entry("New Entry")
         score_msg = {
-                'correct': True,
-                'score': 4,
-                'msg': 'Grader Message',
-                'feedback': "Grader Feedback"
-                }
+            'correct': True,
+            'score': 4,
+            'msg': 'Grader Message',
+            'feedback': "Grader Feedback"
+        }
         get = {'queuekey': "abcd",
-                'xqueue_body': score_msg}
+               'xqueue_body': score_msg}
         self.openendedmodule.update_score(get, self.test_system)
 
     def update_score_single(self):
         self.openendedmodule.new_history_entry("New Entry")
         feedback = {
-                "success": True,
-                "feedback": "Grader Feedback"
-                }
+            "success": True,
+            "feedback": "Grader Feedback"
+        }
         score_msg = {
-                'correct': True,
-                'score': 4,
-                'msg': 'Grader Message',
-                'feedback': json.dumps(feedback),
-                'grader_type': 'IN',
-                'grader_id': '1',
-                'submission_id': '1',
-                'success': True,
-                'rubric_scores': [0],
-                'rubric_scores_complete': True,
-                'rubric_xml': etree.tostring(self.rubric)
-                }
+            'correct': True,
+            'score': 4,
+            'msg': 'Grader Message',
+            'feedback': json.dumps(feedback),
+            'grader_type': 'IN',
+            'grader_id': '1',
+            'submission_id': '1',
+            'success': True,
+            'rubric_scores': [0],
+            'rubric_scores_complete': True,
+            'rubric_xml': etree.tostring(self.rubric)
+        }
         get = {'queuekey': "abcd",
-                'xqueue_body': json.dumps(score_msg)}
+               'xqueue_body': json.dumps(score_msg)}
         self.openendedmodule.update_score(get, self.test_system)
 
     def test_latest_post_assessment(self):
@@ -296,18 +292,18 @@ class CombinedOpenEndedModuleTest(unittest.TestCase):
     metadata = {'attempts': '10', 'max_score': max_score}
 
     static_data = {
-            'max_attempts': 20,
-            'prompt': prompt,
-            'rubric': rubric,
-            'max_score': max_score,
-            'display_name': 'Name',
-            'accept_file_upload' : False,
-            'rewrite_content_links' : "",
-            'close_date' : "",
-            's3_interface' : test_util_open_ended.S3_INTERFACE,
-            'open_ended_grading_interface' : test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
-            'skip_basic_checks' : False,
-            }
+        'max_attempts': 20,
+        'prompt': prompt,
+        'rubric': rubric,
+        'max_score': max_score,
+        'display_name': 'Name',
+        'accept_file_upload': False,
+        'rewrite_content_links': "",
+        'close_date': "",
+        's3_interface': test_util_open_ended.S3_INTERFACE,
+        'open_ended_grading_interface': test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
+        'skip_basic_checks': False,
+    }
 
     oeparam = etree.XML('''
       <openendedparam>
@@ -329,23 +325,26 @@ class CombinedOpenEndedModuleTest(unittest.TestCase):
             '''
     task_xml2 = '''
     <openended min_score_to_attempt="1" max_score_to_attempt="1">
-		        <openendedparam>
-		      		<initial_display>Enter essay here.</initial_display>
-		      		<answer_display>This is the answer.</answer_display>
-		      		<grader_payload>{"grader_settings" : "ml_grading.conf", "problem_id" : "6.002x/Welcome/OETest"}</grader_payload>
-		    	</openendedparam>
-		</openended>'''
+            <openendedparam>
+                    <initial_display>Enter essay here.</initial_display>
+                    <answer_display>This is the answer.</answer_display>
+                    <grader_payload>{"grader_settings" : "ml_grading.conf", "problem_id" : "6.002x/Welcome/OETest"}</grader_payload>
+           </openendedparam>
+    </openended>'''
     definition = {'prompt': etree.XML(prompt), 'rubric': etree.XML(rubric), 'task_xml': [task_xml1, task_xml2]}
     descriptor = Mock()
 
     def setUp(self):
         self.test_system = test_system()
-        self.combinedoe = CombinedOpenEndedV1Module(self.test_system, 
-                                                self.location, 
-                                                self.definition, 
-                                                self.descriptor, 
-                                                static_data = self.static_data, 
-                                                metadata=self.metadata)
+        # TODO: this constructor call is definitely wrong, but neither branch
+        # of the merge matches the module constructor.  Someone (Vik?) should fix this.
+        self.combinedoe = CombinedOpenEndedV1Module(self.test_system,
+                                                    self.location,
+                                                    self.definition,
+                                                    self.descriptor,
+                                                    static_data=self.static_data,
+                                                    metadata=self.metadata,
+                                                    instance_state={})
 
     def test_get_tag_name(self):
         name = self.combinedoe.get_tag_name("<t>Tag</t>")
diff --git a/common/lib/xmodule/xmodule/tests/test_conditional.py b/common/lib/xmodule/xmodule/tests/test_conditional.py
index 16bd222b9e..1b2da0b74a 100644
--- a/common/lib/xmodule/xmodule/tests/test_conditional.py
+++ b/common/lib/xmodule/xmodule/tests/test_conditional.py
@@ -73,24 +73,21 @@ class ConditionalModuleTest(unittest.TestCase):
         """Make sure that conditional module works"""
 
         print "Starting import"
-        course = self.get_course('conditional')
+        course = self.get_course('conditional_and_poll')
 
         print "Course: ", course
         print "id: ", course.id
 
-        instance_states = dict(problem=None)
-        shared_state = None
-
         def inner_get_module(descriptor):
             if isinstance(descriptor, Location):
                 location = descriptor
                 descriptor = self.modulestore.get_instance(course.id, location, depth=None)
             location = descriptor.location
-            instance_state = instance_states.get(location.category, None)
-            print "inner_get_module, location=%s, inst_state=%s" % (location, instance_state)
-            return descriptor.xmodule_constructor(self.test_system)(instance_state, shared_state)
+            return descriptor.xmodule(self.test_system)
 
-        location = Location(["i4x", "edX", "cond_test", "conditional", "condone"])
+        # edx - HarvardX
+        # cond_test - ER22x
+        location = Location(["i4x", "HarvardX", "ER22x", "conditional", "condone"])
 
         def replace_urls(text, staticfiles_prefix=None, replace_prefix='/static/', course_namespace=None):
             return text
@@ -99,26 +96,28 @@ class ConditionalModuleTest(unittest.TestCase):
 
         module = inner_get_module(location)
         print "module: ", module
-        print "module definition: ", module.definition
+        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()
         print "html type: ", type(html)
         print "html: ", html
-        html_expect = "{'ajax_url': 'courses/course_id/modx/a_location', 'element_id': 'i4x-edX-cond_test-conditional-condone', 'id': 'i4x://edX/cond_test/conditional/condone'}"
+        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'}"
         self.assertEqual(html, html_expect)
 
         gdi =  module.get_display_items()
         print "gdi=", gdi
 
         ajax = json.loads(module.handle_ajax('', ''))
-        self.assertTrue('xmodule.conditional_module' in ajax['html'])
         print "ajax: ", ajax
+        html = ajax['html']
+        self.assertFalse(any(['This is a secret' in item for item in html]))
 
         # now change state of the capa problem to make it completed
-        instance_states['problem'] = json.dumps({'attempts': 1})
+        inner_get_module(Location('i4x://HarvardX/ER22x/problem/choiceprob')).attempts = 1
 
         ajax = json.loads(module.handle_ajax('', ''))
-        self.assertTrue('This is a secret' in ajax['html'])
         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_course_module.py b/common/lib/xmodule/xmodule/tests/test_course_module.py
index 712b095696..59099b0dff 100644
--- a/common/lib/xmodule/xmodule/tests/test_course_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_course_module.py
@@ -39,7 +39,7 @@ class DummySystem(ImportSystem):
 class IsNewCourseTestCase(unittest.TestCase):
     """Make sure the property is_new works on courses"""
     @staticmethod
-    def get_dummy_course(start, announcement=None, is_new=None):
+    def get_dummy_course(start, announcement=None, is_new=None, advertised_start=None):
         """Get a dummy course"""
 
         system = DummySystem(load_error_modules=True)
@@ -49,71 +49,87 @@ class IsNewCourseTestCase(unittest.TestCase):
 
         is_new = to_attrb('is_new', is_new)
         announcement = to_attrb('announcement', announcement)
+        advertised_start = to_attrb('advertised_start', advertised_start)
 
         start_xml = '''
          <course org="{org}" course="{course}"
                 graceperiod="1 day" url_name="test"
                 start="{start}"
                 {announcement}
-                {is_new}>
+                {is_new}
+                {advertised_start}>
             <chapter url="hi" url_name="ch" display_name="CH">
                 <html url_name="h" display_name="H">Two houses, ...</html>
             </chapter>
          </course>
          '''.format(org=ORG, course=COURSE, start=start, is_new=is_new,
-                    announcement=announcement)
+                    announcement=announcement, advertised_start=advertised_start)
 
         return system.process_xml(start_xml)
 
     @patch('xmodule.course_module.time.gmtime')
     def test_sorting_score(self, gmtime_mock):
         gmtime_mock.return_value = NOW
-        dates = [('2012-10-01T12:00', '2012-09-01T12:00'),  # 0
-                 ('2012-12-01T12:00', '2012-11-01T12:00'),  # 1
-                 ('2013-02-01T12:00', '2012-12-01T12:00'),  # 2
-                 ('2013-02-01T12:00', '2012-11-10T12:00'),  # 3
-                 ('2013-02-01T12:00', None),                # 4
-                 ('2013-03-01T12:00', None),                # 5
-                 ('2013-04-01T12:00', None),                # 6
-                 ('2012-11-01T12:00', None),                # 7
-                 ('2012-09-01T12:00', None),                # 8
-                 ('1990-01-01T12:00', None),                # 9
-                 ('2013-01-02T12:00', None),                # 10
-                 ('2013-01-10T12:00', '2012-12-31T12:00'),  # 11
-                 ('2013-01-10T12:00', '2013-01-01T12:00'),  # 12
+
+        day1 = '2012-01-01T12:00'
+        day2 = '2012-01-02T12:00'
+
+        dates = [
+            # Announce date takes priority over actual start
+            # and courses announced on a later date are newer
+            # than courses announced for an earlier date
+            ((day1, day2, None), (day1, day1, None), self.assertLess),
+            ((day1, day1, None), (day2, day1, None), self.assertEqual),
+
+            # Announce dates take priority over advertised starts
+            ((day1, day2, day1), (day1, day1, day1), self.assertLess),
+            ((day1, day1, day2), (day2, day1, day2), self.assertEqual),
+
+            # Later start == newer course
+            ((day2, None, None), (day1, None, None), self.assertLess),
+            ((day1, None, None), (day1, None, None), self.assertEqual),
+
+            # Non-parseable advertised starts are ignored in preference
+            # to actual starts
+            ((day2, None, "Spring 2013"), (day1, None, "Fall 2012"), self.assertLess),
+            ((day1, None, "Spring 2013"), (day1, None, "Fall 2012"), self.assertEqual),
+
+            # Parseable advertised starts take priority over start dates
+            ((day1, None, day2), (day1, None, day1), self.assertLess),
+            ((day2, None, day2), (day1, None, day2), self.assertEqual),
+
         ]
 
         data = []
-        for i, d in enumerate(dates):
-            descriptor = self.get_dummy_course(start=d[0], announcement=d[1])
-            score = descriptor.sorting_score
-            data.append((score, i))
+        for a, b, assertion in dates:
+            a_score = self.get_dummy_course(start=a[0], announcement=a[1], advertised_start=a[2]).sorting_score
+            b_score = self.get_dummy_course(start=b[0], announcement=b[1], advertised_start=b[2]).sorting_score
+            print "Comparing %s to %s" % (a, b)
+            assertion(a_score, b_score)
 
-        result = [d[1] for d in sorted(data)]
-        assert(result == [12, 11, 2, 3, 1, 0, 6, 5, 4, 10, 7, 8, 9])
 
 
     @patch('xmodule.course_module.time.gmtime')
-    def test_is_new(self, gmtime_mock):
+    def test_is_newish(self, gmtime_mock):
         gmtime_mock.return_value = NOW
 
         descriptor = self.get_dummy_course(start='2012-12-02T12:00', is_new=True)
-        assert(descriptor.is_new is True)
+        assert(descriptor.is_newish is True)
 
         descriptor = self.get_dummy_course(start='2013-02-02T12:00', is_new=False)
-        assert(descriptor.is_new is False)
+        assert(descriptor.is_newish is False)
 
         descriptor = self.get_dummy_course(start='2013-02-02T12:00', is_new=True)
-        assert(descriptor.is_new is True)
+        assert(descriptor.is_newish is True)
 
         descriptor = self.get_dummy_course(start='2013-01-15T12:00')
-        assert(descriptor.is_new is True)
+        assert(descriptor.is_newish is True)
 
         descriptor = self.get_dummy_course(start='2013-03-00T12:00')
-        assert(descriptor.is_new is True)
+        assert(descriptor.is_newish is True)
 
         descriptor = self.get_dummy_course(start='2012-10-15T12:00')
-        assert(descriptor.is_new is False)
+        assert(descriptor.is_newish is False)
 
         descriptor = self.get_dummy_course(start='2012-12-31T12:00')
-        assert(descriptor.is_new is True)
+        assert(descriptor.is_newish is True)
diff --git a/common/lib/xmodule/xmodule/tests/test_export.py b/common/lib/xmodule/xmodule/tests/test_export.py
index e9fb89e9f6..443014f9ef 100644
--- a/common/lib/xmodule/xmodule/tests/test_export.py
+++ b/common/lib/xmodule/xmodule/tests/test_export.py
@@ -18,27 +18,16 @@ TEST_DIR = TEST_DIR / 'test'
 DATA_DIR = TEST_DIR / 'data'
 
 
-def strip_metadata(descriptor, key):
-    """
-    Recursively strips tag from all children.
-    """
-    print "strip {key} from {desc}".format(key=key, desc=descriptor.location.url())
-    descriptor.metadata.pop(key, None)
-    for d in descriptor.get_children():
-        strip_metadata(d, key)
-
-
 def strip_filenames(descriptor):
     """
     Recursively strips 'filename' from all children's definitions.
     """
     print "strip filename from {desc}".format(desc=descriptor.location.url())
-    descriptor.definition.pop('filename', None)
+    descriptor._model_data.pop('filename', None)
     for d in descriptor.get_children():
         strip_filenames(d)
 
 
-
 class RoundTripTestCase(unittest.TestCase):
     ''' Check that our test courses roundtrip properly.
         Same course imported , than exported, then imported again.
@@ -77,10 +66,6 @@ class RoundTripTestCase(unittest.TestCase):
         exported_course = courses2[0]
 
         print "Checking course equality"
-        # HACK: data_dir metadata tags break equality because they
-        # aren't real metadata, and depend on paths. Remove them.
-        strip_metadata(initial_course, 'data_dir')
-        strip_metadata(exported_course, 'data_dir')
 
         # HACK: filenames change when changing file formats
         # during imports from old-style courses.  Ignore them.
@@ -105,7 +90,6 @@ class RoundTripTestCase(unittest.TestCase):
             self.assertEquals(initial_import.modules[course_id][location],
                               second_import.modules[course_id][location])
 
-
     def setUp(self):
         self.maxDiff = None
         self.temp_dir = mkdtemp()
@@ -120,6 +104,9 @@ class RoundTripTestCase(unittest.TestCase):
     def test_full_roundtrip(self):
         self.check_export_roundtrip(DATA_DIR, "full")
 
+    def test_conditional_and_poll_roundtrip(self):
+        self.check_export_roundtrip(DATA_DIR, "conditional_and_poll")
+
     def test_selfassessment_roundtrip(self):
         #Test selfassessment xmodule to see if it exports correctly
         self.check_export_roundtrip(DATA_DIR, "self_assessment")
diff --git a/common/lib/xmodule/xmodule/tests/test_import.py b/common/lib/xmodule/xmodule/tests/test_import.py
index 42072ffe4d..37b1d35938 100644
--- a/common/lib/xmodule/xmodule/tests/test_import.py
+++ b/common/lib/xmodule/xmodule/tests/test_import.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 from path import path
 import unittest
 from fs.memoryfs import MemoryFS
@@ -12,6 +14,7 @@ from xmodule.errortracker import make_error_tracker
 from xmodule.modulestore import Location
 from xmodule.modulestore.xml import ImportSystem, XMLModuleStore
 from xmodule.modulestore.exceptions import ItemNotFoundError
+from xmodule.modulestore.inheritance import compute_inherited_metadata
 
 from .test_export import DATA_DIR
 
@@ -75,7 +78,6 @@ class ImportTestCase(BaseCourseTestCase):
         self.assertEqual(descriptor.__class__.__name__,
                          'ErrorDescriptor')
 
-
     def test_unique_url_names(self):
         '''Check that each error gets its very own url_name'''
         bad_xml = '''<sequential display_name="oops"><video url="hi"></sequential>'''
@@ -87,7 +89,6 @@ class ImportTestCase(BaseCourseTestCase):
 
         self.assertNotEqual(descriptor1.location, descriptor2.location)
 
-
     def test_reimport(self):
         '''Make sure an already-exported error xml tag loads properly'''
 
@@ -103,8 +104,10 @@ class ImportTestCase(BaseCourseTestCase):
         self.assertEqual(re_import_descriptor.__class__.__name__,
                          'ErrorDescriptor')
 
-        self.assertEqual(descriptor.definition['data'],
-                         re_import_descriptor.definition['data'])
+        self.assertEqual(descriptor.contents,
+                         re_import_descriptor.contents)
+        self.assertEqual(descriptor.error_msg,
+                         re_import_descriptor.error_msg)
 
     def test_fixed_xml_tag(self):
         """Make sure a tag that's been fixed exports as the original tag type"""
@@ -138,23 +141,20 @@ class ImportTestCase(BaseCourseTestCase):
         url_name = 'test1'
         start_xml = '''
         <course org="{org}" course="{course}"
-                graceperiod="{grace}" url_name="{url_name}" unicorn="purple">
+                due="{due}" url_name="{url_name}" unicorn="purple">
             <chapter url="hi" url_name="ch" display_name="CH">
                 <html url_name="h" display_name="H">Two houses, ...</html>
             </chapter>
-        </course>'''.format(grace=v, org=ORG, course=COURSE, url_name=url_name)
+        </course>'''.format(due=v, org=ORG, course=COURSE, url_name=url_name)
         descriptor = system.process_xml(start_xml)
+        compute_inherited_metadata(descriptor)
 
-        print descriptor, descriptor.metadata
-        self.assertEqual(descriptor.metadata['graceperiod'], v)
-        self.assertEqual(descriptor.metadata['unicorn'], 'purple')
+        print descriptor, descriptor._model_data
+        self.assertEqual(descriptor.lms.due, v)
 
-        # Check that the child inherits graceperiod correctly
+        # Check that the child inherits due correctly
         child = descriptor.get_children()[0]
-        self.assertEqual(child.metadata['graceperiod'], v)
-
-        # check that the child does _not_ inherit any unicorns
-        self.assertTrue('unicorn' not in child.metadata)
+        self.assertEqual(child.lms.due, v)
 
         # Now export and check things
         resource_fs = MemoryFS()
@@ -181,12 +181,12 @@ class ImportTestCase(BaseCourseTestCase):
         # did we successfully strip the url_name from the definition contents?
         self.assertTrue('url_name' not in course_xml.attrib)
 
-        # Does the chapter tag now have a graceperiod attribute?
+        # Does the chapter tag now have a due attribute?
         # hardcoded path to child
         with resource_fs.open('chapter/ch.xml') as f:
             chapter_xml = etree.fromstring(f.read())
         self.assertEqual(chapter_xml.tag, 'chapter')
-        self.assertFalse('graceperiod' in chapter_xml.attrib)
+        self.assertFalse('due' in chapter_xml.attrib)
 
     def test_is_pointer_tag(self):
         """
@@ -224,13 +224,12 @@ class ImportTestCase(BaseCourseTestCase):
         def check_for_key(key, node):
             "recursive check for presence of key"
             print "Checking {0}".format(node.location.url())
-            self.assertTrue(key in node.metadata)
+            self.assertTrue(key in node._model_data)
             for c in node.get_children():
                 check_for_key(key, c)
 
         check_for_key('graceperiod', course)
 
-
     def test_policy_loading(self):
         """Make sure that when two courses share content with the same
         org and course names, policy applies to the right one."""
@@ -252,8 +251,7 @@ class ImportTestCase(BaseCourseTestCase):
 
         # Also check that keys from policy are run through the
         # appropriate attribute maps -- 'graded' should be True, not 'true'
-        self.assertEqual(toy.metadata['graded'], True)
-
+        self.assertEqual(toy.lms.graded, True)
 
     def test_definition_loading(self):
         """When two courses share the same org and course name and
@@ -271,9 +269,8 @@ class ImportTestCase(BaseCourseTestCase):
         location = Location(["i4x", "edX", "toy", "video", "Welcome"])
         toy_video = modulestore.get_instance(toy_id, location)
         two_toy_video =  modulestore.get_instance(two_toy_id, location)
-        self.assertEqual(toy_video.metadata['youtube'], "1.0:p2Q6BrNhdh8")
-        self.assertEqual(two_toy_video.metadata['youtube'], "1.0:p2Q6BrNhdh9")
-
+        self.assertEqual(etree.fromstring(toy_video.data).get('youtube'), "1.0:p2Q6BrNhdh8")
+        self.assertEqual(etree.fromstring(two_toy_video.data).get('youtube'), "1.0:p2Q6BrNhdh9")
 
     def test_colon_in_url_name(self):
         """Ensure that colons in url_names convert to file paths properly"""
@@ -331,6 +328,22 @@ class ImportTestCase(BaseCourseTestCase):
 
             self.assertEqual(len(video.url_name), len('video_') + 12)
 
+    def test_poll_and_conditional_xmodule(self):
+        modulestore = XMLModuleStore(DATA_DIR, course_dirs=['conditional_and_poll'])
+
+        course = modulestore.get_courses()[0]
+        chapters = course.get_children()
+        ch1 = chapters[0]
+        sections = ch1.get_children()
+
+        self.assertEqual(len(sections), 1)
+
+        location = course.location
+        location = Location(location.tag, location.org, location.course,
+            'sequential', 'Problem_Demos')
+        module = modulestore.get_instance(course.id, location)
+        self.assertEqual(len(module.children), 2)
+
     def test_error_on_import(self):
         '''Check that when load_error_module is false, an exception is raised, rather than returning an ErrorModule'''
 
@@ -354,7 +367,7 @@ class ImportTestCase(BaseCourseTestCase):
         render_string_from_sample_gst_xml = """
         <slider var="a" style="width:400px;float:left;"/>\
 <plot style="margin-top:15px;margin-bottom:15px;"/>""".strip()
-        self.assertEqual(gst_sample.definition['render'], render_string_from_sample_gst_xml)
+        self.assertEqual(gst_sample.render, render_string_from_sample_gst_xml)
 
     def test_cohort_config(self):
         """
@@ -370,13 +383,13 @@ class ImportTestCase(BaseCourseTestCase):
         self.assertFalse(course.is_cohorted)
 
         # empty config -> False
-        course.metadata['cohort_config'] = {}
+        course.cohort_config = {}
         self.assertFalse(course.is_cohorted)
 
         # false config -> False
-        course.metadata['cohort_config'] = {'cohorted': False}
+        course.cohort_config = {'cohorted': False}
         self.assertFalse(course.is_cohorted)
 
         # and finally...
-        course.metadata['cohort_config'] = {'cohorted': True}
+        course.cohort_config = {'cohorted': True}
         self.assertTrue(course.is_cohorted)
diff --git a/common/lib/xmodule/xmodule/tests/test_logic.py b/common/lib/xmodule/xmodule/tests/test_logic.py
new file mode 100644
index 0000000000..018b40427e
--- /dev/null
+++ b/common/lib/xmodule/xmodule/tests/test_logic.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+
+import json
+import unittest
+
+from xmodule.poll_module import PollDescriptor
+from xmodule.conditional_module import ConditionalDescriptor
+
+
+class LogicTest(unittest.TestCase):
+    """Base class for testing xmodule logic."""
+    descriptor_class = None
+    raw_model_data = {}
+
+    def setUp(self):
+        class EmptyClass: pass
+
+        self.system = None
+        self.location = None
+        self.descriptor = EmptyClass()
+
+        self.xmodule_class = self.descriptor_class.module_class
+        self.xmodule = self.xmodule_class(self.system, self.location,
+            self.descriptor, self.raw_model_data)
+
+    def ajax_request(self, dispatch, get):
+        return json.loads(self.xmodule.handle_ajax(dispatch, get))
+
+
+class PollModuleTest(LogicTest):
+    descriptor_class = PollDescriptor
+    raw_model_data = {
+        'poll_answers': {'Yes': 1, 'Dont_know': 0, 'No': 0},
+        'voted': False,
+        'poll_answer': ''
+    }
+
+    def test_bad_ajax_request(self):
+        response = self.ajax_request('bad_answer', {})
+        self.assertDictEqual(response, {'error': 'Unknown Command!'})
+
+    def test_good_ajax_request(self):
+        response = self.ajax_request('No', {})
+
+        poll_answers = response['poll_answers']
+        total = response['total']
+        callback = response['callback']
+
+        self.assertDictEqual(poll_answers, {'Yes': 1, 'Dont_know': 0, 'No': 1})
+        self.assertEqual(total, 2)
+        self.assertDictEqual(callback, {'objectName': 'Conditional'})
+        self.assertEqual(self.xmodule.poll_answer, 'No')
+
+
+class ConditionalModuleTest(LogicTest):
+    descriptor_class = ConditionalDescriptor
+
+    def test_ajax_request(self):
+        # Mock is_condition_satisfied
+        self.xmodule.is_condition_satisfied = lambda: True
+        setattr(self.xmodule.descriptor, 'get_children', lambda: [])
+
+        response = self.ajax_request('No', {})
+        html = response['html']
+
+        self.assertEqual(html, [])
diff --git a/common/lib/xmodule/xmodule/tests/test_randomize_module.py b/common/lib/xmodule/xmodule/tests/test_randomize_module.py
index 456fd379a5..59cf5a59f3 100644
--- a/common/lib/xmodule/xmodule/tests/test_randomize_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_randomize_module.py
@@ -13,7 +13,7 @@ COURSE = 'test_course'
 START = '2013-01-01T01:00:00'
 
 
-from test_course_module import DummySystem as DummyImportSystem
+from .test_course_module import DummySystem as DummyImportSystem
 from . import test_system
 
 
diff --git a/common/lib/xmodule/xmodule/tests/test_self_assessment.py b/common/lib/xmodule/xmodule/tests/test_self_assessment.py
index 362b73df67..593b3fea01 100644
--- a/common/lib/xmodule/xmodule/tests/test_self_assessment.py
+++ b/common/lib/xmodule/xmodule/tests/test_self_assessment.py
@@ -10,8 +10,8 @@ from . import test_system
 
 import test_util_open_ended
 
-class SelfAssessmentTest(unittest.TestCase):
 
+class SelfAssessmentTest(unittest.TestCase):
     rubric = '''<rubric><rubric>
         <category>
         <description>Response Quality</description>
@@ -24,13 +24,11 @@ class SelfAssessmentTest(unittest.TestCase):
                   'prompt': prompt,
                   'submitmessage': 'Shall we submit now?',
                   'hintprompt': 'Consider this...',
-                  }
+    }
 
     location = Location(["i4x", "edX", "sa_test", "selfassessment",
                          "SampleQuestion"])
 
-    metadata = {'attempts': '10'}
-
     descriptor = Mock()
 
     def setUp(self):
@@ -41,22 +39,22 @@ class SelfAssessmentTest(unittest.TestCase):
                             'attempts': 2})
 
         static_data = {
-                'max_attempts': 10,
-                'rubric': etree.XML(self.rubric),
-                'prompt': self.prompt,
-                'max_score': 1,
-                'display_name': "Name",
-                'accept_file_upload': False,
-                'close_date': None,
-                's3_interface' : test_util_open_ended.S3_INTERFACE,
-                'open_ended_grading_interface' : test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
-                'skip_basic_checks' : False,
-                }
+            'max_attempts': 10,
+            'rubric': etree.XML(self.rubric),
+            'prompt': self.prompt,
+            'max_score': 1,
+            'display_name': "Name",
+            'accept_file_upload': False,
+            'close_date': None,
+            's3_interface': test_util_open_ended.S3_INTERFACE,
+            'open_ended_grading_interface': test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
+            'skip_basic_checks': False,
+        }
 
         self.module = SelfAssessmentModule(test_system(), self.location,
-                                      self.definition, self.descriptor,
-                                      static_data, 
-                                      state, metadata=self.metadata)
+                                           self.definition,
+                                           self.descriptor,
+                                           static_data)
 
     def test_get_html(self):
         html = self.module.get_html(self.module.system)
@@ -64,14 +62,15 @@ class SelfAssessmentTest(unittest.TestCase):
 
     def test_self_assessment_flow(self):
         responses = {'assessment': '0', 'score_list[]': ['0', '0']}
+
         def get_fake_item(name):
             return responses[name]
 
-        def get_data_for_location(self,location,student):
+        def get_data_for_location(self, location, student):
             return {
-            'count_graded' : 0,
-            'count_required' : 0,
-            'student_sub_count': 0,
+                'count_graded': 0,
+                'count_required': 0,
+                'student_sub_count': 0,
             }
 
         mock_query_dict = MagicMock()
@@ -82,21 +81,20 @@ class SelfAssessmentTest(unittest.TestCase):
 
         self.assertEqual(self.module.get_score()['score'], 0)
 
-        self.module.save_answer({'student_answer': "I am an answer"}, 
+        self.module.save_answer({'student_answer': "I am an answer"},
                                 self.module.system)
-        self.assertEqual(self.module.state, self.module.ASSESSING)
+        self.assertEqual(self.module.child_state, self.module.ASSESSING)
 
         self.module.save_assessment(mock_query_dict, self.module.system)
-        self.assertEqual(self.module.state, self.module.DONE)
-
+        self.assertEqual(self.module.child_state, self.module.DONE)
 
         d = self.module.reset({})
         self.assertTrue(d['success'])
-        self.assertEqual(self.module.state, self.module.INITIAL)
+        self.assertEqual(self.module.child_state, self.module.INITIAL)
 
         # if we now assess as right, skip the REQUEST_HINT state
-        self.module.save_answer({'student_answer': 'answer 4'}, 
+        self.module.save_answer({'student_answer': 'answer 4'},
                                 self.module.system)
         responses['assessment'] = '1'
         self.module.save_assessment(mock_query_dict, self.module.system)
-        self.assertEqual(self.module.state, self.module.DONE)
+        self.assertEqual(self.module.child_state, self.module.DONE)
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 8d1fcd30ce..db580f1e0e 100644
--- a/common/lib/xmodule/xmodule/tests/test_util_open_ended.py
+++ b/common/lib/xmodule/xmodule/tests/test_util_open_ended.py
@@ -1,14 +1,14 @@
 OPEN_ENDED_GRADING_INTERFACE = {
-    'url' : 'http://127.0.0.1:3033/',
-    'username' : 'incorrect',
-    'password' : 'incorrect',
-    'staff_grading' : 'staff_grading',
-    'peer_grading' : 'peer_grading',
-    'grading_controller' : 'grading_controller'
+    'url': 'http://127.0.0.1:3033/',
+    'username': 'incorrect',
+    'password': 'incorrect',
+    'staff_grading': 'staff_grading',
+    'peer_grading': 'peer_grading',
+    'grading_controller': 'grading_controller'
 }
 
 S3_INTERFACE = {
-    'aws_access_key' : "",
-    'aws_secret_key' : "",
-    "aws_bucket_name" : "",
+    'aws_access_key': "",
+    'aws_secret_key': "",
+    "aws_bucket_name": "",
 }
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/timeinfo.py b/common/lib/xmodule/xmodule/timeinfo.py
index 6c6a72e700..615a7b2c73 100644
--- a/common/lib/xmodule/xmodule/timeinfo.py
+++ b/common/lib/xmodule/xmodule/timeinfo.py
@@ -1,7 +1,7 @@
 import dateutil
 import dateutil.parser
 import datetime
-from timeparse import parse_timedelta
+from .timeparse import parse_timedelta
 
 import logging
 log = logging.getLogger(__name__)
diff --git a/common/lib/xmodule/xmodule/timelimit_module.py b/common/lib/xmodule/xmodule/timelimit_module.py
index 9abb5d183f..efa47a5dca 100644
--- a/common/lib/xmodule/xmodule/timelimit_module.py
+++ b/common/lib/xmodule/xmodule/timelimit_module.py
@@ -9,35 +9,31 @@ from xmodule.xml_module import XmlDescriptor
 from xmodule.x_module import XModule
 from xmodule.progress import Progress
 from xmodule.exceptions import NotFoundError
+from xblock.core import Float, String, Boolean, Scope
 
 
 log = logging.getLogger(__name__)
 
-class TimeLimitModule(XModule):
-    ''' 
+
+class TimeLimitFields(object):
+    beginning_at = Float(help="The time this timer was started", scope=Scope.student_state)
+    ending_at = Float(help="The time this timer will end", scope=Scope.student_state)
+    accomodation_code = String(help="A code indicating accommodations to be given the student", scope=Scope.student_state)
+    time_expired_redirect_url = String(help="Url to redirect users to after the timelimit has expired", scope=Scope.settings)
+    duration = Float(help="The length of this timer", scope=Scope.settings)
+    suppress_toplevel_navigation = Boolean(help="Whether the toplevel navigation should be suppressed when viewing this module", scope=Scope.settings)
+
+
+class TimeLimitModule(TimeLimitFields, XModule):
+    '''
     Wrapper module which imposes a time constraint for the completion of its child.
     '''
 
-    def __init__(self, system, location, definition, descriptor, instance_state=None,
-                 shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor,
-                         instance_state, shared_state, **kwargs)
+    def __init__(self, *args, **kwargs):
+        XModule.__init__(self, *args, **kwargs)
 
         self.rendered = False
-        self.beginning_at = None
-        self.ending_at = None
-        self.accommodation_code = None
-        
-        if instance_state is not None:
-            state = json.loads(instance_state)
 
-            if 'beginning_at' in state:
-                self.beginning_at = state['beginning_at']
-            if 'ending_at' in state:
-                self.ending_at = state['ending_at']
-            if 'accommodation_code' in state:
-                self.accommodation_code = state['accommodation_code']
-                
     # For a timed activity, we are only interested here
     # in time-related accommodations, and these should be disjoint.
     # (For proctored exams, it is possible to have multiple accommodations
@@ -50,7 +46,7 @@ class TimeLimitModule(XModule):
                     )
 
     def _get_accommodated_duration(self, duration):
-        ''' 
+        '''
         Get duration for activity, as adjusted for accommodations.
         Input and output are expressed in seconds.
         '''
@@ -70,35 +66,25 @@ class TimeLimitModule(XModule):
     @property
     def has_begun(self):
         return self.beginning_at is not None
-    
-    @property    
+
+    @property
     def has_ended(self):
         if not self.ending_at:
             return False
         return self.ending_at < time()
-        
+
     def begin(self, duration):
-        ''' 
+        '''
         Sets the starting time and ending time for the activity,
         based on the duration provided (in seconds).
         '''
         self.beginning_at = time()
         modified_duration = self._get_accommodated_duration(duration)
         self.ending_at = self.beginning_at + modified_duration
-        
+
     def get_remaining_time_in_ms(self):
         return int((self.ending_at - time()) * 1000)
 
-    def get_instance_state(self):
-        state = {}
-        if self.beginning_at:
-            state['beginning_at'] = self.beginning_at
-        if self.ending_at:
-            state['ending_at'] = self.ending_at
-        if self.accommodation_code:
-            state['accommodation_code'] = self.accommodation_code
-        return json.dumps(state)
-
     def get_html(self):
         self.render()
         return self.content
@@ -133,12 +119,12 @@ class TimeLimitModule(XModule):
         else:
             return "other"
 
-class TimeLimitDescriptor(XMLEditingDescriptor, XmlDescriptor):
+class TimeLimitDescriptor(TimeLimitFields, XMLEditingDescriptor, XmlDescriptor):
 
     module_class = TimeLimitModule
 
     # For remembering when a student started, and when they should end
-    stores_state = True 
+    stores_state = True
 
     @classmethod
     def definition_from_xml(cls, xml_object, system):
@@ -151,7 +137,7 @@ class TimeLimitDescriptor(XMLEditingDescriptor, XmlDescriptor):
                 if system.error_tracker is not None:
                     system.error_tracker("ERROR: " + str(e))
                 continue
-        return {'children': children}
+        return {}, children
 
     def definition_to_xml(self, resource_fs):
         xml_object = etree.Element('timelimit')
diff --git a/common/lib/xmodule/xmodule/vertical_module.py b/common/lib/xmodule/xmodule/vertical_module.py
index 5827ea96a9..610d180c11 100644
--- a/common/lib/xmodule/xmodule/vertical_module.py
+++ b/common/lib/xmodule/xmodule/vertical_module.py
@@ -8,11 +8,15 @@ from pkg_resources import resource_string
 class_priority = ['video', 'problem']
 
 
-class VerticalModule(XModule):
+class VerticalFields(object):
+    has_children = True
+
+
+class VerticalModule(VerticalFields, XModule):
     ''' Layout module for laying out submodules vertically.'''
 
-    def __init__(self, system, location, definition, descriptor, instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor, instance_state, shared_state, **kwargs)
+    def __init__(self, *args, **kwargs):
+        XModule.__init__(self, *args, **kwargs)
         self.contents = None
 
     def get_html(self):
@@ -42,7 +46,7 @@ class VerticalModule(XModule):
         return new_class
 
 
-class VerticalDescriptor(SequenceDescriptor):
+class VerticalDescriptor(VerticalFields, SequenceDescriptor):
     module_class = VerticalModule
 
     js = {'coffee': [resource_string(__name__, 'js/src/vertical/edit.coffee')]}
diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py
index 27388f7630..0203299b40 100644
--- a/common/lib/xmodule/xmodule/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module.py
@@ -8,9 +8,8 @@ from django.http import Http404
 
 from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
-from xmodule.modulestore.xml import XMLModuleStore
-from xmodule.modulestore.django import modulestore
 from xmodule.contentstore.content import StaticContent
+from xblock.core import Integer, Scope, String
 
 import datetime
 import time
@@ -18,7 +17,13 @@ import time
 log = logging.getLogger(__name__)
 
 
-class VideoModule(XModule):
+class VideoFields(object):
+    data = String(help="XML data for the problem", scope=Scope.content)
+    position = Integer(help="Current position in the video", scope=Scope.student_state, default=0)
+    display_name = String(help="Display name for this module", scope=Scope.settings)
+
+
+class VideoModule(VideoFields, XModule):
     video_time = 0
     icon_class = 'video'
 
@@ -32,23 +37,16 @@ class VideoModule(XModule):
     css = {'scss': [resource_string(__name__, 'css/video/display.scss')]}
     js_module_name = "Video"
 
-    def __init__(self, system, location, definition, descriptor,
-                 instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor,
-                         instance_state, shared_state, **kwargs)
-        xmltree = etree.fromstring(self.definition['data'])
+    def __init__(self, *args, **kwargs):
+        XModule.__init__(self, *args, **kwargs)
+
+        xmltree = etree.fromstring(self.data)
         self.youtube = xmltree.get('youtube')
-        self.position = 0
         self.show_captions = xmltree.get('show_captions', 'true')
         self.source = self._get_source(xmltree)
         self.track = self._get_track(xmltree)
         self.start_time, self.end_time = self._get_timeframe(xmltree)
 
-        if instance_state is not None:
-            state = json.loads(instance_state)
-            if 'position' in state:
-                self.position = int(float(state['position']))
-
     def _get_source(self, xmltree):
         # find the first valid source
         return self._get_first_external(xmltree, 'source')
@@ -120,13 +118,6 @@ class VideoModule(XModule):
         return self.youtube
 
     def get_html(self):
-        if isinstance(modulestore(), XMLModuleStore):
-            # VS[compat]
-            # cdodge: filesystem static content support.
-            caption_asset_path = "/static/{0}/subs/".format(self.metadata['data_dir'])
-        else:
-            caption_asset_path = StaticContent.get_base_url_path_for_course_assets(self.location) + '/subs_'
-
         # We normally let JS parse this, but in the case that we need a hacked
         # out <object> player because YouTube has broken their <iframe> API for
         # the third time in a year, we need to extract it server side.
@@ -144,10 +135,8 @@ class VideoModule(XModule):
             'position': self.position,
             'source': self.source,
             'track': self.track,
-            'display_name': self.display_name,
-            # TODO (cpennington): This won't work when we move to data that isn't on the filesystem
-            'data_dir': self.metadata['data_dir'],
-            'caption_asset_path': caption_asset_path,
+            'display_name': self.display_name_with_default,
+            'caption_asset_path': "/static/subs/",
             'show_captions': self.show_captions,
             'start': self.start_time,
             'end': self.end_time,
@@ -155,7 +144,7 @@ class VideoModule(XModule):
         })
 
 
-class VideoDescriptor(RawDescriptor):
+class VideoDescriptor(VideoFields, RawDescriptor):
     module_class = VideoModule
     stores_state = True
     template_dir_name = "video"
diff --git a/common/lib/xmodule/xmodule/videoalpha_module.py b/common/lib/xmodule/xmodule/videoalpha_module.py
index 5a8504de3a..5ae8d890e6 100644
--- a/common/lib/xmodule/xmodule/videoalpha_module.py
+++ b/common/lib/xmodule/xmodule/videoalpha_module.py
@@ -11,6 +11,7 @@ from xmodule.raw_module import RawDescriptor
 from xmodule.modulestore.mongo import MongoModuleStore
 from xmodule.modulestore.django import modulestore
 from xmodule.contentstore.content import StaticContent
+from xblock.core import Integer, Scope, String
 
 import datetime
 import time
@@ -18,7 +19,13 @@ import time
 log = logging.getLogger(__name__)
 
 
-class VideoAlphaModule(XModule):
+class VideoAlphaFields(object):
+    data = String(help="XML data for the problem", scope=Scope.content)
+    position = Integer(help="Current position in the video", scope=Scope.student_state, default=0)
+    display_name = String(help="Display name for this module", scope=Scope.settings)
+
+
+class VideoAlphaModule(VideoAlphaFields, XModule):
     """
     XML source example:
 
@@ -46,11 +53,9 @@ class VideoAlphaModule(XModule):
     css = {'scss': [resource_string(__name__, 'css/videoalpha/display.scss')]}
     js_module_name = "VideoAlpha"
 
-    def __init__(self, system, location, definition, descriptor,
-                 instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor,
-                         instance_state, shared_state, **kwargs)
-        xmltree = etree.fromstring(self.definition['data'])
+    def __init__(self, *args, **kwargs):
+        XModule.__init__(self, *args, **kwargs)
+        xmltree = etree.fromstring(self.data)
         self.youtube_streams = xmltree.get('youtube')
         self.sub = xmltree.get('sub')
         self.position = 0
@@ -64,11 +69,6 @@ class VideoAlphaModule(XModule):
         self.track = self._get_track(xmltree)
         self.start_time, self.end_time = self._get_timeframe(xmltree)
 
-        if instance_state is not None:
-            state = json.loads(instance_state)
-            if 'position' in state:
-                self.position = int(float(state['position']))
-
     def _get_source(self, xmltree, exts=None):
         """Find the first valid source, which ends with one of `exts`."""
         exts = ['mp4', 'ogv', 'avi', 'webm'] if exts is None else exts
@@ -131,7 +131,7 @@ class VideoAlphaModule(XModule):
         else:
             # VS[compat]
             # cdodge: filesystem static content support.
-            caption_asset_path = "/static/{0}/subs/".format(self.metadata['data_dir'])
+            caption_asset_path = "/static/{0}/subs/".format(getattr(self, 'data_dir', None))
 
         return self.system.render_template('videoalpha.html', {
             'youtube_streams': self.youtube_streams,
@@ -139,9 +139,9 @@ class VideoAlphaModule(XModule):
             'sub': self.sub,
             'sources': self.sources,
             'track': self.track,
-            'display_name': self.display_name,
+            'display_name': self.display_name_with_default,
             # TODO (cpennington): This won't work when we move to data that isn't on the filesystem
-            'data_dir': self.metadata['data_dir'],
+            'data_dir': getattr(self, 'data_dir', None),
             'caption_asset_path': caption_asset_path,
             'show_captions': self.show_captions,
             'start': self.start_time,
@@ -149,7 +149,7 @@ class VideoAlphaModule(XModule):
         })
 
 
-class VideoAlphaDescriptor(RawDescriptor):
+class VideoAlphaDescriptor(VideoAlphaFields, RawDescriptor):
     module_class = VideoAlphaModule
     stores_state = True
     template_dir_name = "videoalpha"
diff --git a/common/lib/xmodule/xmodule/wrapper_module.py b/common/lib/xmodule/xmodule/wrapper_module.py
new file mode 100644
index 0000000000..d675f102bf
--- /dev/null
+++ b/common/lib/xmodule/xmodule/wrapper_module.py
@@ -0,0 +1,26 @@
+# Same as vertical,
+# But w/o css delimiters between children
+
+from xmodule.vertical_module import VerticalModule, VerticalDescriptor
+from pkg_resources import resource_string
+
+# HACK: This shouldn't be hard-coded to two types
+# OBSOLETE: This obsoletes 'type'
+class_priority = ['video', 'problem']
+
+
+class WrapperModule(VerticalModule):
+    ''' Layout module for laying out submodules vertically w/o css delimiters'''
+
+    has_children = True
+    css = {'scss': [resource_string(__name__, 'css/wrapper/display.scss')]}
+
+
+class WrapperDescriptor(VerticalDescriptor):
+    module_class = WrapperModule
+
+    has_children = True
+
+    js = {'coffee': [resource_string(__name__, 'js/src/vertical/edit.coffee')]}
+    js_module_name = "VerticalDescriptor"
+
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index dccc96a7ca..02835e0d5d 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -1,89 +1,23 @@
 import logging
-import pkg_resources
 import yaml
 import os
 
-from functools import partial
 from lxml import etree
-from pprint import pprint
 from collections import namedtuple
 from pkg_resources import resource_listdir, resource_string, resource_isdir
 
 from xmodule.modulestore import Location
-from xmodule.timeparse import parse_time, stringify_time
-
-from xmodule.contentstore.content import StaticContent, XASSET_SRCREF_PREFIX
 from xmodule.modulestore.exceptions import ItemNotFoundError
-import time
 
-log = logging.getLogger('mitx.' + __name__)
+from xblock.core import XBlock, Scope, String
+
+log = logging.getLogger(__name__)
 
 
 def dummy_track(event_type, event):
     pass
 
 
-class ModuleMissingError(Exception):
-    pass
-
-
-class Plugin(object):
-    """
-    Base class for a system that uses entry_points to load plugins.
-
-    Implementing classes are expected to have the following attributes:
-
-        entry_point: The name of the entry point to load plugins from
-    """
-
-    _plugin_cache = None
-
-    @classmethod
-    def load_class(cls, identifier, default=None):
-        """
-        Loads a single class instance specified by identifier. If identifier
-        specifies more than a single class, then logs a warning and returns the
-        first class identified.
-
-        If default is not None, will return default if no entry_point matching
-        identifier is found. Otherwise, will raise a ModuleMissingError
-        """
-        if cls._plugin_cache is None:
-            cls._plugin_cache = {}
-
-        if identifier not in cls._plugin_cache:
-            identifier = identifier.lower()
-            classes = list(pkg_resources.iter_entry_points(
-                    cls.entry_point, name=identifier))
-
-            if len(classes) > 1:
-                log.warning("Found multiple classes for {entry_point} with "
-                            "identifier {id}: {classes}. "
-                            "Returning the first one.".format(
-                    entry_point=cls.entry_point,
-                    id=identifier,
-                    classes=", ".join(
-                            class_.module_name for class_ in classes)))
-
-            if len(classes) == 0:
-                if default is not None:
-                    return default
-                raise ModuleMissingError(identifier)
-
-            cls._plugin_cache[identifier] = classes[0].load()
-        return cls._plugin_cache[identifier]
-
-    @classmethod
-    def load_classes(cls):
-        """
-        Returns a list of containing the identifiers and their corresponding classes for all
-        of the available instances of this plugin
-        """
-        return [(class_.name, class_.load())
-                for class_
-                in pkg_resources.iter_entry_points(cls.entry_point)]
-
-
 class HTMLSnippet(object):
     """
     A base class defining an interface for an object that is able to present an
@@ -148,7 +82,15 @@ class HTMLSnippet(object):
                                   .format(self.__class__))
 
 
-class XModule(HTMLSnippet):
+class XModuleFields(object):
+    display_name = String(
+        help="Display name for this module",
+        scope=Scope.settings,
+        default=None,
+    )
+
+
+class XModule(XModuleFields, HTMLSnippet, XBlock):
     ''' Implements a generic learning module.
 
         Subclasses must at a minimum provide a definition for get_html in order
@@ -165,8 +107,8 @@ class XModule(HTMLSnippet):
     # in the module
     icon_class = 'other'
 
-    def __init__(self, system, location, definition, descriptor,
-                 instance_state=None, shared_state=None, **kwargs):
+
+    def __init__(self, system, location, descriptor, model_data):
         '''
         Construct a new xmodule
 
@@ -174,67 +116,35 @@ class XModule(HTMLSnippet):
 
         location: Something Location-like that identifies this xmodule
 
-        definition: A dictionary containing 'data' and 'children'. Both are
-        optional
-
-            'data': is JSON-like (string, dictionary, list, bool, or None,
-                optionally nested).
-
-                This defines all of the data necessary for a problem to display
-                that is intrinsic to the problem.  It should not include any
-                data that would vary between two courses using the same problem
-                (due dates, grading policy, randomization, etc.)
-
-            'children': is a list of Location-like values for child modules that
-                this module depends on
-
         descriptor: the XModuleDescriptor that this module is an instance of.
             TODO (vshnayder): remove the definition parameter and location--they
             can come from the descriptor.
 
-        instance_state: A string of serialized json that contains the state of
-                this module for current student accessing the system, or None if
-                no state has been saved
-
-        shared_state: A string of serialized json that contains the state that
-            is shared between this module and any modules of the same type with
-            the same shared_state_key. This state is only shared per-student,
-            not across different students
-
-        kwargs: Optional arguments. Subclasses should always accept kwargs and
-            pass them to the parent class constructor.
-
-            Current known uses of kwargs:
-
-                metadata: SCAFFOLDING - This dictionary will be split into
-                    several different types of metadata in the future (course
-                    policy, modification history, etc).  A dictionary containing
-                    data that specifies information that is particular to a
-                    problem in the context of a course
+        model_data: A dictionary-like object that maps field names to values
+            for those fields.
         '''
+        self._model_data = model_data
         self.system = system
         self.location = Location(location)
-        self.definition = definition
         self.descriptor = descriptor
-        self.instance_state = instance_state
-        self.shared_state = shared_state
-        self.id = self.location.url()
         self.url_name = self.location.name
         self.category = self.location.category
-        self.metadata = kwargs.get('metadata', {})
         self._loaded_children = None
 
     @property
-    def display_name(self):
+    def id(self):
+        return self.location.url()
+
+    @property
+    def display_name_with_default(self):
         '''
         Return a display name for the module: use display_name if defined in
         metadata, otherwise convert the url name.
         '''
-        return self.metadata.get('display_name',
-                                 self.url_name.replace('_', ' '))
-
-    def __unicode__(self):
-        return '<x_module(id={0})>'.format(self.id)
+        name = self.display_name
+        if name is None:
+            name = self.url_name.replace('_', ' ')
+        return name
 
     def get_children(self):
         '''
@@ -249,6 +159,9 @@ class XModule(HTMLSnippet):
 
         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
@@ -299,18 +212,6 @@ class XModule(HTMLSnippet):
 
     ### Functions used in the LMS
 
-    def get_instance_state(self):
-        ''' State of the object, as stored in the database
-        '''
-        return '{}'
-
-    def get_shared_state(self):
-        '''
-        Get state that should be shared with other instances
-        using the same 'shared_state_key' attribute.
-        '''
-        return '{}'
-
     def get_score(self):
         """
         Score the student received on the problem, or None if there is no
@@ -411,7 +312,8 @@ class ResourceTemplates(object):
 
         return templates
 
-class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
+
+class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock):
     """
     An XModuleDescriptor is a specification for an element of a course. This
     could be a problem, an organizational element (a group of content), or a
@@ -426,25 +328,15 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
     module_class = XModule
 
     # Attributes for inspection of the descriptor
-    stores_state = False  # Indicates whether the xmodule state should be
+
+    # Indicates whether the xmodule state should be
     # stored in a database (independent of shared state)
-    has_score = False  # This indicates whether the xmodule is a problem-type.
+    stores_state = False
+
+    # This indicates whether the xmodule is a problem-type.
     # It should respond to max_score() and grade(). It can be graded or ungraded
     # (like a practice problem).
-
-    # A list of metadata that this module can inherit from its parent module
-    inheritable_metadata = (
-        'graded', 'start', 'due', 'graceperiod', 'showanswer', 'rerandomize',
-        # TODO (ichuang): used for Fall 2012 xqa server access
-        'xqa_key',
-        # TODO: This is used by the XMLModuleStore to provide for locations for
-        # static files, and will need to be removed when that code is removed
-        'data_dir',
-        # How many days early to show a course element to beta testers (float)
-        # intended to be set per-course, but can be overridden in for specific
-        # elements.  Can be a float.
-        'days_early_for_beta'
-    )
+    has_score = False
 
     # cdodge: this is a list of metadata names which are 'system' metadata
     # and should not be edited by an end-user
@@ -452,17 +344,33 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
 
     # A list of descriptor attributes that must be equal for the descriptors to
     # be equal
-    equality_attributes = ('definition', 'metadata', 'location',
-                           'shared_state_key', '_inherited_metadata')
+    equality_attributes = ('_model_data', 'location')
 
     # Name of resource directory to load templates from
     template_dir_name = "default"
 
+    # Class level variable
+    always_recalculate_grades = False
+    """
+    Return whether this descriptor always requires recalculation of grades, for
+    example if the score can change via an extrnal service, not just when the
+    student interacts with the module on the page.  A specific example is
+    FoldIt, which posts grade-changing updates through a separate API.
+    """
+
+    # VS[compat].  Backwards compatibility code that can go away after
+    # importing 2012 courses.
+    # A set of metadata key conversions that we want to make
+    metadata_translations = {
+        'slug': 'url_name',
+        'name': 'display_name',
+        }
+
     # ============================= STRUCTURAL MANIPULATION ===================
     def __init__(self,
                  system,
-                 definition=None,
-                 **kwargs):
+                 location,
+                 model_data):
         """
         Construct a new XModuleDescriptor. The only required arguments are the
         system, used for interaction with external resources, and the
@@ -475,124 +383,33 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
 
         system: A DescriptorSystem for interacting with external resources
 
-        definition: A dict containing `data` and `children` representing the
-        problem definition
+        location: Something Location-like that identifies this xmodule
 
-        Current arguments passed in kwargs:
-
-            location: A xmodule.modulestore.Location object indicating the name
-                and ownership of this problem
-
-            shared_state_key: The key to use for sharing StudentModules with
-                other modules of this type
-
-            metadata: A dictionary containing the following optional keys:
-                goals: A list of strings of learning goals associated with this
-                    module
-                display_name: The name to use for displaying this module to the
-                    user
-                url_name: The name to use for this module in urls and other places
-                    where a unique name is needed.
-                format: The format of this module ('Homework', 'Lab', etc)
-                graded (bool): Whether this module is should be graded or not
-                start (string): The date for which this module will be available
-                due (string): The due date for this module
-                graceperiod (string): The amount of grace period to allow when
-                    enforcing the due date
-                showanswer (string): When to show answers for this module
-                rerandomize (string): When to generate a newly randomized
-                    instance of the module data
+        model_data: A dictionary-like object that maps field names to values
+            for those fields.
         """
         self.system = system
-        self.metadata = kwargs.get('metadata', {})
-        self.definition = definition if definition is not None else {}
-        self.location = Location(kwargs.get('location'))
+        self.location = Location(location)
         self.url_name = self.location.name
         self.category = self.location.category
-        self.shared_state_key = kwargs.get('shared_state_key')
+        self._model_data = model_data
 
         self._child_instances = None
-        self._inherited_metadata = set()
-
-
-    # Class level variable
-    always_recalculate_grades = False
-    """
-    Return whether this descriptor always requires recalculation of grades, for
-    example if the score can change via an extrnal service, not just when the
-    student interacts with the module on the page.  A specific example is
-    FoldIt, which posts grade-changing updates through a separate API.
-    """
 
     @property
-    def display_name(self):
+    def id(self):
+        return self.location.url()
+
+    @property
+    def display_name_with_default(self):
         '''
         Return a display name for the module: use display_name if defined in
         metadata, otherwise convert the url name.
         '''
-        return self.metadata.get('display_name',
-                                 self.url_name.replace('_', ' '))
-
-    @property
-    def start(self):
-        """
-        If self.metadata contains a valid start time, return it as a time struct.
-        Else return None.
-        """
-        if 'start' not in self.metadata:
-            return None
-        return self._try_parse_time('start')
-
-    @start.setter
-    def start(self, value):
-        if isinstance(value, time.struct_time):
-            self.metadata['start'] = stringify_time(value)
-
-    @property
-    def days_early_for_beta(self):
-        """
-        If self.metadata contains start, return the number, as a float.  Else return None.
-        """
-        if 'days_early_for_beta' not in self.metadata:
-            return None
-        try:
-            return float(self.metadata['days_early_for_beta'])
-        except ValueError:
-            return None
-
-
-    @property
-    def own_metadata(self):
-        """
-        Return the metadata that is not inherited, but was defined on this module.
-        """
-        return dict((k, v) for k, v in self.metadata.items()
-                    if k not in self._inherited_metadata)
-
-    @staticmethod
-    def compute_inherited_metadata(node):
-        """Given a descriptor, traverse all of its descendants and do metadata
-        inheritance.  Should be called on a CourseDescriptor after importing a
-        course.
-
-        NOTE: This means that there is no such thing as lazy loading at the
-        moment--this accesses all the children."""
-        for c in node.get_children():
-            c.inherit_metadata(node.metadata)
-            XModuleDescriptor.compute_inherited_metadata(c)
-
-    def inherit_metadata(self, metadata):
-        """
-        Updates this module with metadata inherited from a containing module.
-        Only metadata specified in inheritable_metadata will
-        be inherited
-        """
-        # Set all inheritable metadata from kwargs that are
-        # in inheritable_metadata and aren't already set in metadata
-        for attr in self.inheritable_metadata:
-            if attr not in self.metadata and attr in metadata:
-                self._inherited_metadata.add(attr)
-                self.metadata[attr] = metadata[attr]
+        name = self.display_name
+        if name is None:
+            name = self.url_name.replace('_', ' ')
+        return name
 
     def get_required_module_descriptors(self):
         """Returns a list of XModuleDescritpor instances upon which this module depends, but are
@@ -602,18 +419,17 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
     def get_children(self):
         """Returns a list of XModuleDescriptor instances for the children of
         this module"""
+        if not self.has_children:
+            return []
+
         if self._child_instances is None:
             self._child_instances = []
-            for child_loc in self.definition.get('children', []):
+            for child_loc in self.children:
                 try:
                     child = self.system.load_item(child_loc)
                 except ItemNotFoundError:
                     log.exception('Unable to load item {loc}, skipping'.format(loc=child_loc))
                     continue
-                # TODO (vshnayder): this should go away once we have
-                # proper inheritance support in mongo.  The xml
-                # datastore does all inheritance on course load.
-                child.inherit_metadata(self.metadata)
                 self._child_instances.append(child)
 
         return self._child_instances
@@ -627,22 +443,19 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
                 return child
         return None
 
-    def xmodule_constructor(self, system):
+    def xmodule(self, system):
         """
-        Returns a constructor for an XModule. This constructor takes two
-        arguments: instance_state and shared_state, and returns a fully
-        instantiated XModule
+        Returns an XModule.
+
+        system: Module system
         """
-        return partial(
-            self.module_class,
+        return self.module_class(
             system,
             self.location,
-            self.definition,
             self,
-            metadata=self.metadata
+            system.xblock_model_data(self),
         )
 
-
     def has_dynamic_children(self):
         """
         Returns True if this descriptor has dynamic children for a given
@@ -662,7 +475,7 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
         on the contents of json_data.
 
         json_data must contain a 'location' element, and must be suitable to be
-        passed into the subclasses `from_json` method.
+        passed into the subclasses `from_json` method as model_data
         """
         class_ = XModuleDescriptor.load_class(
             json_data['location']['category'],
@@ -676,12 +489,44 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
         Creates an instance of this descriptor from the supplied json_data.
         This may be overridden by subclasses
 
-        json_data: A json object specifying the definition and any optional
-            keyword arguments for the XModuleDescriptor
+        json_data: A json object with the keys 'definition' and 'metadata',
+            definition: A json object with the keys 'data' and 'children'
+                data: A json value
+                children: A list of edX Location urls
+            metadata: A json object with any keys
+
+        This json_data is transformed to model_data using the following rules:
+            1) The model data contains all of the fields from metadata
+            2) The model data contains the 'children' array
+            3) If 'definition.data' is a json object, model data contains all of its fields
+               Otherwise, it contains the single field 'data'
+            4) Any value later in this list overrides a value earlier in this list
 
         system: A DescriptorSystem for interacting with external resources
         """
-        return cls(system=system, **json_data)
+        model_data = {}
+
+        for key, value in json_data.get('metadata', {}).items():
+            model_data[cls._translate(key)] = value
+
+        model_data.update(json_data.get('metadata', {}))
+
+        definition = json_data.get('definition', {})
+        if 'children' in definition:
+            model_data['children'] = definition['children']
+
+        if 'data' in definition:
+            if isinstance(definition['data'], dict):
+                model_data.update(definition['data'])
+            else:
+                model_data['data'] = definition['data']
+
+        return cls(system=system, location=json_data['location'], model_data=model_data)
+
+    @classmethod
+    def _translate(cls, key):
+        'VS[compat]'
+        return cls.metadata_translations.get(key, key)
 
     # ================================= XML PARSING ============================
     @staticmethod
@@ -758,42 +603,17 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
                 all(getattr(self, attr, None) == getattr(other, attr, None)
                     for attr in self.equality_attributes))
 
-        if not eq:
-            for attr in self.equality_attributes:
-                pprint((getattr(self, attr, None),
-                       getattr(other, attr, None),
-                       getattr(self, attr, None) == getattr(other, attr, None)))
-
         return eq
 
     def __repr__(self):
-        return ("{class_}({system!r}, {definition!r}, location={location!r},"
-                " metadata={metadata!r})".format(
+        return ("{class_}({system!r}, location={location!r},"
+                " model_data={model_data!r})".format(
             class_=self.__class__.__name__,
             system=self.system,
-            definition=self.definition,
             location=self.location,
-            metadata=self.metadata
+            model_data=self._model_data,
         ))
 
-    # ================================ Internal helpers =======================
-
-    def _try_parse_time(self, key):
-        """
-        Parse an optional metadata key containing a time: if present, complain
-        if it doesn't parse.
-
-        Returns a time_struct, or None if metadata key is not present or is invalid.
-        """
-        if key in self.metadata:
-            try:
-                return parse_time(self.metadata[key])
-            except ValueError as e:
-                msg = "Descriptor {0} loaded with a bad metadata key '{1}': '{2}'".format(
-                    self.location.url(), self.metadata[key], e)
-                log.warning(msg)
-        return None
-
 
 class DescriptorSystem(object):
     def __init__(self, load_item, resources_fs, error_tracker, **kwargs):
@@ -872,10 +692,12 @@ class ModuleSystem(object):
                  get_module,
                  render_template,
                  replace_urls,
+                 xblock_model_data,
                  user=None,
                  filestore=None,
                  debug=False,
                  xqueue=None,
+                 publish=None,
                  node_path="",
                  anonymous_student_id='',
                  course_id=None,
@@ -917,6 +739,11 @@ class ModuleSystem(object):
         anonymous_student_id - Used for tracking modules with student id
 
         course_id - the course_id containing this module
+
+        publish(event) - A function that allows XModules to publish events (such as grade changes)
+
+        xblock_model_data - A dict-like object containing the all data available to this
+            xblock
         '''
         self.ajax_url = ajax_url
         self.xqueue = xqueue
@@ -931,6 +758,13 @@ class ModuleSystem(object):
         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.xblock_model_data = xblock_model_data
+
+        if publish is None:
+            publish = lambda e: None
+
+        self.publish = publish
+
         self.open_ended_grading_interface = open_ended_grading_interface
         self.s3_interface = s3_interface
 
diff --git a/common/lib/xmodule/xmodule/xml_module.py b/common/lib/xmodule/xmodule/xml_module.py
index 7087a03759..e5c1708ac4 100644
--- a/common/lib/xmodule/xmodule/xml_module.py
+++ b/common/lib/xmodule/xmodule/xml_module.py
@@ -6,8 +6,10 @@ import sys
 from collections import namedtuple
 from lxml import etree
 
+from xblock.core import Object, Scope
 from xmodule.x_module import (XModuleDescriptor, policy_key)
 from xmodule.modulestore import Location
+from xmodule.modulestore.inheritance import own_metadata
 
 log = logging.getLogger(__name__)
 
@@ -82,6 +84,8 @@ class XmlDescriptor(XModuleDescriptor):
     Mixin class for standardized parsing of from xml
     """
 
+    xml_attributes = Object(help="Map of unhandled xml attributes, used only for storage between import and export", default={}, scope=Scope.settings)
+
     # Extension to append to filename paths
     filename_extension = 'xml'
 
@@ -109,7 +113,9 @@ class XmlDescriptor(XModuleDescriptor):
             'tabs', 'grading_policy', 'is_draft', 'published_by', 'published_date',
             'discussion_blackouts', 'testcenter_info',
            # VS[compat] -- remove the below attrs once everything is in the CMS
-           'course', 'org', 'url_name', 'filename')
+           'course', 'org', 'url_name', 'filename',
+           # Used for storing xml attributes between import and export, for roundtrips
+           'xml_attributes')
 
     metadata_to_export_to_policy = ('discussion_topics')
 
@@ -132,20 +138,6 @@ class XmlDescriptor(XModuleDescriptor):
     }
 
 
-    # VS[compat].  Backwards compatibility code that can go away after
-    # importing 2012 courses.
-    # A set of metadata key conversions that we want to make
-    metadata_translations = {
-        'slug': 'url_name',
-        'name': 'display_name',
-        }
-
-    @classmethod
-    def _translate(cls, key):
-        'VS[compat]'
-        return cls.metadata_translations.get(key, key)
-
-
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         """
@@ -227,15 +219,11 @@ class XmlDescriptor(XModuleDescriptor):
 
         definition_metadata = get_metadata_from_xml(definition_xml)
         cls.clean_metadata_from_xml(definition_xml)
-        definition = cls.definition_from_xml(definition_xml, system)
+        definition, children = cls.definition_from_xml(definition_xml, system)
         if definition_metadata:
             definition['definition_metadata'] = definition_metadata
 
-        # TODO (ichuang): remove this after migration
-        # for Fall 2012 LMS migration: keep filename (and unmangled filename)
-        definition['filename'] = [filepath, filename]
-
-        return definition
+        return definition, children
 
     @classmethod
     def load_metadata(cls, xml_object):
@@ -268,7 +256,7 @@ class XmlDescriptor(XModuleDescriptor):
         """
         for attr in policy:
             attr_map = cls.xml_attribute_map.get(attr, AttrMap())
-            metadata[attr] = attr_map.from_xml(policy[attr])
+            metadata[cls._translate(attr)] = attr_map.from_xml(policy[attr])
 
     @classmethod
     def from_xml(cls, xml_data, system, org=None, course=None):
@@ -294,9 +282,10 @@ class XmlDescriptor(XModuleDescriptor):
             filepath = cls._format_filepath(xml_object.tag, name_to_pathname(url_name))
             definition_xml = cls.load_file(filepath, system.resources_fs, location)
         else:
-            definition_xml = xml_object  	# this is just a pointer, not the real definition content
+            definition_xml = xml_object  # this is just a pointer, not the real definition content
+
+        definition, children = cls.load_definition(definition_xml, system, location)  # note this removes metadata
 
-        definition = cls.load_definition(definition_xml, system, location)  	# note this removes metadata
         # VS[compat] -- make Ike's github preview links work in both old and
         # new file layouts
         if is_pointer_tag(xml_object):
@@ -320,11 +309,20 @@ class XmlDescriptor(XModuleDescriptor):
         if k in system.policy:
             cls.apply_policy(metadata, system.policy[k])
 
+        model_data = {}
+        model_data.update(metadata)
+        model_data.update(definition)
+        model_data['children'] = children
+
+        model_data['xml_attributes'] = {}
+        for key, value in metadata.items():
+            if key not in set(f.name for f in cls.fields + cls.lms.fields):
+                model_data['xml_attributes'][key] = value
+
         return cls(
             system,
-            definition,
-            location=location,
-            metadata=metadata,
+            location,
+            model_data,
         )
 
     @classmethod
@@ -345,7 +343,7 @@ class XmlDescriptor(XModuleDescriptor):
 
     def export_to_xml(self, resource_fs):
         """
-        Returns an xml string representing this module, and all modules
+        Returns an xml string representign this module, and all modules
         underneath it.  May also write required resources out to resource_fs
 
         Assumes that modules have single parentage (that no module appears twice
@@ -371,10 +369,10 @@ class XmlDescriptor(XModuleDescriptor):
             (Possible format conversion through an AttrMap).
              """
             attr_map = self.xml_attribute_map.get(attr, AttrMap())
-            return attr_map.to_xml(self.own_metadata[attr])
+            return attr_map.to_xml(self._model_data[attr])
 
         # Add the non-inherited metadata
-        for attr in sorted(self.own_metadata):
+        for attr in sorted(own_metadata(self)):
             # don't want e.g. data_dir
             if attr not in self.metadata_to_strip and attr not in self.metadata_to_export_to_policy:
                 val = val_for_xml(attr)
@@ -385,6 +383,10 @@ class XmlDescriptor(XModuleDescriptor):
                     logging.exception('Failed to serialize metadata attribute {0} with value {1}. This could mean data loss!!!  Exception: {2}'.format(attr, val, e))
                     pass
 
+        for key, value in self.xml_attributes.items():
+            if key not in self.metadata_to_strip:
+                xml_object.set(key, value)
+
         if self.export_to_file():
             # Write the definition to a file
             url_path = name_to_pathname(self.url_name)
diff --git a/common/static/coffee/src/discussion/content.coffee b/common/static/coffee/src/discussion/content.coffee
index 4e612dfc40..00c34df686 100644
--- a/common/static/coffee/src/discussion/content.coffee
+++ b/common/static/coffee/src/discussion/content.coffee
@@ -79,6 +79,17 @@ if Backbone?
           @getContent(id).updateInfo(info)
       $.extend @contentInfos, infos
 
+    pinThread: ->
+      pinned = @get("pinned")
+      @set("pinned",pinned)
+      @trigger "change", @
+
+    unPinThread: ->
+      pinned = @get("pinned")
+      @set("pinned",pinned)
+      @trigger "change", @
+
+
   class @Thread extends @Content
     urlMappers:
       'retrieve' : -> DiscussionUtil.urlFor('retrieve_single_thread', @discussion.id, @id)
@@ -91,6 +102,8 @@ if Backbone?
       'delete'   : -> DiscussionUtil.urlFor('delete_thread', @id)
       'follow'   : -> DiscussionUtil.urlFor('follow_thread', @id)
       'unfollow' : -> DiscussionUtil.urlFor('unfollow_thread', @id)
+      'pinThread'   : -> DiscussionUtil.urlFor("pin_thread", @id)
+      'unPinThread' : -> DiscussionUtil.urlFor("un_pin_thread", @id)
 
     initialize: ->
       @set('thread', @)
diff --git a/common/static/coffee/src/discussion/discussion.coffee b/common/static/coffee/src/discussion/discussion.coffee
index 9cee068b74..83e25e1da7 100644
--- a/common/static/coffee/src/discussion/discussion.coffee
+++ b/common/static/coffee/src/discussion/discussion.coffee
@@ -58,10 +58,31 @@ if Backbone?
           @current_page = response.page
 
     sortByDate: (thread) ->
-      thread.get("created_at")
+        #   
+        #The comment client asks each thread for a value by which to sort the collection
+        #and calls this sort routine regardless of the order returned from the LMS/comments service
+        #so, this takes advantage of this per-thread value and returns tomorrow's date
+        #for pinned threads, ensuring that they appear first, (which is the intent of pinned threads)
+        #
+        if thread.get('pinned')
+          #use tomorrow's date
+          today = new Date();
+          new Date(today.getTime() + (24 * 60 * 60 * 1000));
+        else
+          thread.get("created_at")
+
 
     sortByDateRecentFirst: (thread) ->
-      -(new Date(thread.get("created_at")).getTime())
+        #
+        #Same as above
+        #but negative to flip the order (newest first)
+        #
+        if thread.get('pinned')
+          #use tomorrow's date
+          today = new Date();
+          -(new Date(today.getTime() + (24 * 60 * 60 * 1000)));
+        else
+          -(new Date(thread.get("created_at")).getTime())
       #return String.fromCharCode.apply(String,
       #  _.map(thread.get("created_at").split(""),
       #        ((c) -> return 0xffff - c.charChodeAt()))
diff --git a/common/static/coffee/src/discussion/utils.coffee b/common/static/coffee/src/discussion/utils.coffee
index 6b2714dc54..41f52f1711 100644
--- a/common/static/coffee/src/discussion/utils.coffee
+++ b/common/static/coffee/src/discussion/utils.coffee
@@ -50,6 +50,8 @@ class @DiscussionUtil
       delete_thread           : "/courses/#{$$course_id}/discussion/threads/#{param}/delete"
       upvote_thread           : "/courses/#{$$course_id}/discussion/threads/#{param}/upvote"
       downvote_thread         : "/courses/#{$$course_id}/discussion/threads/#{param}/downvote"
+      pin_thread              : "/courses/#{$$course_id}/discussion/threads/#{param}/pin"   
+      un_pin_thread           : "/courses/#{$$course_id}/discussion/threads/#{param}/unpin"
       undo_vote_for_thread    : "/courses/#{$$course_id}/discussion/threads/#{param}/unvote"
       follow_thread           : "/courses/#{$$course_id}/discussion/threads/#{param}/follow"
       unfollow_thread         : "/courses/#{$$course_id}/discussion/threads/#{param}/unfollow"
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 6320c3d1e3..a5a1deac10 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
@@ -3,6 +3,7 @@ if Backbone?
 
     events:
       "click .discussion-vote": "toggleVote"
+      "click .admin-pin": "togglePin"
       "click .action-follow": "toggleFollowing"
       "click .action-edit": "edit"
       "click .action-delete": "delete"
@@ -24,6 +25,7 @@ if Backbone?
       @delegateEvents()
       @renderDogear()
       @renderVoted()
+      @renderPinned()
       @renderAttrs()
       @$("span.timeago").timeago()
       @convertMath()
@@ -41,8 +43,20 @@ if Backbone?
       else
         @$("[data-role=discussion-vote]").removeClass("is-cast")
 
+    renderPinned: =>
+      if @model.get("pinned")
+        @$("[data-role=thread-pin]").addClass("pinned")  
+        @$("[data-role=thread-pin]").removeClass("notpinned")  
+        @$(".discussion-pin .pin-label").html("Pinned")
+      else
+        @$("[data-role=thread-pin]").removeClass("pinned")  
+        @$("[data-role=thread-pin]").addClass("notpinned")  
+        @$(".discussion-pin .pin-label").html("Pin Thread")
+
+
     updateModelDetails: =>
       @renderVoted()
+      @renderPinned()
       @$("[data-role=discussion-vote] .votes-count-number").html(@model.get("votes")["up_count"])
 
     convertMath: ->
@@ -99,6 +113,34 @@ if Backbone?
     delete: (event) ->
       @trigger "thread:delete", event
 
+    togglePin: (event) ->
+      event.preventDefault()
+      if @model.get('pinned')
+        @unPin()
+      else
+        @pin()
+      
+    pin: ->
+      url = @model.urlFor("pinThread")
+      DiscussionUtil.safeAjax
+        $elem: @$(".discussion-pin")
+        url: url
+        type: "POST"
+        success: (response, textStatus) =>
+          if textStatus == 'success'
+            @model.set('pinned', true)      
+       
+    unPin: ->
+      url = @model.urlFor("unPinThread")
+      DiscussionUtil.safeAjax
+        $elem: @$(".discussion-pin")
+        url: url
+        type: "POST"
+        success: (response, textStatus) =>
+          if textStatus == 'success'
+            @model.set('pinned', false)
+
+
     toggleClosed: (event) ->
       $elem = $(event.target)
       url = @model.urlFor('close')
@@ -137,3 +179,5 @@ if Backbone?
       if @model.get('username')?
         params = $.extend(params, user:{username: @model.username, user_url: @model.user_url})
       Mustache.render(@template, params)
+
+     
\ No newline at end of file
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 da875c4329..ad3da20e94 100644
--- a/common/static/js/capa/drag_and_drop/base_image.js
+++ b/common/static/js/capa/drag_and_drop/base_image.js
@@ -1,9 +1,4 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-//
-// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
-
 define(['logme'], function (logme) {
     return BaseImage;
 
@@ -50,10 +45,5 @@ define(['logme'], function (logme) {
             baseImageElContainer.appendTo(state.containerEl);
         });
     }
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
+}); // End-of: define(['logme'], function (logme) {
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define) {
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 e6c1e4d3c1..d84a8da913 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -1,9 +1,4 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-//
-// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
-
 define(['logme'], function (logme) {
     return configParser;
 
@@ -16,7 +11,7 @@ define(['logme'], function (logme) {
             'targetOutline': true,
             'labelBgColor': '#d6d6d6',
             'individualTargets': null, // Depends on 'targets'.
-            'errors': 0 // Number of errors found while parsing config.
+            'foundErrors': false // Whether or not we find errors while processing the config.
         };
 
         getDraggables(state, config);
@@ -28,7 +23,7 @@ define(['logme'], function (logme) {
 
         setIndividualTargets(state);
 
-        if (state.config.errors !== 0) {
+        if (state.config.foundErrors !== false) {
             return false;
         }
 
@@ -38,35 +33,34 @@ define(['logme'], function (logme) {
     function getDraggables(state, config) {
         if (config.hasOwnProperty('draggables') === false) {
             logme('ERROR: "config" does not have a property "draggables".');
-            state.config.errors += 1;
+            state.config.foundErrors = true;
         } else if ($.isArray(config.draggables) === true) {
-            (function (i) {
-                while (i < config.draggables.length) {
-                    if (processDraggable(state, config.draggables[i]) !== true) {
-                        state.config.errors += 1;
-                    }
-                    i += 1;
+            config.draggables.every(function (draggable) {
+                if (processDraggable(state, draggable) !== true) {
+                    state.config.foundErrors = true;
+
+                    // Exit immediately from .every() call.
+                    return false;
                 }
-            }(0));
-        } else if ($.isPlainObject(config.draggables) === true) {
-            if (processDraggable(state, config.draggables) !== true) {
-                state.config.errors += 1;
-            }
+
+                // Continue to next .every() call.
+                return true;
+            });
         } else {
             logme('ERROR: The type of config.draggables is no supported.');
-            state.config.errors += 1;
+            state.config.foundErrors = true;
         }
     }
 
     function getBaseImage(state, config) {
         if (config.hasOwnProperty('base_image') === false) {
             logme('ERROR: "config" does not have a property "base_image".');
-            state.config.errors += 1;
+            state.config.foundErrors = true;
         } else if (typeof config.base_image === 'string') {
             state.config.baseImage = config.base_image;
         } else {
             logme('ERROR: Property config.base_image is not of type "string".');
-            state.config.errors += 1;
+            state.config.foundErrors = true;
         }
     }
 
@@ -77,28 +71,27 @@ define(['logme'], function (logme) {
             // Draggables can be positioned anywhere on the image, and the server will
             // get an answer in the form of (x, y) coordinates for each draggable.
         } else if ($.isArray(config.targets) === true) {
-            (function (i) {
-                while (i < config.targets.length) {
-                    if (processTarget(state, config.targets[i]) !== true) {
-                        state.config.errors += 1;
-                    }
-                    i += 1;
+            config.targets.every(function (target) {
+                if (processTarget(state, target) !== true) {
+                    state.config.foundErrors = true;
+
+                    // Exit immediately from .every() call.
+                    return false;
                 }
-            }(0));
-        } else if ($.isPlainObject(config.targets) === true) {
-            if (processTarget(state, config.targets) !== true) {
-                state.config.errors += 1;
-            }
+
+                // Continue to next .every() call.
+                return true;
+            });
         } else {
             logme('ERROR: Property config.targets is not of a supported type.');
-            state.config.errors += 1;
+            state.config.foundErrors = true;
         }
     }
 
     function getOnePerTarget(state, config) {
         if (config.hasOwnProperty('one_per_target') === false) {
             logme('ERROR: "config" does not have a property "one_per_target".');
-            state.config.errors += 1;
+            state.config.foundErrors = true;
         } else if (typeof config.one_per_target === 'string') {
             if (config.one_per_target.toLowerCase() === 'true') {
                 state.config.onePerTarget = true;
@@ -106,42 +99,45 @@ define(['logme'], function (logme) {
                 state.config.onePerTarget = false;
             } else {
                 logme('ERROR: Property config.one_per_target can either be "true", or "false".');
-                state.config.errors += 1;
+                state.config.foundErrors = true;
             }
         } else {
             logme('ERROR: Property config.one_per_target is not of a supported type.');
-            state.config.errors += 1;
+            state.config.foundErrors = true;
         }
     }
 
     function getTargetOutline(state, config) {
-        if (config.hasOwnProperty('target_outline') === false) {
-            // It is possible that no "target_outline" was specified. This is not an error.
-            // In this case the default value of 'true' (boolean) will be used.
-        } else if (typeof config.target_outline === 'string') {
-            if (config.target_outline.toLowerCase() === 'true') {
-                state.config.targetOutline = true;
-            } else if (config.target_outline.toLowerCase() === 'false') {
-                state.config.targetOutline = false;
+        // It is possible that no "target_outline" was specified. This is not an error.
+        // In this case the default value of 'true' (boolean) will be used.
+
+        if (config.hasOwnProperty('target_outline') === true) {
+            if (typeof config.target_outline === 'string') {
+                if (config.target_outline.toLowerCase() === 'true') {
+                    state.config.targetOutline = true;
+                } else if (config.target_outline.toLowerCase() === 'false') {
+                    state.config.targetOutline = false;
+                } else {
+                    logme('ERROR: Property config.target_outline can either be "true", or "false".');
+                    state.config.foundErrors = true;
+                }
             } else {
-                logme('ERROR: Property config.target_outline can either be "true", or "false".');
-                state.config.errors += 1;
+                logme('ERROR: Property config.target_outline is not of a supported type.');
+                state.config.foundErrors = true;
             }
-        } else {
-            logme('ERROR: Property config.target_outline is not of a supported type.');
-            state.config.errors += 1;
         }
     }
 
     function getLabelBgColor(state, config) {
-        if (config.hasOwnProperty('label_bg_color') === false) {
-            // It is possible that no "label_bg_color" was specified. This is not an error.
-            // In this case the default value of '#d6d6d6' (string) will be used.
-        } else if (typeof config.label_bg_color === 'string') {
-            state.config.labelBgColor = config.label_bg_color;
-        } else {
-            logme('ERROR: Property config.label_bg_color is not of a supported type.');
-            returnStatus = false;
+        // It is possible that no "label_bg_color" was specified. This is not an error.
+        // In this case the default value of '#d6d6d6' (string) will be used.
+
+        if (config.hasOwnProperty('label_bg_color') === true) {
+            if (typeof config.label_bg_color === 'string') {
+                state.config.labelBgColor = config.label_bg_color;
+            } else {
+                logme('ERROR: Property config.label_bg_color is not of a supported type.');
+            }
         }
     }
 
@@ -159,17 +155,36 @@ define(['logme'], function (logme) {
             (attrIsString(obj, 'icon') === false) ||
             (attrIsString(obj, 'label') === false) ||
 
-            (attrIsBoolean(obj, 'can_reuse', false) === false)
+            (attrIsBoolean(obj, 'can_reuse', false) === false) ||
+
+            (obj.hasOwnProperty('target_fields') === false)
         ) {
             return false;
         }
 
+        // Check that all targets in the 'target_fields' property are proper target objects.
+        // We will be testing the return value from .every() call (it can be 'true' or 'false').
+        if (obj.target_fields.every(
+            function (targetObj) {
+                return processTarget(state, targetObj, false);
+            }
+        ) === false) {
+            return false;
+        }
+
         state.config.draggables.push(obj);
 
         return true;
     }
 
-    function processTarget(state, obj) {
+    // We need 'pushToState' parameter in order to simply test an object for the fact that it is a
+    // proper target (without pushing it to the 'state' object). When
+    //
+    //     pushToState === false
+    //
+    // the object being tested is not going to be pushed to 'state'. The function will onyl return
+    // 'true' or 'false.
+    function processTarget(state, obj, pushToState) {
         if (
             (attrIsString(obj, 'id') === false) ||
 
@@ -182,7 +197,9 @@ define(['logme'], function (logme) {
             return false;
         }
 
-        state.config.targets.push(obj);
+        if (pushToState !== false) {
+            state.config.targets.push(obj);
+        }
 
         return true;
     }
@@ -250,10 +267,5 @@ define(['logme'], function (logme) {
 
         return true;
     }
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
+}); // End-of: define(['logme'], function (logme) {
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define) {
diff --git a/common/static/js/capa/drag_and_drop/container.js b/common/static/js/capa/drag_and_drop/container.js
index e5a7de447f..0c627f12d3 100644
--- a/common/static/js/capa/drag_and_drop/container.js
+++ b/common/static/js/capa/drag_and_drop/container.js
@@ -1,9 +1,4 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-//
-// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
-
 define(['logme'], function (logme) {
     return Container;
 
@@ -21,10 +16,5 @@ define(['logme'], function (logme) {
 
         $('#inputtype_' + state.problemId).before(state.containerEl);
     }
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
+}); // End-of: define(['logme'], function (logme) {
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define) {
diff --git a/common/static/js/capa/drag_and_drop/draggable_events.js b/common/static/js/capa/drag_and_drop/draggable_events.js
new file mode 100644
index 0000000000..73d03b3cfd
--- /dev/null
+++ b/common/static/js/capa/drag_and_drop/draggable_events.js
@@ -0,0 +1,131 @@
+(function (requirejs, require, define) {
+define(['logme'], function (logme) {
+return {
+    'attachMouseEventsTo': function (element) {
+        var self;
+
+        self = this;
+
+        this[element].mousedown(function (event) {
+            self.mouseDown(event);
+        });
+        this[element].mouseup(function (event) {
+            self.mouseUp(event);
+        });
+        this[element].mousemove(function (event) {
+            self.mouseMove(event);
+        });
+    },
+
+    'mouseDown': function (event) {
+        if (this.mousePressed === false) {
+            // So that the browser does not perform a default drag.
+            // If we don't do this, each drag operation will
+            // potentially cause the highlghting of the dragged element.
+            event.preventDefault();
+            event.stopPropagation();
+
+            if (this.numDraggablesOnMe > 0) {
+                return;
+            }
+
+            // If this draggable is just being dragged out of the
+            // container, we must perform some additional tasks.
+            if (this.inContainer === true) {
+                if ((this.isReusable === true) && (this.isOriginal === true)) {
+                    this.makeDraggableCopy(function (draggableCopy) {
+                        draggableCopy.mouseDown(event);
+                    });
+
+                    return;
+                }
+
+                if (this.isOriginal === true) {
+                    this.containerEl.hide();
+                    this.iconEl.detach();
+                }
+
+                if (this.iconImgEl !== null) {
+                    this.iconImgEl.css({
+                        'width': this.iconWidth,
+                        'height': this.iconHeight
+                    });
+                }
+                this.iconEl.css({
+                    'background-color': this.iconElBGColor,
+                    'padding-left': this.iconElPadding,
+                    'padding-right': this.iconElPadding,
+                    'border': this.iconElBorder,
+                    'width': this.iconWidth,
+                    'height': this.iconHeight,
+                    'left': event.pageX - this.state.baseImageEl.offset().left - this.iconWidth * 0.5 - this.iconElLeftOffset,
+                    'top': event.pageY - this.state.baseImageEl.offset().top - this.iconHeight * 0.5
+                });
+                this.iconEl.appendTo(this.state.baseImageEl.parent());
+
+                if (this.labelEl !== null) {
+                    if (this.isOriginal === true) {
+                        this.labelEl.detach();
+                    }
+                    this.labelEl.css({
+                        'background-color': this.state.config.labelBgColor,
+                        'padding-left': 8,
+                        'padding-right': 8,
+                        'border': '1px solid black',
+                        'left': event.pageX - this.state.baseImageEl.offset().left - this.labelWidth * 0.5 - 9, // Account for padding, border.
+                        'top': event.pageY - this.state.baseImageEl.offset().top + this.iconHeight * 0.5 + 5
+                    });
+                    this.labelEl.appendTo(this.state.baseImageEl.parent());
+                }
+
+                this.inContainer = false;
+                if (this.isOriginal === true) {
+                    this.state.numDraggablesInSlider -= 1;
+                }
+            }
+
+            this.zIndex = 1000;
+            this.iconEl.css('z-index', '1000');
+            if (this.labelEl !== null) {
+                this.labelEl.css('z-index', '1000');
+            }
+
+            this.mousePressed = true;
+            this.state.currentMovingDraggable = this;
+        }
+    },
+
+    'mouseUp': function () {
+        if (this.mousePressed === true) {
+            this.state.currentMovingDraggable = null;
+
+            this.checkLandingElement();
+        }
+    },
+
+    'mouseMove': function (event) {
+        if (this.mousePressed === true) {
+            // Because we have also attached a 'mousemove' event to the
+            // 'document' (that will do the same thing), let's tell the
+            // browser not to bubble up this event. The attached event
+            // on the 'document' will only be triggered when the mouse
+            // pointer leaves the draggable while it is in the middle
+            // of a drag operation (user moves the mouse very quickly).
+            event.stopPropagation();
+
+            this.iconEl.css({
+                'left': event.pageX - this.state.baseImageEl.offset().left - this.iconWidth * 0.5 - this.iconElLeftOffset,
+                'top': event.pageY - this.state.baseImageEl.offset().top - this.iconHeight * 0.5
+            });
+
+            if (this.labelEl !== null) {
+                this.labelEl.css({
+                    'left': event.pageX - this.state.baseImageEl.offset().left - this.labelWidth * 0.5 - 9, // Acoount for padding, border.
+                    'top': event.pageY - this.state.baseImageEl.offset().top + this.iconHeight * 0.5 + 5
+                });
+            }
+        }
+    }
+}; // End-of: return {
+}); // End-of: define(['logme'], function (logme) {
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define) {
diff --git a/common/static/js/capa/drag_and_drop/draggable_logic.js b/common/static/js/capa/drag_and_drop/draggable_logic.js
new file mode 100644
index 0000000000..e64dc70baa
--- /dev/null
+++ b/common/static/js/capa/drag_and_drop/draggable_logic.js
@@ -0,0 +1,387 @@
+(function (requirejs, require, define) {
+define(['logme', 'update_input', 'targets'], function (logme, updateInput, Targets) {
+return {
+    'moveDraggableTo': function (moveType, target, funcCallback) {
+        var self, offset;
+
+        if (this.hasLoaded === false) {
+            self = this;
+
+            setTimeout(function () {
+                self.moveDraggableTo(moveType, target, funcCallback);
+            }, 50);
+
+            return;
+        }
+
+        if ((this.isReusable === true) && (this.isOriginal === true)) {
+            this.makeDraggableCopy(function (draggableCopy) {
+                draggableCopy.moveDraggableTo(moveType, target, funcCallback);
+            });
+
+            return;
+        }
+
+        offset = 0;
+        if (this.state.config.targetOutline === true) {
+            offset = 1;
+        }
+
+        this.inContainer = false;
+
+        if (this.isOriginal === true) {
+            this.containerEl.hide();
+            this.iconEl.detach();
+        }
+
+        if (this.iconImgEl !== null) {
+            this.iconImgEl.css({
+                'width': this.iconWidth,
+                'height': this.iconHeight
+            });
+        }
+
+        this.iconEl.css({
+            'background-color': this.iconElBGColor,
+            'padding-left': this.iconElPadding,
+            'padding-right': this.iconElPadding,
+            'border': this.iconElBorder,
+            'width': this.iconWidth,
+            'height': this.iconHeight
+        });
+        if (moveType === 'target') {
+            this.iconEl.css({
+                'left': target.offset.left + 0.5 * target.w - this.iconWidth * 0.5 + offset - this.iconElLeftOffset,
+                'top': target.offset.top + 0.5 * target.h - this.iconHeight * 0.5 + offset
+            });
+        } else {
+            this.iconEl.css({
+                'left': target.x - this.iconWidth * 0.5 + offset - this.iconElLeftOffset,
+                'top': target.y - this.iconHeight * 0.5 + offset
+            });
+        }
+        this.iconEl.appendTo(this.state.baseImageEl.parent());
+
+        if (this.labelEl !== null) {
+            if (this.isOriginal === true) {
+                this.labelEl.detach();
+            }
+            this.labelEl.css({
+                'background-color': this.state.config.labelBgColor,
+                'padding-left': 8,
+                'padding-right': 8,
+                'border': '1px solid black'
+            });
+            if (moveType === 'target') {
+                this.labelEl.css({
+                    'left': target.offset.left + 0.5 * target.w - this.labelWidth * 0.5 + offset - 9, // Account for padding, border.
+                    'top': target.offset.top + 0.5 * target.h + this.iconHeight * 0.5 + 5 + offset
+                });
+            } else {
+                this.labelEl.css({
+                    'left': target.x - this.labelWidth * 0.5 + offset - 9, // Account for padding, border.
+                    'top': target.y - this.iconHeight * 0.5 + this.iconHeight + 5 + offset
+                });
+            }
+            this.labelEl.appendTo(this.state.baseImageEl.parent());
+        }
+
+        if (moveType === 'target') {
+            target.addDraggable(this);
+        } else {
+            this.x = target.x;
+            this.y = target.y;
+        }
+
+        this.zIndex = 1000;
+        this.correctZIndexes();
+
+        Targets.initializeTargetField(this);
+
+        if (this.isOriginal === true) {
+            this.state.numDraggablesInSlider -= 1;
+            this.state.updateArrowOpacity();
+        }
+
+        if ($.isFunction(funcCallback) === true) {
+            funcCallback();
+        }
+    },
+
+    // At this point the mouse was realeased, and we need to check
+    // where the draggable eneded up. Based on several things, we
+    // will either move the draggable back to the slider, or update
+    // the input with the user's answer (X-Y position of the draggable,
+    // or the ID of the target where it landed.
+    'checkLandingElement': function () {
+        var positionIE;
+
+        this.mousePressed = false;
+        positionIE = this.iconEl.position();
+
+        if (this.state.config.individualTargets === true) {
+            if (this.checkIfOnTarget(positionIE) === true) {
+                this.correctZIndexes();
+
+                Targets.initializeTargetField(this);
+            } else {
+                if (this.onTarget !== null) {
+                    this.onTarget.removeDraggable(this);
+                }
+
+                this.moveBackToSlider();
+
+                if (this.isOriginal === true) {
+                    this.state.numDraggablesInSlider += 1;
+                }
+            }
+        } else {
+            if (
+                (positionIE.left < 0) ||
+                (positionIE.left + this.iconWidth > this.state.baseImageEl.width()) ||
+                (positionIE.top < 0) ||
+                (positionIE.top + this.iconHeight > this.state.baseImageEl.height())
+            ) {
+                this.moveBackToSlider();
+
+                this.x = -1;
+                this.y = -1;
+
+                if (this.isOriginal === true) {
+                    this.state.numDraggablesInSlider += 1;
+                }
+            } else {
+                this.correctZIndexes();
+
+                this.x = positionIE.left + this.iconWidth * 0.5;
+                this.y = positionIE.top + this.iconHeight * 0.5;
+
+                Targets.initializeTargetField(this);
+            }
+        }
+
+        if (this.isOriginal === true) {
+            this.state.updateArrowOpacity();
+        }
+        updateInput.update(this.state);
+    },
+
+    // Determine if a draggable, after it was relased, ends up on a
+    // target. We do this by iterating over all of the targets, and
+    // for each one we check whether the draggable's center is
+    // within the target's dimensions.
+    //
+    // positionIE is the object as returned by
+    //
+    //     this.iconEl.position()
+    'checkIfOnTarget': function (positionIE) {
+        var c1, target;
+
+        for (c1 = 0; c1 < this.state.targets.length; c1 += 1) {
+            target = this.state.targets[c1];
+
+            // If only one draggable per target is allowed, and
+            // the current target already has a draggable on it
+            // (with an ID different from the one we are checking
+            // against), then go to next target.
+            if (
+                (this.state.config.onePerTarget === true) &&
+                (target.draggableList.length === 1) &&
+                (target.draggableList[0].uniqueId !== this.uniqueId)
+            ) {
+                continue;
+            }
+
+            // If the target is on a draggable (from target field), we must make sure that
+            // this draggable is not the same as "this" one.
+            if ((target.type === 'on_drag') && (target.draggableObj.uniqueId === this.uniqueId)) {
+                continue;
+            }
+
+            // Check if the draggable's center coordinate is within
+            // the target's dimensions. If not, go to next target.
+            if (
+                (positionIE.top + this.iconHeight * 0.5 < target.offset.top) ||
+                (positionIE.top + this.iconHeight * 0.5 > target.offset.top + target.h) ||
+                (positionIE.left + this.iconWidth * 0.5 < target.offset.left) ||
+                (positionIE.left + this.iconWidth * 0.5 > target.offset.left + target.w)
+            ) {
+                continue;
+            }
+
+            // If the draggable was moved from one target to
+            // another, then we need to remove it from the
+            // previous target's draggables list, and add it to the
+            // new target's draggables list.
+            if ((this.onTarget !== null) && (this.onTarget.uniqueId !== target.uniqueId)) {
+                this.onTarget.removeDraggable(this);
+                target.addDraggable(this);
+            }
+            // If the draggable was moved from the slider to a
+            // target, remember the target, and add ID to the
+            // target's draggables list.
+            else if (this.onTarget === null) {
+                target.addDraggable(this);
+            }
+
+            // Reposition the draggable so that it's center
+            // coincides with the center of the target.
+            this.snapToTarget(target);
+
+            // Target was found.
+            return true;
+        }
+
+        // Target was not found.
+        return false;
+    },
+
+    'snapToTarget': function (target) {
+        var offset;
+
+        offset = 0;
+        if (this.state.config.targetOutline === true) {
+            offset = 1;
+        }
+
+        this.iconEl.css({
+            'left': target.offset.left + 0.5 * target.w - this.iconWidth * 0.5 + offset - this.iconElLeftOffset,
+            'top': target.offset.top + 0.5 * target.h - this.iconHeight * 0.5 + offset
+        });
+
+        if (this.labelEl !== null) {
+            this.labelEl.css({
+                'left': target.offset.left + 0.5 * target.w - this.labelWidth * 0.5 + offset - 9, // Acoount for padding, border.
+                'top': target.offset.top + 0.5 * target.h + this.iconHeight * 0.5 + 5 + offset
+            });
+        }
+    },
+
+    // Go through all of the draggables subtract 1 from the z-index
+    // of all whose z-index is higher than the old z-index of the
+    // current element. After, set the z-index of the current
+    // element to 1 + N (where N is the number of draggables - i.e.
+    // the highest z-index possible).
+    //
+    // This will make sure that after releasing a draggable, it
+    // will be on top of all of the other draggables. Also, the
+    // ordering of the visibility (z-index) of the other draggables
+    // will not change.
+    'correctZIndexes': function () {
+        var c1, highestZIndex;
+
+        highestZIndex = -10000;
+
+        if (this.state.config.individualTargets === true) {
+            if (this.onTarget.draggableList.length > 0) {
+                for (c1 = 0; c1 < this.onTarget.draggableList.length; c1 += 1) {
+                    if (
+                        (this.onTarget.draggableList[c1].zIndex > highestZIndex) &&
+                        (this.onTarget.draggableList[c1].zIndex !== 1000)
+                    ) {
+                        highestZIndex = this.onTarget.draggableList[c1].zIndex;
+                    }
+                }
+            } else {
+                highestZIndex = 0;
+            }
+        } else {
+            for (c1 = 0; c1 < this.state.draggables.length; c1++) {
+                if (this.inContainer === false) {
+                    if (
+                        (this.state.draggables[c1].zIndex > highestZIndex) &&
+                        (this.state.draggables[c1].zIndex !== 1000)
+                    ) {
+                        highestZIndex = this.state.draggables[c1].zIndex;
+                    }
+                }
+            }
+        }
+
+        if (highestZIndex === -10000) {
+            highestZIndex = 0;
+        }
+
+        this.zIndex = highestZIndex + 1;
+
+        this.iconEl.css('z-index', this.zIndex);
+        if (this.labelEl !== null) {
+            this.labelEl.css('z-index', this.zIndex);
+        }
+    },
+
+    // If a draggable was released in a wrong positione, we will
+    // move it back to the slider, placing it in the same position
+    // that it was dragged out of.
+    'moveBackToSlider': function () {
+        var c1;
+
+        Targets.destroyTargetField(this);
+
+        if (this.isOriginal === false) {
+            this.iconEl.remove();
+            if (this.labelEl !== null) {
+                this.labelEl.remove();
+            }
+
+            this.state.draggables.splice(this.stateDraggablesIndex, 1);
+
+            for (c1 = 0; c1 < this.state.draggables.length; c1 += 1) {
+                if (this.state.draggables[c1].stateDraggablesIndex > this.stateDraggablesIndex) {
+                    this.state.draggables[c1].stateDraggablesIndex -= 1;
+                }
+            }
+
+            return;
+        }
+
+        this.containerEl.show();
+        this.zIndex = 1;
+
+        this.iconEl.detach();
+        if (this.iconImgEl !== null) {
+            this.iconImgEl.css({
+                'width': this.iconWidthSmall,
+                'height': this.iconHeightSmall
+            });
+        }
+        this.iconEl.css({
+            'border': 'none',
+            'background-color': 'transparent',
+            'padding-left': 0,
+            'padding-right': 0,
+            'z-index': this.zIndex,
+            'width': this.iconWidthSmall,
+            'height': this.iconHeightSmall,
+            'left': 50 - this.iconWidthSmall * 0.5,
+
+            // Before:
+            // 'top': ((this.labelEl !== null) ? (100 - this.iconHeightSmall - 25) * 0.5 : 50 - this.iconHeightSmall * 0.5)
+            // After:
+            'top': ((this.labelEl !== null) ? 37.5 : 50.0) - 0.5 * this.iconHeightSmall
+        });
+        this.iconEl.appendTo(this.containerEl);
+
+        if (this.labelEl !== null) {
+            this.labelEl.detach();
+            this.labelEl.css({
+                'border': 'none',
+                'background-color': 'transparent',
+                'padding-left': 0,
+                'padding-right': 0,
+                'z-index': this.zIndex,
+                'left': 50 - this.labelWidth * 0.5,
+
+                // Before:
+                // 'top': (100 - this.iconHeightSmall - 25) * 0.5 + this.iconHeightSmall + 5
+                // After:
+                'top': 42.5 + 0.5 * this.iconHeightSmall
+            });
+            this.labelEl.appendTo(this.containerEl);
+        }
+
+        this.inContainer = true;
+    }
+}; // End-of: return {
+}); // End-of: define(['logme', 'update_input', 'targets'], function (logme, updateInput, Targets) {
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define) {
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index a867cf73fe..67ade195b0 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -1,21 +1,15 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-//
-// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
-
-define(['logme', 'update_input'], function (logme, updateInput) {
+define(['logme', 'draggable_events', 'draggable_logic'], function (logme, draggableEvents, draggableLogic) {
     return {
         'init': init
     };
 
     function init(state) {
-        (function (c1) {
-            while (c1 < state.config.draggables.length) {
-                processDraggable(state, state.config.draggables[c1]);
-                c1 += 1
-            }
-        }(0));
+        state.config.draggables.every(function (draggable) {
+            processDraggable(state, draggable);
+
+            return true;
+        });
     }
 
     function makeDraggableCopy(callbackFunc) {
@@ -34,13 +28,18 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         draggableObj.stateDraggablesIndex = null; // Will be set.
         draggableObj.containerEl = null; // Not needed, since a copy will never return to a container element.
         draggableObj.iconEl = null; // Will be created.
+        draggableObj.iconImgEl = null; // Will be created.
         draggableObj.labelEl = null; // Will be created.
+        draggableObj.targetField = []; // Will be populated.
 
         // Create DOM elements and attach events.
         if (draggableObj.originalConfigObj.icon.length > 0) {
-            draggableObj.iconEl = $('<img />');
-            draggableObj.iconEl.attr('src', draggableObj.originalConfigObj.icon);
-            draggableObj.iconEl.load(function () {
+
+            draggableObj.iconEl = $('<div></div>');
+            draggableObj.iconImgEl = $('<img />');
+            draggableObj.iconImgEl.attr('src', draggableObj.originalConfigObj.icon);
+            draggableObj.iconImgEl.load(function () {
+
                 draggableObj.iconEl.css({
                     'position': 'absolute',
                     'width': draggableObj.iconWidthSmall,
@@ -48,6 +47,14 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     'left': 50 - draggableObj.iconWidthSmall * 0.5,
                     'top': ((draggableObj.originalConfigObj.label.length > 0) ? 5 : 50 - draggableObj.iconHeightSmall * 0.5)
                 });
+                draggableObj.iconImgEl.css({
+                    'position': 'absolute',
+                    'width': draggableObj.iconWidthSmall,
+                    'height': draggableObj.iconHeightSmall,
+                    'left': 0,
+                    'top': 0
+                });
+                draggableObj.iconImgEl.appendTo(draggableObj.iconEl);
 
                 if (draggableObj.originalConfigObj.label.length > 0) {
                     draggableObj.labelEl = $(
@@ -71,7 +78,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
                 draggableObj.attachMouseEventsTo('iconEl');
 
-                draggableObj.stateDraggablesIndex = draggableObj.state.draggables.push(draggableObj);
+                draggableObj.stateDraggablesIndex = draggableObj.state.draggables.push(draggableObj) - 1;
 
                 setTimeout(function () {
                     callbackFunc(draggableObj);
@@ -99,7 +106,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
                 draggableObj.attachMouseEventsTo('iconEl');
 
-                draggableObj.stateDraggablesIndex = draggableObj.state.draggables.push(draggableObj);
+                draggableObj.stateDraggablesIndex = draggableObj.state.draggables.push(draggableObj) - 1;
 
                 setTimeout(function () {
                     callbackFunc(draggableObj);
@@ -110,115 +117,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         }
     }
 
-    function attachMouseEventsTo(element) {
-        var self;
-
-        self = this;
-
-        this[element].mousedown(function (event) {
-            self.mouseDown(event);
-        });
-        this[element].mouseup(function (event) {
-            self.mouseUp(event);
-        });
-        this[element].mousemove(function (event) {
-            self.mouseMove(event);
-        });
-    }
-
-    function moveDraggableTo(moveType, target) {
-        var self, offset;
-
-        if (this.hasLoaded === false) {
-            self = this;
-
-            setTimeout(function () {
-                self.moveDraggableTo(moveType, target);
-            }, 50);
-
-            return;
-        }
-
-        if ((this.isReusable === true) && (this.isOriginal === true)) {
-            this.makeDraggableCopy(function (draggableCopy) {
-                draggableCopy.moveDraggableTo(moveType, target);
-            });
-
-            return;
-        }
-
-        offset = 0;
-        if (this.state.config.targetOutline === true) {
-            offset = 1;
-        }
-
-        this.inContainer = false;
-
-        if (this.isOriginal === true) {
-            this.containerEl.hide();
-            this.iconEl.detach();
-        }
-        this.iconEl.css({
-            'background-color': this.iconElBGColor,
-            'padding-left': this.iconElPadding,
-            'padding-right': this.iconElPadding,
-            'border': this.iconElBorder,
-            'width': this.iconWidth,
-            'height': this.iconHeight
-        });
-        if (moveType === 'target') {
-            this.iconEl.css({
-                'left': target.offset.left + 0.5 * target.w - this.iconWidth * 0.5 + offset - this.iconElLeftOffset,
-                'top': target.offset.top + 0.5 * target.h - this.iconHeight * 0.5 + offset
-            });
-        } else {
-            this.iconEl.css({
-                'left': target.x - this.iconWidth * 0.5 + offset - this.iconElLeftOffset,
-                'top': target.y - this.iconHeight * 0.5 + offset
-            });
-        }
-        this.iconEl.appendTo(this.state.baseImageEl.parent());
-
-        if (this.labelEl !== null) {
-            if (this.isOriginal === true) {
-                this.labelEl.detach();
-            }
-            this.labelEl.css({
-                'background-color': this.state.config.labelBgColor,
-                'padding-left': 8,
-                'padding-right': 8,
-                'border': '1px solid black'
-            });
-            if (moveType === 'target') {
-                this.labelEl.css({
-                    'left': target.offset.left + 0.5 * target.w - this.labelWidth * 0.5 + offset - 9, // Account for padding, border.
-                    'top': target.offset.top + 0.5 * target.h + this.iconHeight * 0.5 + 5 + offset
-                });
-            } else {
-                this.labelEl.css({
-                    'left': target.x - this.labelWidth * 0.5 + offset - 9, // Account for padding, border.
-                    'top': target.y - this.iconHeight * 0.5 + this.iconHeight + 5 + offset
-                });
-            }
-            this.labelEl.appendTo(this.state.baseImageEl.parent());
-        }
-
-        if (moveType === 'target') {
-            target.addDraggable(this);
-        } else {
-            this.x = target.x;
-            this.y = target.y;
-        }
-
-        this.zIndex = 1000;
-        this.correctZIndexes();
-
-        if (this.isOriginal === true) {
-            this.state.numDraggablesInSlider -= 1;
-            this.state.updateArrowOpacity();
-        }
-    }
-
     function processDraggable(state, obj) {
         var draggableObj;
 
@@ -234,6 +132,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             'zIndex': 1,
             'containerEl': null,
             'iconEl': null,
+            'iconImgEl': null,
             'iconElBGColor': null,
             'iconElPadding': null,
             'iconElBorder': null,
@@ -251,17 +150,23 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             'onTargetIndex': null,
             'state': state,
 
-            'mouseDown': mouseDown,
-            'mouseUp': mouseUp,
-            'mouseMove': mouseMove,
-            'checkLandingElement': checkLandingElement,
-            'checkIfOnTarget': checkIfOnTarget,
-            'snapToTarget': snapToTarget,
-            'correctZIndexes': correctZIndexes,
-            'moveBackToSlider': moveBackToSlider,
-            'moveDraggableTo': moveDraggableTo,
+            'mouseDown': draggableEvents.mouseDown,
+            'mouseUp': draggableEvents.mouseUp,
+            'mouseMove': draggableEvents.mouseMove,
+
+            'checkLandingElement': draggableLogic.checkLandingElement,
+            'checkIfOnTarget': draggableLogic.checkIfOnTarget,
+            'snapToTarget': draggableLogic.snapToTarget,
+            'correctZIndexes': draggableLogic.correctZIndexes,
+            'moveBackToSlider': draggableLogic.moveBackToSlider,
+            'moveDraggableTo': draggableLogic.moveDraggableTo,
+
             'makeDraggableCopy': makeDraggableCopy,
-            'attachMouseEventsTo': attachMouseEventsTo
+
+            'attachMouseEventsTo': draggableEvents.attachMouseEventsTo,
+
+            'targetField': [],
+            'numDraggablesOnMe': 0
         };
 
         draggableObj.containerEl = $(
@@ -288,9 +193,11 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             draggableObj.iconElBorder = 'none';
             draggableObj.iconElLeftOffset = 0;
 
-            draggableObj.iconEl = $('<img />');
-            draggableObj.iconEl.attr('src', obj.icon);
-            draggableObj.iconEl.load(function () {
+            draggableObj.iconEl = $('<div></div>');
+
+            draggableObj.iconImgEl = $('<img />');
+            draggableObj.iconImgEl.attr('src', obj.icon);
+            draggableObj.iconImgEl.load(function () {
                 draggableObj.iconWidth = this.width;
                 draggableObj.iconHeight = this.height;
 
@@ -307,8 +214,20 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     'width': draggableObj.iconWidthSmall,
                     'height': draggableObj.iconHeightSmall,
                     'left': 50 - draggableObj.iconWidthSmall * 0.5,
-                    'top': ((obj.label.length > 0) ? 5 : 50 - draggableObj.iconHeightSmall * 0.5)
+
+                    // Before:
+                    // 'top': ((obj.label.length > 0) ? (100 - draggableObj.iconHeightSmall - 25) * 0.5 : 50 - draggableObj.iconHeightSmall * 0.5)
+                    // After:
+                    'top': ((obj.label.length > 0) ? 37.5 : 50.0) - 0.5 * draggableObj.iconHeightSmall
                 });
+                draggableObj.iconImgEl.css({
+                    'position': 'absolute',
+                    'width': draggableObj.iconWidthSmall,
+                    'height': draggableObj.iconHeightSmall,
+                    'left': 0,
+                    'top': 0
+                });
+                draggableObj.iconImgEl.appendTo(draggableObj.iconEl);
                 draggableObj.iconEl.appendTo(draggableObj.containerEl);
 
                 if (obj.label.length > 0) {
@@ -328,7 +247,11 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     draggableObj.labelWidth = draggableObj.labelEl.width();
                     draggableObj.labelEl.css({
                         'left': 50 - draggableObj.labelWidth * 0.5,
-                        'top': 5 + draggableObj.iconHeightSmall + 5
+
+                        // Before:
+                        // 'top': (100 - this.iconHeightSmall - 25) * 0.5 + this.iconHeightSmall + 5
+                        // After:
+                        'top': 42.5 + 0.5 * draggableObj.iconHeightSmall
                     });
 
                     draggableObj.attachMouseEventsTo('labelEl');
@@ -384,357 +307,5 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         state.numDraggablesInSlider += 1;
         draggableObj.stateDraggablesIndex = state.draggables.push(draggableObj) - 1;
     }
-
-    function mouseDown(event) {
-        if (this.mousePressed === false) {
-            // So that the browser does not perform a default drag.
-            // If we don't do this, each drag operation will
-            // potentially cause the highlghting of the dragged element.
-            event.preventDefault();
-            event.stopPropagation();
-
-            // If this draggable is just being dragged out of the
-            // container, we must perform some additional tasks.
-            if (this.inContainer === true) {
-                if ((this.isReusable === true) && (this.isOriginal === true)) {
-                    this.makeDraggableCopy(function (draggableCopy) {
-                        draggableCopy.mouseDown(event);
-                    });
-
-                    return;
-                }
-
-                if (this.isOriginal === true) {
-                    this.containerEl.hide();
-                    this.iconEl.detach();
-                }
-                this.iconEl.css({
-                    'background-color': this.iconElBGColor,
-                    'padding-left': this.iconElPadding,
-                    'padding-right': this.iconElPadding,
-                    'border': this.iconElBorder,
-                    'width': this.iconWidth,
-                    'height': this.iconHeight,
-                    'left': event.pageX - this.state.baseImageEl.offset().left - this.iconWidth * 0.5 - this.iconElLeftOffset,
-                    'top': event.pageY - this.state.baseImageEl.offset().top - this.iconHeight * 0.5
-                });
-                this.iconEl.appendTo(this.state.baseImageEl.parent());
-
-                if (this.labelEl !== null) {
-                    if (this.isOriginal === true) {
-                        this.labelEl.detach();
-                    }
-                    this.labelEl.css({
-                        'background-color': this.state.config.labelBgColor,
-                        'padding-left': 8,
-                        'padding-right': 8,
-                        'border': '1px solid black',
-                        'left': event.pageX - this.state.baseImageEl.offset().left - this.labelWidth * 0.5 - 9, // Account for padding, border.
-                        'top': event.pageY - this.state.baseImageEl.offset().top + this.iconHeight * 0.5 + 5
-                    });
-                    this.labelEl.appendTo(this.state.baseImageEl.parent());
-                }
-
-                this.inContainer = false;
-                if (this.isOriginal === true) {
-                    this.state.numDraggablesInSlider -= 1;
-                }
-            }
-
-            this.zIndex = 1000;
-            this.iconEl.css('z-index', '1000');
-            if (this.labelEl !== null) {
-                this.labelEl.css('z-index', '1000');
-            }
-
-            this.mousePressed = true;
-            this.state.currentMovingDraggable = this;
-        }
-    }
-
-    function mouseUp() {
-        if (this.mousePressed === true) {
-            this.state.currentMovingDraggable = null;
-
-            this.checkLandingElement();
-        }
-    }
-
-    function mouseMove(event) {
-        if (this.mousePressed === true) {
-            // Because we have also attached a 'mousemove' event to the
-            // 'document' (that will do the same thing), let's tell the
-            // browser not to bubble up this event. The attached event
-            // on the 'document' will only be triggered when the mouse
-            // pointer leaves the draggable while it is in the middle
-            // of a drag operation (user moves the mouse very quickly).
-            event.stopPropagation();
-
-            this.iconEl.css({
-                'left': event.pageX - this.state.baseImageEl.offset().left - this.iconWidth * 0.5 - this.iconElLeftOffset,
-                'top': event.pageY - this.state.baseImageEl.offset().top - this.iconHeight * 0.5
-            });
-
-            if (this.labelEl !== null) {
-                this.labelEl.css({
-                    'left': event.pageX - this.state.baseImageEl.offset().left - this.labelWidth * 0.5 - 9, // Acoount for padding, border.
-                    'top': event.pageY - this.state.baseImageEl.offset().top + this.iconHeight * 0.5 + 5
-                });
-            }
-        }
-    }
-
-    // At this point the mouse was realeased, and we need to check
-    // where the draggable eneded up. Based on several things, we
-    // will either move the draggable back to the slider, or update
-    // the input with the user's answer (X-Y position of the draggable,
-    // or the ID of the target where it landed.
-    function checkLandingElement() {
-        var positionIE;
-
-        this.mousePressed = false;
-        positionIE = this.iconEl.position();
-
-        if (this.state.config.individualTargets === true) {
-            if (this.checkIfOnTarget(positionIE) === true) {
-                this.correctZIndexes();
-            } else {
-                if (this.onTarget !== null) {
-                    this.onTarget.removeDraggable(this);
-                }
-
-                this.moveBackToSlider();
-
-                if (this.isOriginal === true) {
-                    this.state.numDraggablesInSlider += 1;
-                }
-            }
-        } else {
-            if (
-                (positionIE.left < 0) ||
-                (positionIE.left + this.iconWidth > this.state.baseImageEl.width()) ||
-                (positionIE.top < 0) ||
-                (positionIE.top + this.iconHeight > this.state.baseImageEl.height())
-            ) {
-                this.moveBackToSlider();
-
-                this.x = -1;
-                this.y = -1;
-
-                if (this.isOriginal === true) {
-                    this.state.numDraggablesInSlider += 1;
-                }
-            } else {
-                this.correctZIndexes();
-
-                this.x = positionIE.left + this.iconWidth * 0.5;
-                this.y = positionIE.top + this.iconHeight * 0.5;
-            }
-        }
-
-        if (this.isOriginal === true) {
-            this.state.updateArrowOpacity();
-        }
-        updateInput.update(this.state);
-    }
-
-    // Determine if a draggable, after it was relased, ends up on a
-    // target. We do this by iterating over all of the targets, and
-    // for each one we check whether the draggable's center is
-    // within the target's dimensions.
-    //
-    // positionIE is the object as returned by
-    //
-    //     this.iconEl.position()
-    function checkIfOnTarget(positionIE) {
-        var c1, target;
-
-        for (c1 = 0; c1 < this.state.targets.length; c1 += 1) {
-            target = this.state.targets[c1];
-
-            // If only one draggable per target is allowed, and
-            // the current target already has a draggable on it
-            // (with an ID different from the one we are checking
-            // against), then go to next target.
-            if (
-                (this.state.config.onePerTarget === true) &&
-                (target.draggableList.length === 1) &&
-                (target.draggableList[0].uniqueId !== this.uniqueId)
-            ) {
-                continue;
-            }
-
-            // Check if the draggable's center coordinate is within
-            // the target's dimensions. If not, go to next target.
-            if (
-                (positionIE.top + this.iconHeight * 0.5 < target.offset.top) ||
-                (positionIE.top + this.iconHeight * 0.5 > target.offset.top + target.h) ||
-                (positionIE.left + this.iconWidth * 0.5 < target.offset.left) ||
-                (positionIE.left + this.iconWidth * 0.5 > target.offset.left + target.w)
-            ) {
-                continue;
-            }
-
-            // If the draggable was moved from one target to
-            // another, then we need to remove it from the
-            // previous target's draggables list, and add it to the
-            // new target's draggables list.
-            if ((this.onTarget !== null) && (this.onTarget.id !== target.id)) {
-                this.onTarget.removeDraggable(this);
-                target.addDraggable(this);
-            }
-            // If the draggable was moved from the slider to a
-            // target, remember the target, and add ID to the
-            // target's draggables list.
-            else if (this.onTarget === null) {
-                target.addDraggable(this);
-            }
-
-            // Reposition the draggable so that it's center
-            // coincides with the center of the target.
-            this.snapToTarget(target);
-
-            // Target was found.
-            return true;
-        }
-
-        // Target was not found.
-        return false;
-    }
-
-    function snapToTarget(target) {
-        var offset;
-
-        offset = 0;
-        if (this.state.config.targetOutline === true) {
-            offset = 1;
-        }
-
-        this.iconEl.css({
-            'left': target.offset.left + 0.5 * target.w - this.iconWidth * 0.5 + offset - this.iconElLeftOffset,
-            'top': target.offset.top + 0.5 * target.h - this.iconHeight * 0.5 + offset
-        });
-
-        if (this.labelEl !== null) {
-            this.labelEl.css({
-                'left': target.offset.left + 0.5 * target.w - this.labelWidth * 0.5 + offset - 9, // Acoount for padding, border.
-                'top': target.offset.top + 0.5 * target.h + this.iconHeight * 0.5 + 5 + offset
-            });
-        }
-    }
-
-    // Go through all of the draggables subtract 1 from the z-index
-    // of all whose z-index is higher than the old z-index of the
-    // current element. After, set the z-index of the current
-    // element to 1 + N (where N is the number of draggables - i.e.
-    // the highest z-index possible).
-    //
-    // This will make sure that after releasing a draggable, it
-    // will be on top of all of the other draggables. Also, the
-    // ordering of the visibility (z-index) of the other draggables
-    // will not change.
-    function correctZIndexes() {
-        var c1, highestZIndex;
-
-        highestZIndex = -10000;
-
-        if (this.state.config.individualTargets === true) {
-            if (this.onTarget.draggableList.length > 0) {
-                for (c1 = 0; c1 < this.onTarget.draggableList.length; c1 += 1) {
-                    if (
-                        (this.onTarget.draggableList[c1].zIndex > highestZIndex) &&
-                        (this.onTarget.draggableList[c1].zIndex !== 1000)
-                    ) {
-                        highestZIndex = this.onTarget.draggableList[c1].zIndex;
-                    }
-                }
-            } else {
-                highestZIndex = 0;
-            }
-        } else {
-            for (c1 = 0; c1 < this.state.draggables.length; c1++) {
-                if (this.inContainer === false) {
-                    if (
-                        (this.state.draggables[c1].zIndex > highestZIndex) &&
-                        (this.state.draggables[c1].zIndex !== 1000)
-                    ) {
-                        highestZIndex = this.state.draggables[c1].zIndex;
-                    }
-                }
-            }
-        }
-
-        if (highestZIndex === -10000) {
-            highestZIndex = 0;
-        }
-
-        this.zIndex = highestZIndex + 1;
-
-        this.iconEl.css('z-index', this.zIndex);
-        if (this.labelEl !== null) {
-            this.labelEl.css('z-index', this.zIndex);
-        }
-    }
-
-    // If a draggable was released in a wrong positione, we will
-    // move it back to the slider, placing it in the same position
-    // that it was dragged out of.
-    function moveBackToSlider() {
-        var c1;
-
-        if (this.isOriginal === false) {
-            this.iconEl.remove();
-            if (this.labelEl !== null) {
-                this.labelEl.remove();
-            }
-            this.state.draggables.splice(this.stateDraggablesIndex, 1);
-
-            for (c1 = 0; c1 < this.state.draggables; c1 += 1) {
-                if (this.state.draggables[c1].stateDraggablesIndex > this.stateDraggablesIndex) {
-                    this.state.draggables[c1].stateDraggablesIndex -= 1;
-                }
-            }
-
-            return;
-        }
-
-        this.containerEl.show();
-        this.zIndex = 1;
-
-        this.iconEl.detach();
-        this.iconEl.css({
-            'border': 'none',
-            'background-color': 'transparent',
-            'padding-left': 0,
-            'padding-right': 0,
-            'z-index': this.zIndex,
-            'width': this.iconWidthSmall,
-            'height': this.iconHeightSmall,
-            'left': 50 - this.iconWidthSmall * 0.5,
-            'top': ((this.labelEl !== null) ? 5 : 50 - this.iconHeightSmall * 0.5)
-        });
-        this.iconEl.appendTo(this.containerEl);
-
-        if (this.labelEl !== null) {
-            this.labelEl.detach();
-            this.labelEl.css({
-                'border': 'none',
-                'background-color': 'transparent',
-                'padding-left': 0,
-                'padding-right': 0,
-                'z-index': this.zIndex,
-                'left': 50 - this.labelWidth * 0.5,
-                'top': 5 + this.iconHeightSmall + 5
-            });
-            this.labelEl.appendTo(this.containerEl);
-        }
-
-        this.inContainer = true;
-    }
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
+}); // End-of: define(['logme', 'draggable_events', 'draggable_logic'], function (logme, draggableEvents, draggableLogic) {
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define) {
diff --git a/common/static/js/capa/drag_and_drop/logme.js b/common/static/js/capa/drag_and_drop/logme.js
index 21f73bf2a5..5a6c5385a6 100644
--- a/common/static/js/capa/drag_and_drop/logme.js
+++ b/common/static/js/capa/drag_and_drop/logme.js
@@ -1,9 +1,4 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-//
-// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
-
 define([], function () {
     var debugMode;
 
@@ -27,10 +22,5 @@ define([], function () {
             i += 1;
         }
     }
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
+}); // End-of: define([], function () {
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define) {
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 89cf08001d..92c71e008b 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -1,15 +1,41 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-//
-// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
-
 define(
     ['logme', 'state', 'config_parser', 'container', 'base_image', 'scroller', 'draggables', 'targets', 'update_input'],
     function (logme, State, configParser, Container, BaseImage, Scroller, Draggables, Targets, updateInput) {
     return Main;
 
     function Main() {
+
+        // https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/every
+        //
+        // Array.prototype.every is a recent addition to the ECMA-262 standard; as such it may not be present in
+        // other implementations of the standard.
+        if (!Array.prototype.every) {
+            Array.prototype.every = function(fun /*, thisp */) {
+                var thisp, t, len, i;
+
+                if (this == null) {
+                    throw new TypeError();
+                }
+
+                t = Object(this);
+                len = t.length >>> 0;
+                if (typeof fun != 'function') {
+                    throw new TypeError();
+                }
+
+                thisp = arguments[1];
+
+                for (i = 0; i < len; i++) {
+                    if (i in t && !fun.call(thisp, t[i], i, t)) {
+                        return false;
+                    }
+                }
+
+                return true;
+            };
+        }
+
         $('.drag_and_drop_problem_div').each(processProblem);
     }
 
@@ -59,7 +85,7 @@ define(
                 return;
             }
 
-            Targets(state);
+            Targets.initializeBaseTargets(state);
             Scroller(state);
             Draggables.init(state);
 
@@ -72,10 +98,5 @@ define(
             }
         }());
     }
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
+}); // End-of: define(
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define) {
diff --git a/common/static/js/capa/drag_and_drop/scroller.js b/common/static/js/capa/drag_and_drop/scroller.js
index c1fe867006..7aa1ff4108 100644
--- a/common/static/js/capa/drag_and_drop/scroller.js
+++ b/common/static/js/capa/drag_and_drop/scroller.js
@@ -1,9 +1,4 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-//
-// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
-
 define(['logme'], function (logme) {
     return Scroller;
 
@@ -206,10 +201,5 @@ define(['logme'], function (logme) {
             }
         }
     } // End-of: function Scroller(state)
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
+}); // End-of: define(['logme'], function (logme) {
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define) {
diff --git a/common/static/js/capa/drag_and_drop/state.js b/common/static/js/capa/drag_and_drop/state.js
index 4565acd842..0f83aa7092 100644
--- a/common/static/js/capa/drag_and_drop/state.js
+++ b/common/static/js/capa/drag_and_drop/state.js
@@ -1,9 +1,4 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-//
-// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
-
 define([], function () {
     return State;
 
@@ -96,10 +91,5 @@ define([], function () {
             }
         }
     }
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
+}); // End-of: define([], function () {
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define) {
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
index e56020aac6..3a8e2c4b2d 100644
--- a/common/static/js/capa/drag_and_drop/targets.js
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -1,13 +1,12 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-//
-// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
-
 define(['logme'], function (logme) {
-    return Targets;
+    return {
+        'initializeBaseTargets': initializeBaseTargets,
+        'initializeTargetField': initializeTargetField,
+        'destroyTargetField': destroyTargetField
+    };
 
-    function Targets(state) {
+    function initializeBaseTargets(state) {
         (function (c1) {
             while (c1 < state.config.targets.length) {
                 processTarget(state, state.config.targets[c1]);
@@ -17,7 +16,58 @@ define(['logme'], function (logme) {
         }(0));
     }
 
-    function processTarget(state, obj) {
+    function initializeTargetField(draggableObj) {
+        var iconElOffset;
+
+        if (draggableObj.targetField.length === 0) {
+            draggableObj.originalConfigObj.target_fields.every(function (targetObj) {
+                processTarget(draggableObj.state, targetObj, true, draggableObj);
+
+                return true;
+            });
+        } else {
+            iconElOffset = draggableObj.iconEl.position();
+
+            draggableObj.targetField.every(function (targetObj) {
+                targetObj.offset.top = iconElOffset.top + targetObj.y;
+                targetObj.offset.left = iconElOffset.left + targetObj.x;
+
+                return true;
+            });
+        }
+    }
+
+    function destroyTargetField(draggableObj) {
+        var indexOffset, lowestRemovedIndex;
+
+        indexOffset = 0;
+        lowestRemovedIndex = draggableObj.state.targets.length + 1;
+
+        draggableObj.targetField.every(function (target) {
+            target.el.remove();
+
+            if (lowestRemovedIndex > target.indexInStateArray) {
+                lowestRemovedIndex = target.indexInStateArray;
+            }
+
+            draggableObj.state.targets.splice(target.indexInStateArray - indexOffset, 1);
+            indexOffset += 1;
+
+            return true;
+        });
+
+        draggableObj.state.targets.every(function (target) {
+            if (target.indexInStateArray > lowestRemovedIndex) {
+                target.indexInStateArray -= indexOffset;
+            }
+
+            return true;
+        });
+
+        draggableObj.targetField = [];
+    }
+
+    function processTarget(state, obj, fromTargetField, draggableObj) {
         var targetEl, borderCss, numTextEl, targetObj;
 
         borderCss = '';
@@ -38,7 +88,13 @@ define(['logme'], function (logme) {
                 '" ' +
             '></div>'
         );
-        targetEl.appendTo(state.baseImageEl.parent());
+
+        if (fromTargetField === true) {
+            targetEl.appendTo(draggableObj.iconEl);
+        } else {
+            targetEl.appendTo(state.baseImageEl.parent());
+        }
+
         targetEl.mousedown(function (event) {
             event.preventDefault();
         });
@@ -68,8 +124,13 @@ define(['logme'], function (logme) {
         }
 
         targetObj = {
+            'uniqueId': state.getUniqueId(),
+
             'id': obj.id,
 
+            'x': obj.x,
+            'y': obj.y,
+
             'w': obj.w,
             'h': obj.h,
 
@@ -86,9 +147,21 @@ define(['logme'], function (logme) {
             'updateNumTextEl': updateNumTextEl,
 
             'removeDraggable': removeDraggable,
-            'addDraggable': addDraggable
+            'addDraggable': addDraggable,
+
+            'type': 'base',
+            'draggableObj': null
         };
 
+        if (fromTargetField === true) {
+            targetObj.offset = draggableObj.iconEl.position();
+            targetObj.offset.top += obj.y;
+            targetObj.offset.left += obj.x;
+
+            targetObj.type = 'on_drag';
+            targetObj.draggableObj = draggableObj;
+        }
+
         if (state.config.onePerTarget === false) {
             numTextEl.appendTo(state.baseImageEl.parent());
             numTextEl.mousedown(function (event) {
@@ -99,7 +172,11 @@ define(['logme'], function (logme) {
             });
         }
 
-        state.targets.push(targetObj);
+        targetObj.indexInStateArray = state.targets.push(targetObj) - 1;
+
+        if (fromTargetField === true) {
+            draggableObj.targetField.push(targetObj);
+        }
     }
 
     function removeDraggable(draggable) {
@@ -121,6 +198,10 @@ define(['logme'], function (logme) {
         draggable.onTarget = null;
         draggable.onTargetIndex = null;
 
+        if (this.type === 'on_drag') {
+            this.draggableObj.numDraggablesOnMe -= 1;
+        }
+
         this.updateNumTextEl();
     }
 
@@ -128,6 +209,10 @@ define(['logme'], function (logme) {
         draggable.onTarget = this;
         draggable.onTargetIndex = this.draggableList.push(draggable) - 1;
 
+        if (this.type === 'on_drag') {
+            this.draggableObj.numDraggablesOnMe += 1;
+        }
+
         this.updateNumTextEl();
     }
 
@@ -183,10 +268,5 @@ define(['logme'], function (logme) {
             this.numTextEl.html(this.draggableList.length);
         }
     }
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
+}); // End-of: define(['logme'], function (logme) {
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define) {
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 04715a3ecf..804b0bed97 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -1,9 +1,4 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-//
-// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
-
 define(['logme'], function (logme) {
     return {
         'check': check,
@@ -37,7 +32,12 @@ define(['logme'], function (logme) {
                     (function (c2) {
                         while (c2 < state.targets[c1].draggableList.length) {
                             tempObj = {};
-                            tempObj[state.targets[c1].draggableList[c2].id] = state.targets[c1].id;
+
+                            if (state.targets[c1].type === 'base') {
+                                tempObj[state.targets[c1].draggableList[c2].id] = state.targets[c1].id;
+                            } else {
+                                addTargetRecursively(tempObj, state.targets[c1].draggableList[c2], state.targets[c1]);
+                            }
                             draggables.push(tempObj);
                             tempObj = null;
 
@@ -50,7 +50,18 @@ define(['logme'], function (logme) {
             }(0));
         }
 
-        $('#input_' + state.problemId).val(JSON.stringify({'draggables': draggables}));
+        $('#input_' + state.problemId).val(JSON.stringify(draggables));
+    }
+
+    function addTargetRecursively(tempObj, draggable, target) {
+        if (target.type === 'base') {
+            tempObj[draggable.id] = target.id;
+        } else {
+            tempObj[draggable.id] = {};
+            tempObj[draggable.id][target.id] = {};
+
+            addTargetRecursively(tempObj[draggable.id][target.id], target.draggableObj, target.draggableObj.onTarget);
+        }
     }
 
     // Check if input has an answer from server. If yes, then position
@@ -59,6 +70,7 @@ define(['logme'], function (logme) {
         var inputElVal;
 
         inputElVal = $('#input_' + state.problemId).val();
+
         if (inputElVal.length === 0) {
             return false;
         }
@@ -68,95 +80,147 @@ define(['logme'], function (logme) {
         return true;
     }
 
-    function getUseTargets(answer) {
-        if ($.isArray(answer.draggables) === false) {
-            logme('ERROR: answer.draggables is not an array.');
+    function processAnswerTargets(state, answerSortedByDepth, minDepth, maxDepth, depth, i) {
+        var baseDraggableId, baseDraggable, baseTargetId, baseTarget,
+            layeredDraggableId, layeredDraggable, layeredTargetId, layeredTarget,
+            chain;
 
-            return;
-        } else if (answer.draggables.length === 0) {
-            return;
-        }
-
-        if ($.isPlainObject(answer.draggables[0]) === false) {
-            logme('ERROR: answer.draggables array does not contain objects.');
+        if (depth === 0) {
+            // We are at the lowest depth? The end.
 
             return;
         }
 
-        for (c1 in answer.draggables[0]) {
-            if (answer.draggables[0].hasOwnProperty(c1) === false) {
-                continue;
-            }
+        if (answerSortedByDepth.hasOwnProperty(depth) === false) {
+            // We have a depth that ts not valid, we decrease the depth by one.
+            processAnswerTargets(state, answerSortedByDepth, minDepth, maxDepth, depth - 1, 0);
 
-            if (typeof answer.draggables[0][c1] === 'string') {
-                // use_targets = true;
-
-                return true;
-            } else if (
-                ($.isArray(answer.draggables[0][c1]) === true) &&
-                (answer.draggables[0][c1].length === 2)
-            ) {
-                // use_targets = false;
-
-                return false;
-            } else {
-                logme('ERROR: answer.draggables[0] is inconsidtent.');
-
-                return;
-            }
+            return;
         }
 
-        logme('ERROR: answer.draggables[0] is an empty object.');
+        if (answerSortedByDepth[depth].length <= i) {
+            // We ran out of answers at this depth, go to the next depth down.
+            processAnswerTargets(state, answerSortedByDepth, minDepth, maxDepth, depth - 1, 0);
+
+            return;
+        }
+
+        chain = answerSortedByDepth[depth][i];
+
+        baseDraggableId = Object.keys(chain)[0];
+
+        // This is a hack. For now we will work with depths 1 and 3.
+        if (depth === 1) {
+            baseTargetId = chain[baseDraggableId];
+
+            layeredTargetId = null;
+            layeredDraggableId = null;
+
+            // createBaseDraggableOnTarget(state, baseDraggableId, baseTargetId);
+        } else if (depth === 3) {
+            layeredDraggableId = baseDraggableId;
+
+            layeredTargetId = Object.keys(chain[layeredDraggableId])[0];
+
+            baseDraggableId = Object.keys(chain[layeredDraggableId][layeredTargetId])[0];
+
+            baseTargetId = chain[layeredDraggableId][layeredTargetId][baseDraggableId];
+        }
+
+        checkBaseDraggable();
 
         return;
+
+        function checkBaseDraggable() {
+            if ((baseDraggable = getById(state, 'draggables', baseDraggableId, null, false, baseTargetId)) === null) {
+                createBaseDraggableOnTarget(state, baseDraggableId, baseTargetId, true, function () {
+                    if ((baseDraggable = getById(state, 'draggables', baseDraggableId, null, false, baseTargetId)) === null) {
+                        console.log('ERROR: Could not successfully create a base draggable on a base target.');
+                    } else {
+                        baseTarget = baseDraggable.onTarget;
+
+                        if ((layeredTargetId === null) || (layeredDraggableId === null)) {
+                            processAnswerTargets(state, answerSortedByDepth, minDepth, maxDepth, depth, i + 1);
+                        } else {
+                            checklayeredDraggable();
+                        }
+                    }
+                });
+            } else {
+                baseTarget = baseDraggable.onTarget;
+
+                if ((layeredTargetId === null) || (layeredDraggableId === null)) {
+                    processAnswerTargets(state, answerSortedByDepth, minDepth, maxDepth, depth, i + 1);
+                } else {
+                    checklayeredDraggable();
+                }
+            }
+        }
+
+        function checklayeredDraggable() {
+            if ((layeredDraggable = getById(state, 'draggables', layeredDraggableId, null, false, layeredTargetId, baseDraggableId, baseTargetId)) === null) {
+                layeredDraggable = getById(state, 'draggables', layeredDraggableId);
+                layeredTarget = null;
+                baseDraggable.targetField.every(function (target) {
+                    if (target.id === layeredTargetId) {
+                        layeredTarget = target;
+                    }
+
+                    return true;
+                });
+
+                if ((layeredDraggable !== null) && (layeredTarget !== null)) {
+                    layeredDraggable.moveDraggableTo('target', layeredTarget, function () {
+                        processAnswerTargets(state, answerSortedByDepth, minDepth, maxDepth, depth, i + 1);
+                    });
+                } else {
+                    processAnswerTargets(state, answerSortedByDepth, minDepth, maxDepth, depth, i + 1);
+                }
+            } else {
+                processAnswerTargets(state, answerSortedByDepth, minDepth, maxDepth, depth, i + 1);
+            }
+        }
     }
 
-    function processAnswerTargets(state, answer) {
-        var draggableId, draggable, targetId, target;
+    function createBaseDraggableOnTarget(state, draggableId, targetId, reportError, funcCallback) {
+        var draggable, target;
 
-        (function (c1) {
-            while (c1 < answer.draggables.length) {
-                for (draggableId in answer.draggables[c1]) {
-                    if (answer.draggables[c1].hasOwnProperty(draggableId) === false) {
-                        continue;
-                    }
-
-                    if ((draggable = getById(state, 'draggables', draggableId)) === null) {
-                        logme(
-                            'ERROR: In answer there exists a ' +
-                            'draggable ID "' + draggableId + '". No ' +
-                            'draggable with this ID could be found.'
-                        );
-
-                        continue;
-                    }
-
-                    targetId = answer.draggables[c1][draggableId];
-                    if ((target = getById(state, 'targets', targetId)) === null) {
-                        logme(
-                            'ERROR: In answer there exists a target ' +
-                            'ID "' + targetId + '". No target with this ' +
-                            'ID could be found.'
-                        );
-
-                        continue;
-                    }
-
-                    draggable.moveDraggableTo('target', target);
-                }
-
-                c1 += 1;
+        if ((draggable = getById(state, 'draggables', draggableId)) === null) {
+            if (reportError !== false) {
+                logme(
+                    'ERROR: In answer there exists a ' +
+                    'draggable ID "' + draggableId + '". No ' +
+                    'draggable with this ID could be found.'
+                );
             }
-        }(0));
+
+            return false;
+        }
+
+        if ((target = getById(state, 'targets', targetId)) === null) {
+            if (reportError !== false) {
+                logme(
+                    'ERROR: In answer there exists a target ' +
+                    'ID "' + targetId + '". No target with this ' +
+                    'ID could be found.'
+                );
+            }
+
+            return false;
+        }
+
+        draggable.moveDraggableTo('target', target, funcCallback);
+
+        return true;
     }
 
     function processAnswerPositions(state, answer) {
         var draggableId, draggable;
 
         (function (c1) {
-            while (c1 < answer.draggables.length) {
-                for (draggableId in answer.draggables[c1]) {
-                    if (answer.draggables[c1].hasOwnProperty(draggableId) === false) {
+            while (c1 < answer.length) {
+                for (draggableId in answer[c1]) {
+                    if (answer[c1].hasOwnProperty(draggableId) === false) {
                         continue;
                     }
 
@@ -171,8 +235,8 @@ define(['logme'], function (logme) {
                     }
 
                     draggable.moveDraggableTo('XY', {
-                        'x': answer.draggables[c1][draggableId][0],
-                        'y': answer.draggables[c1][draggableId][1]
+                        'x': answer[c1][draggableId][0],
+                        'y': answer[c1][draggableId][1]
                     });
                 }
 
@@ -182,33 +246,110 @@ define(['logme'], function (logme) {
     }
 
     function repositionDraggables(state, answer) {
-        if (answer.draggables.length === 0) {
+        var answerSortedByDepth, minDepth, maxDepth;
+
+        answerSortedByDepth = {};
+        minDepth = 1000;
+        maxDepth = 0;
+
+        answer.every(function (chain) {
+            var depth;
+
+            depth = findDepth(chain, 0);
+
+            if (depth < minDepth) {
+                minDepth = depth;
+            }
+            if (depth > maxDepth) {
+                maxDepth = depth;
+            }
+
+            if (answerSortedByDepth.hasOwnProperty(depth) === false) {
+                answerSortedByDepth[depth] = [];
+            }
+
+            answerSortedByDepth[depth].push(chain);
+
+            return true;
+        });
+
+        if (answer.length === 0) {
             return;
         }
 
-        if (state.config.individualTargets !== getUseTargets(answer)) {
-            logme('ERROR: JSON config is not consistent with server response.');
-
+        // For now we support only one case.
+        if ((minDepth < 1) || (maxDepth > 3)) {
             return;
         }
 
         if (state.config.individualTargets === true) {
-            processAnswerTargets(state, answer);
+            processAnswerTargets(state, answerSortedByDepth, minDepth, maxDepth, maxDepth, 0);
         } else if (state.config.individualTargets === false) {
             processAnswerPositions(state, answer);
         }
     }
 
-    function getById(state, type, id) {
+    function findDepth(tempObj, depth) {
+        var i;
+
+        if ($.isPlainObject(tempObj) === false) {
+            return depth;
+        }
+
+        depth += 1;
+
+        for (i in tempObj) {
+            if (tempObj.hasOwnProperty(i) === true) {
+                depth = findDepth(tempObj[i], depth);
+            }
+        }
+
+        return depth;
+    }
+
+    function getById(state, type, id, fromTargetField, inContainer, targetId, baseDraggableId, baseTargetId) {
         return (function (c1) {
             while (c1 < state[type].length) {
                 if (type === 'draggables') {
-                    if ((state[type][c1].id === id) && (state[type][c1].isOriginal === true)) {
-                        return state[type][c1];
+                    if ((targetId !== undefined) && (inContainer === false) && (baseDraggableId !== undefined) && (baseTargetId !== undefined)) {
+                        if (
+                            (state[type][c1].id === id) &&
+                            (state[type][c1].inContainer === false) &&
+                            (state[type][c1].onTarget.id === targetId) &&
+                            (state[type][c1].onTarget.type === 'on_drag') &&
+                            (state[type][c1].onTarget.draggableObj.id === baseDraggableId) &&
+                            (state[type][c1].onTarget.draggableObj.onTarget.id === baseTargetId)
+                        ) {
+                            return state[type][c1];
+                        }
+                    } else if ((targetId !== undefined) && (inContainer === false)) {
+                        if (
+                            (state[type][c1].id === id) &&
+                            (state[type][c1].inContainer === false) &&
+                            (state[type][c1].onTarget.id === targetId)
+                        ) {
+                            return state[type][c1];
+                        }
+                    } else {
+                        if (inContainer === false) {
+                            if ((state[type][c1].id === id) && (state[type][c1].inContainer === false)) {
+                                return state[type][c1];
+                            }
+                        } else {
+                            if ((state[type][c1].id === id) && (state[type][c1].inContainer === true)) {
+                                return state[type][c1];
+                            }
+                        }
                     }
                 } else { // 'targets'
-                    if (state[type][c1].id === id) {
-                        return state[type][c1];
+                    if (fromTargetField === true) {
+                        if ((state[type][c1].id === id) && (state[type][c1].type === 'on_drag')) {
+                            return state[type][c1];
+                        }
+                    } else {
+                        if ((state[type][c1].id === id) && (state[type][c1].type === 'base')) {
+                            return state[type][c1];
+                        }
                     }
                 }
 
@@ -218,10 +359,5 @@ define(['logme'], function (logme) {
             return null;
         }(0));
     }
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
+}); // End-of: define(['logme'], function (logme) {
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define) {
diff --git a/common/static/js/capa/genex/2DDA730EDABB80B88A6B0DFA3AFEACA2.cache.html b/common/static/js/capa/genex/3F4ADBED36D589545A9300A1EA686D36.cache.html
similarity index 91%
rename from common/static/js/capa/genex/2DDA730EDABB80B88A6B0DFA3AFEACA2.cache.html
rename to common/static/js/capa/genex/3F4ADBED36D589545A9300A1EA686D36.cache.html
index 743492768b..c5ad0d1b89 100644
--- a/common/static/js/capa/genex/2DDA730EDABB80B88A6B0DFA3AFEACA2.cache.html
+++ b/common/static/js/capa/genex/3F4ADBED36D589545A9300A1EA686D36.cache.html
@@ -1,4 +1,4 @@
-<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.5.0";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '2DDA730EDABB80B88A6B0DFA3AFEACA2';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script><!--
+<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.5.0";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '3F4ADBED36D589545A9300A1EA686D36';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script><!--
 function HA(){}
 function Ub(){}
 function kc(){}
@@ -632,7 +632,7 @@ function mp(a,b){var c=(a.__eventBits||0)^b;a.__eventBits=b;if(!c)return;c&1&&(a
 function Ju(a){if(px(a,'UUU'))return HC;if(px(a,'UUC'))return HC;if(px(a,'UUA'))return IC;if(px(a,'UUG'))return IC;if(px(a,'CUU'))return IC;if(px(a,'CUC'))return IC;if(px(a,'CUA'))return IC;if(px(a,'CUG'))return IC;if(px(a,'AUU'))return JC;if(px(a,'AUC'))return JC;if(px(a,'AUA'))return JC;if(px(a,KC))return 'Met';if(px(a,'GUU'))return LC;if(px(a,'GUC'))return LC;if(px(a,'GUA'))return LC;if(px(a,'GUG'))return LC;if(px(a,'UCU'))return MC;if(px(a,'UCC'))return MC;if(px(a,'UCA'))return MC;if(px(a,'UCG'))return MC;if(px(a,'CCU'))return NC;if(px(a,'CCC'))return NC;if(px(a,'CCA'))return NC;if(px(a,'CCG'))return NC;if(px(a,'ACU'))return OC;if(px(a,'ACC'))return OC;if(px(a,'ACA'))return OC;if(px(a,'ACG'))return OC;if(px(a,'GCU'))return PC;if(px(a,'GCC'))return PC;if(px(a,'GCA'))return PC;if(px(a,'GCG'))return PC;if(px(a,'UAU'))return QC;if(px(a,'UAC'))return QC;if(px(a,'UAA'))return mB;if(px(a,'UAG'))return mB;if(px(a,'CAU'))return RC;if(px(a,'CAC'))return RC;if(px(a,'CAA'))return SC;if(px(a,'CAG'))return SC;if(px(a,'AAU'))return TC;if(px(a,'AAC'))return TC;if(px(a,'AAA'))return UC;if(px(a,'AAG'))return UC;if(px(a,'GAU'))return VC;if(px(a,'GAC'))return VC;if(px(a,'GAA'))return WC;if(px(a,'GAG'))return WC;if(px(a,'UGU'))return XC;if(px(a,'UGC'))return XC;if(px(a,'UGA'))return mB;if(px(a,'UGG'))return 'Trp';if(px(a,'CGU'))return YC;if(px(a,'CGC'))return YC;if(px(a,'CGA'))return YC;if(px(a,'CGG'))return YC;if(px(a,'AGU'))return MC;if(px(a,'AGC'))return MC;if(px(a,'AGA'))return YC;if(px(a,'AGG'))return YC;if(px(a,'GGU'))return ZC;if(px(a,'GGC'))return ZC;if(px(a,'GGA'))return ZC;if(px(a,'GGG'))return ZC;return mB}
 --></script>
 <script><!--
-var mB='',aD='\n',sB=' ',_C='    ',bD='    .    |',fD=' N-',pB='(',NB=')',zD='+',ID=', ',cC='-',pD="-3'\n",kD='-C',vC='0',kC='0px',EC='1',$C="5'-",rB=':',lB=': ',gD='<\/EM>',lD='<\/pre><h3>',hD='<\/u>',nD='<EM class=',jD='<EM class=selected>',dD='<font color=red>none<\/font>\n',iD='<u>',AD='=',oD='>',uD='A',FD='AAAAAAAAAAAAA',KC='AUG',PC='Ala',YC='Arg',TC='Asn',VC='Asp',wD='C',ED='CAAAG',vB='CENTER',uB='CSS1Compat',XC='Cys',vD='G',CD='GGGGG',DD='GUGCG',SC='Gln',WC='Glu',ZC='Gly',RC='His',qD='INCORRECT',JC='Ile',wB='JUSTIFY',xB='LEFT',IC='Leu',UC='Lys',aC='Null widget handle. If you are creating a composite, ensure that initWidget() has been called.',rD='OK',HC='Phe',NC='Pro',yB='RIGHT',sC='Selected Base = ',MC='Ser',oB='String',bC='Style names cannot be empty',xD='T',BD='TATAA',OC='Thr',QC='Tyr',QD='UmbrellaException',LC='Val',GD='You did not make a single base substitution.',ZD='[Lcom.google.gwt.dom.client.',UD='[Lcom.google.gwt.user.client.ui.',LD='[Ljava.lang.',zC='absolute',tC='align',oC='cellPadding',nC='cellSpacing',_B='className',zB='click',yC='clip',SD='com.google.gwt.animation.client.',KD='com.google.gwt.core.client.',XD='com.google.gwt.core.client.impl.',YD='com.google.gwt.dom.client.',WD='com.google.gwt.event.dom.client.',_D='com.google.gwt.event.logical.shared.',RD='com.google.gwt.event.shared.',OD='com.google.gwt.i18n.client.',aE='com.google.gwt.text.shared.testing.',bE='com.google.gwt.touch.client.',TD='com.google.gwt.user.client.',$D='com.google.gwt.user.client.impl.',ND='com.google.gwt.user.client.ui.',PD='com.google.web.bindery.event.shared.',OB='dblclick',KB='dir',wC='display',HB='div',YB='dragenter',XB='dragover',qB='function',yD='g',tD='genex-button',MD='genex.client.gx.',dE='genex.client.problems.',cE='genex.client.requirements.',sD='genex_container',VB='gesturechange',WB='gestureend',UB='gesturestart',$B='height',kB='hidden',MB='ie9',JD='java.lang.',VD='java.util.',PB='keydown',QB='keypress',RB='keyup',dC='left',LB='ltr',mD='mature-',AB='mousedown',BB='mousemove',CB='mouseout',DB='mouseover',EB='mouseup',TB='mousewheel',GC='msie',xC='none',eD='none\n',nB='null',hB='offsetHeight',iB='offsetWidth',BC='onresize',FC='opera',jB='overflow',rC='popupContent',fC='position',jC='px',AC='px, ',lC='rect(0px, 0px, 0px, 0px)',CC='relative',tB='rtl',SB='scroll',gC='table',hC='tbody',qC='td',eC='top',FB='touchcancel',GB='touchend',IB='touchmove',JB='touchstart',pC='tr',HD='value',uC='verticalAlign',iC='visibility',mC='visible',ZB='width',DC='zoom',cD='|';var _,Gm={},VA={25:1,27:1},dB={60:1},QA={6:1,9:1,50:1,53:1,54:1},LA={50:1},IA={},$A={46:1},bB={52:1},fB={50:1,57:1},XA={24:1,29:1,37:1,40:1,41:1,43:1,45:1},cB={58:1},_A={11:1,27:1},SA={29:1},TA={47:1,50:1,56:1},MA={50:1,56:1},PA={6:1,8:1,50:1,53:1,54:1},eB={59:1},OA={6:1,7:1,50:1,53:1,54:1},NA={5:1,6:1,50:1,53:1,54:1},WA={23:1,27:1},ZA={44:1,50:1,53:1,54:1},JA={4:1,50:1},UA={27:1,36:1},KA={38:1},YA={24:1,29:1,37:1,40:1,41:1,42:1,43:1,45:1},aB={49:1},RA={10:1,50:1,53:1,54:1};Hm(1,-1,IA);_.eQ=function s(a){return this===a};_.gC=function t(){return this.cZ};_.hC=function u(){return Ib(this)};_.tS=function v(){return this.cZ.c+'@'+cx(this.hC())};_.toString=function(){return this.tS()};_.tM=HA;Hm(3,1,{});_.k=-1;_.n=false;_.o=false;_.p=null;_.q=-1;_.r=null;_.s=-1;_.t=false;Hm(4,1,{},C);_.a=null;Hm(5,1,{});Hm(6,1,{2:1});Hm(7,5,{});var G=null;Hm(8,7,{},M);Hm(10,1,KA);_.I=function W(){this.b||Sz(P,this);this.J()};_.b=false;_.c=0;var P;Hm(9,10,KA,X);_.J=function Y(){L(this.a)};_.a=null;Hm(11,6,{2:1,3:1},ab);_.a=null;_.b=null;Hm(12,1,{},db);Hm(17,1,MA);_.K=function kb(){return this.e};_.tS=function lb(){var a,b;a=this.cZ.c;b=this.K();return b!=null?a+lB+b:a};_.e=null;Hm(16,17,MA);Hm(15,16,MA,mb);Hm(14,15,MA,ob);_.K=function ub(){this.c==null&&(this.d=rb(this.b),this.a=this.a+lB+pb(this.b),this.c=pB+this.d+') '+tb(this.b)+this.a,undefined);return this.c};_.a=mB;_.b=null;_.c=null;_.d=null;Hm(21,1,{});var zb=0,Ab=0,Bb=0,Cb=-1;Hm(23,21,{},Ub);_.a=null;_.b=null;_.c=null;_.d=false;_.e=null;_.f=null;_.g=null;_.i=false;var Mb;Hm(24,1,{},_b);_.L=function ac(){this.a.d=true;Qb(this.a);this.a.d=false;return this.a.i=Rb(this.a)};_.a=null;Hm(25,1,{},cc);_.L=function dc(){this.a.d&&Zb(this.a.e,1);return this.a.i};_.a=null;Hm(28,1,{},kc);_.N=function lc(a){return ec(a)};Hm(46,1,{50:1,53:1,54:1});_.eQ=function Yc(a){return this===a};_.hC=function Zc(){return Ib(this)};_.tS=function $c(){return this.a};_.a=null;_.b=0;Hm(45,46,NA);var _c,ad,bd,cd,dd;Hm(47,45,NA,hd);Hm(48,45,NA,jd);Hm(49,45,NA,ld);Hm(50,45,NA,nd);Hm(51,46,OA);var pd,qd,rd,sd,td;Hm(52,51,OA,xd);Hm(53,51,OA,zd);Hm(54,51,OA,Bd);Hm(55,51,OA,Dd);Hm(56,46,PA);var Fd,Gd,Hd,Id,Jd;Hm(57,56,PA,Nd);Hm(58,56,PA,Pd);Hm(59,56,PA,Rd);Hm(60,56,PA,Td);Hm(61,46,QA);var Vd,Wd,Xd,Yd,Zd;Hm(62,61,QA,be);Hm(63,61,QA,de);Hm(64,61,QA,fe);Hm(65,61,QA,he);Hm(66,46,RA);var je,ke,le,me,ne,oe,pe,qe,re,se;Hm(67,66,RA,we);Hm(68,66,RA,ye);Hm(69,66,RA,Ae);Hm(70,66,RA,Ce);Hm(71,66,RA,Ee);Hm(72,66,RA,Ge);Hm(73,66,RA,Ie);Hm(74,66,RA,Ke);Hm(75,66,RA,Me);Hm(81,1,{});_.tS=function Te(){return 'An event type'};_.f=null;Hm(80,81,{});_.Q=function Ve(){this.e=false;this.f=null};_.e=false;Hm(79,80,{});_.P=function $e(){return this.R()};_.a=null;_.b=null;var We=null;Hm(78,79,{});Hm(77,78,{});Hm(76,77,{},df);_.O=function ef(a){bi(a,11).S(this)};_.R=function ff(){return bf};var bf;Hm(84,1,{});_.hC=function lf(){return this.c};_.tS=function mf(){return 'Event type'};_.c=0;var kf=0;Hm(83,84,{},nf);Hm(82,83,{12:1},of);_.a=null;_.b=null;Hm(85,77,{},tf);_.O=function uf(a){sf(this,bi(a,13))};_.R=function vf(){return qf};var qf;Hm(86,77,{},Af);_.O=function Bf(a){zf(this,bi(a,14))};_.R=function Cf(){return xf};var xf;Hm(87,77,{},Gf);_.O=function Hf(a){bi(bi(a,15),39)};_.R=function If(){return Ef};var Ef;Hm(88,77,{},Mf);_.O=function Nf(a){bi(bi(a,16),39)};_.R=function Of(){return Kf};var Kf;Hm(89,77,{},Tf);_.O=function Uf(a){Sf(this,bi(a,17))};_.R=function Vf(){return Qf};var Qf;Hm(90,1,{},Zf);_.a=null;Hm(93,78,{});var ag=null;Hm(92,93,{},dg);_.O=function eg(a){sn(bi(bi(a,18),34).a)};_.R=function fg(){return bg};var bg;Hm(94,93,{},jg);_.O=function kg(a){sn(bi(bi(a,19),33).a)};_.R=function lg(){return hg};var hg;Hm(95,1,{},ng);Hm(96,93,{},sg);_.O=function tg(a){rg(this,bi(a,20))};_.R=function ug(){return pg};var pg;Hm(97,93,{},zg);_.O=function Ag(a){yg(this,bi(a,21))};_.R=function Bg(){return wg};var wg;Hm(98,80,{},Fg);_.O=function Gg(a){Eg(this,bi(a,22))};_.P=function Ig(){return Dg};_.a=false;var Dg=null;Hm(99,80,{},Lg);_.O=function Mg(a){bi(a,23).T(this)};_.P=function Og(){return Kg};var Kg=null;Hm(100,80,{},Rg);_.O=function Sg(a){bi(a,25).U(this)};_.P=function Ug(){return Qg};_.a=0;var Qg=null;Hm(101,80,{},Yg);_.O=function Zg(a){Xg(bi(a,26))};_.P=function _g(){return Wg};var Wg=null;Hm(102,1,SA,eh,fh);_.V=function gh(a){ch(this,a)};_.a=null;_.b=null;Hm(105,1,{});Hm(104,105,{});_.a=null;_.b=0;_.c=false;Hm(103,104,{},vh);Hm(106,1,{28:1},xh);_.a=null;Hm(108,15,TA,Ah);_.a=null;Hm(107,108,TA,Dh);Hm(109,1,{27:1},Fh);Hm(111,46,{30:1,50:1,53:1,54:1},Oh);var Jh,Kh,Lh,Mh;Hm(112,1,{},Qh);_.qI=0;var Wh,Xh;Hm(121,1,{});Hm(122,1,{},Nm);var Mm=null;Hm(123,121,{},Qm);var Pm=null;Hm(124,1,{},Um);Hm(125,1,{},Zm);_.a=0;_.b=0;_.c=null;_.d=null;_.e=null;Hm(126,1,{32:1},cn,dn);_.eQ=function en(a){var b;if(!di(a,32)){return false}b=bi(a,32);return this.a==b.a&&this.b==b.b};_.hC=function fn(){return hi(this.a)^hi(this.b)};_.tS=function gn(){return 'Point('+this.a+','+this.b+NB};_.a=0;_.b=0;Hm(127,1,{},Bn);_.a=null;_.b=null;_.c=false;_.f=null;_.g=null;_.n=null;_.o=null;_.p=null;_.r=false;_.s=null;var jn=null;Hm(128,1,{22:1,27:1},Dn);_.a=null;Hm(129,1,{21:1,27:1},Fn);_.a=null;Hm(130,1,{20:1,27:1},Hn);_.a=null;Hm(131,1,{19:1,27:1,33:1},Jn);_.a=null;Hm(132,1,{18:1,27:1,34:1},Ln);_.a=null;Hm(133,1,UA,Nn);_.W=function On(a){var b;if(1==Zo(a.d.type)){b=new cn(a.d.clientX||0,a.d.clientY||0);if(pn(this.a,b)||qn(this.a,b)){a.a=true;a.d.stopPropagation();a.d.preventDefault()}}};_.a=null;Hm(134,1,{},Rn);_.L=function Sn(){var a,b,c,d,e,f,g;if(this!=this.e.g){Qn(this);return false}a=cb(this.a);Xm(this.d,a-this.c);this.c=a;Wm(this.d,a);e=Tm(this.d);e||Qn(this);zn(this.e,this.d.d);d=hi(this.d.d.a);c=tt(this.e.s);b=rt(this.e.s);f=st(this.e.s);g=hi(this.d.d.b);if((f<=g||0>=g)&&(b<=d||c>=d)){Qn(this);return false}return e};_.c=0;_.d=null;_.e=null;_.f=null;Hm(135,1,VA,Un);_.U=function Vn(a){Qn(this.a)};_.a=null;Hm(136,1,{},Xn);_.L=function Yn(){var a,b,c;a=eb();b=new tz(this.a.q);while(b.b<b.d.zb()){c=bi(rz(b),35);a-c.b>=2500&&sz(b)}return this.a.q.b!=0};_.a=null;Hm(137,1,{35:1},_n,ao);_.a=null;_.b=0;var bo=null,co=null;var lo=null;Hm(142,80,{},so);_.O=function to(a){bi(a,36).W(this);po.c=false};_.P=function vo(){return oo};_.Q=function wo(){qo(this)};_.a=false;_.b=false;_.c=false;_.d=null;var oo=null,po=null;var xo=null;Hm(144,1,WA,Bo);_.T=function Co(a){while((Q(),P).b>0){R(bi(Pz(P,0),38))}};var Do=false,Eo=null,Fo=0,Go=0,Ho=false;Hm(146,80,{},To);_.O=function Uo(a){ii(a);null.Jb()};_.P=function Vo(){return Ro};var Ro;Hm(147,102,SA,Xo);var Yo=false;var bp=null,cp=null,dp=null,ep=null,fp=null,gp=null;Hm(152,1,SA,sp);_.Y=function tp(a){return decodeURI(a.replace('%23','#'))};_.V=function up(a){ch(this.a,a)};_.Z=function vp(a){a=a==null?mB:a;if(!px(a,pp==null?mB:pp)){pp=a;$g(this)}};var pp=mB;Hm(155,1,{},zp);_.M=function Ap(){$wnd.__gwt_initWindowCloseHandler(gB(Oo),gB(No))};Hm(156,1,{},Cp);_.M=function Dp(){$wnd.__gwt_initWindowResizeHandler(gB(Po))};Hm(161,1,{40:1,43:1});_.$=function Op(){return this.H};_._=function Pp(a){jo(this.H,$B,a)};_.ab=function Sp(a){jo(this.H,ZB,a)};_.tS=function Tp(){if(!this.H){return '(null handle)'}return this.H.outerHTML};_.H=null;Hm(160,161,XA);_.bb=function bq(){};_.cb=function cq(){};_.V=function dq(a){Xp(this,a)};_.db=function eq(){Yp(this)};_.X=function fq(a){Zp(this,a)};_.eb=function gq(){$p(this)};_.fb=function hq(){};_.gb=function iq(){};_.D=false;_.E=0;_.F=null;_.G=null;Hm(159,160,XA);_.bb=function kq(){Aq(this,(yq(),wq))};_.cb=function lq(){Aq(this,(yq(),xq))};Hm(158,159,XA);_.ib=function pq(){return new uu(this.f)};_.hb=function qq(a){return nq(this,a)};Hm(157,158,XA);_.hb=function uq(a){return sq(this,a)};Hm(162,107,TA,zq);var wq,xq;Hm(163,1,{},Cq);_.jb=function Dq(a){a.db()};Hm(164,1,{},Fq);_.jb=function Gq(a){a.eb()};Hm(167,160,XA);_.db=function Kq(){var a;Yp(this);a=Nc(this.H);-1==a&&(this.H.tabIndex=0,undefined)};Hm(166,167,XA);Hm(165,166,XA,Mq);Hm(168,158,XA);_.d=null;_.e=null;Hm(171,159,XA);_.kb=function Wq(){return this.H};_.ib=function Xq(){return new Ft(this)};_.hb=function Yq(a){return Sq(this,a)};_.C=null;Hm(170,171,XA);_.kb=function gr(){return Cc(this.H)};_.$=function hr(){return Dc(Cc(this.H))};_.lb=function ir(){_q(this)};_.W=function jr(a){a.c&&(a.d,false)&&(a.a=true)};_.gb=function kr(){this.A&&Is(this.z,false,true)};_._=function lr(a){this.o=a;ar(this);a.length==0&&(this.o=null)};_.ab=function mr(a){this.p=a;ar(this);a.length==0&&(this.p=null)};_.k=false;_.n=false;_.o=null;_.p=null;_.q=null;_.s=null;_.t=false;_.u=false;_.v=-1;_.w=false;_.x=null;_.y=false;_.A=false;_.B=-1;Hm(169,170,XA);_.bb=function or(){Yp(this.j)};_.cb=function pr(){$p(this.j)};_.ib=function qr(){return new Ft(this.j)};_.hb=function rr(a){return Sq(this.j,a)};_.j=null;Hm(172,171,XA,ur);_.kb=function wr(){return this.a};_.a=null;_.b=null;Hm(173,169,XA,Gr);_.bb=function Ir(){try{Yp(this.j)}finally{Yp(this.a)}};_.cb=function Jr(){try{$p(this.j)}finally{$p(this.a)}};_.lb=function Kr(){Br(this)};_.X=function Lr(a){switch(Zo(a.type)){case 4:case 8:case 64:case 16:case 32:if(!this.f&&!Cr(this,a)){return}}Zp(this,a)};_.W=function Mr(a){var b;b=a.d;!a.a&&Zo(a.d.type)==4&&Cr(this,b)&&(b.preventDefault(),undefined);a.c&&(a.d,false)&&(a.a=true)};_.a=null;_.b=0;_.c=0;_.d=0;_.e=0;_.f=false;_.g=null;_.i=0;Hm(174,1,VA,Or);_.U=function Pr(a){this.a.i=a.a};_.a=null;Hm(178,160,XA);_.a=null;Hm(177,178,XA,Xr);Hm(176,177,XA,Zr,$r);Hm(175,176,XA,_r);Hm(179,1,{13:1,14:1,15:1,16:1,17:1,27:1,39:1},bs);_.a=null;Hm(180,1,{},es);_.a=null;_.b=null;_.c=null;var fs,gs,hs;Hm(181,1,{});Hm(182,181,{},ls);_.a=null;var ms;Hm(183,1,{},ps);_.a=null;Hm(184,168,XA,ss);_.hb=function ts(a){var b,c;c=Dc(a.H);b=nq(this,a);b&&tc(this.b,c);return b};_.b=null;Hm(185,1,VA,ws);_.U=function xs(a){vs()};Hm(186,1,UA,zs);_.W=function As(a){br(this.a,a)};_.a=null;Hm(187,1,{26:1,27:1},Cs);_.a=null;Hm(188,3,{},Js);_.a=null;_.b=false;_.c=false;_.d=0;_.e=-1;_.f=null;_.g=null;_.i=false;Hm(189,10,KA,Ls);_.J=function Ms(){this.a.g=null;x(this.a,eb())};_.a=null;Hm(191,157,YA,Vs);var Rs,Ss,Ts;Hm(192,1,{},$s);_.jb=function _s(a){a.D&&a.eb()};Hm(193,1,WA,bt);_.T=function ct(a){Xs()};Hm(194,191,YA,et);Hm(195,1,{});var gt=null;Hm(196,195,{},nt);var kt=null,lt=null;Hm(197,171,XA,xt);_.kb=function yt(){return this.a};_.db=function zt(){Yp(this);this.b.__listener=this};_.eb=function At(){this.b.__listener=null;$p(this)};_._=function Bt(a){jo(this.H,$B,a)};_.ab=function Ct(a){jo(this.H,ZB,a)};_.a=null;_.b=null;_.c=null;Hm(198,1,{},Ft);_.mb=function Gt(){return this.a};_.nb=function Ht(){return Et(this)};_.ob=function It(){!!this.b&&this.c.hb(this.b)};_.b=null;_.c=null;Hm(201,167,XA);_.X=function Nt(a){var b;b=Zo(a.type);(b&896)!=0?Zp(this,a):Zp(this,a)};_.fb=function Ot(){};Hm(200,201,XA);Hm(199,200,XA,Qt);Hm(202,46,ZA);var Tt,Ut,Vt,Wt,Xt;Hm(203,202,ZA,_t);Hm(204,202,ZA,bu);Hm(205,202,ZA,du);Hm(206,202,ZA,fu);Hm(207,168,XA,iu);_.hb=function ju(a){var b,c;c=Dc(a.H);b=nq(this,a);b&&tc(this.d,Dc(c));return b};Hm(208,1,{},qu);_.ib=function ru(){return new uu(this)};_.a=null;_.b=null;_.c=0;Hm(209,1,{},uu);_.mb=function vu(){return this.a<this.b.c-1};_.nb=function wu(){return tu(this)};_.ob=function xu(){if(this.a<0||this.a>=this.b.c){throw new Zw}this.b.b.hb(this.b.a[this.a--])};_.a=-1;_.b=null;Hm(213,1,{},Cu);_.a=null;_.b=null;_.c=null;Hm(214,1,$A,Eu);_.M=function Fu(){mh(this.a,this.c,this.b)};_.a=null;_.b=null;_.c=null;Hm(215,1,$A,Hu);_.M=function Iu(){oh(this.a,this.c,this.b)};_.a=null;_.b=null;_.c=null;Hm(217,1,{},Mu);_.a=0;Hm(218,1,{},Ou);_.a=0;_.b=0;_.c=0;Hm(219,1,{},cv);_.a=null;_.b=null;_.c=null;_.d=null;_.e=null;_.f=0;_.g=0;_.i=0;_.j=null;_.k=null;_.n=null;_.o=0;_.p=0;_.q=null;_.r=null;_.s=null;_.t=0;Hm(220,1,{},nv);_.pb=function ov(a){var b,c;if(a==39){++this.d;this.d>this.a.length-1&&(this.d=this.a.length-1);b=jv(this,this.a,this.d);mv(this,b,this.d);this.b=b.b.b.length;b.b.f+1;ev(this)}if(a==37){--this.d;this.d<0&&(this.d=0);b=jv(this,this.a,this.d);mv(this,b,this.d);this.b=b.b.b.length;b.b.f+1;ev(this)}if(a==8||a==46){this.A=this.e;c=new Px(this.a);Lx(c,this.d);this.a=rc(c.a);this.d>=0&&--this.d;b=jv(this,this.a,this.d);mv(this,b,this.d);this.e=Yu(b.b);this.b=b.b.b.length;ev(this)}};_.qb=function pv(a,b){var c,d;if(px(a,uD)||px(a,vD)||px(a,wD)||px(a,xD)){this.A=this.e;d=new Px(this.a);Mx(d,this.d,a);this.a=rc(d.a);++this.d;c=jv(this,this.a,this.d);mv(this,c,this.d);this.e=Yu(c.b);this.b=c.b.b.length;c.b.f+1;ev(this)}if(px(a,'a')||px(a,yD)||px(a,'c')||px(a,'t')){this.A=this.e;d=new Px(this.a);Nx(d,this.d,this.d+1,a.toUpperCase());this.a=rc(d.a);c=jv(this,this.a,this.d);mv(this,c,this.d);this.e=Yu(c.b);this.b=c.b.b.length;c.b.f+1;ev(this)}if(px(a,zD)||px(a,cC)||px(a,AD)||px(a,'_')){if(px(a,zD)||px(a,AD)){++this.d;this.d>this.a.length-1&&(this.d=this.a.length-1)}else{--this.d;this.d<0&&(this.d=0)}c=jv(this,this.a,this.d);mv(this,c,this.d);this.b=c.b.b.length;c.b.f+1;ev(this)}if(b==39){++this.d;this.d>this.a.length-1&&(this.d=this.a.length-1);c=jv(this,this.a,this.d);mv(this,c,this.d);this.b=c.b.b.length;c.b.f+1;ev(this)}if(b==37){--this.d;this.d<0&&(this.d=0);c=jv(this,this.a,this.d);mv(this,c,this.d);this.b=c.b.b.length;c.b.f+1;ev(this)}};_.rb=function qv(a){var b;if(a>=0&&a<=this.b){b=jv(this,this.a,a);mv(this,b,a);this.b=b.b.b.length;this.d=a;ev(this)}};_.sb=function sv(a){var b;a!=null&&Mv(this.y,a);this.y.e=BD;this.y.g=CD;this.y.c=DD;this.y.b=ED;this.y.d=FD;this.f=this.y.a;this.a=this.y.a;this.b=this.a.length;this.C=this.y.e;this.D=this.y.f;this.G=this.y.g;this.u=this.y.c;this.t=this.y.b;this.z=this.y.d;(px(this.u,xC)||px(this.t,xC))&&(this.z=mB);b=jv(this,this.f,-1);this.g=b.b.e;this.i=b.b.q;this.b=b.b.b.length;this.e=Yu(b.b);Yr(this.r,b.a.b+'<\/pre><\/body><\/html>')};_.tb=function uv(a){var b,c,d,e,f;this.B=new bw;if(a==1){b=new zw;b.b=GD;_v(this.B,b);d=new ww;d.b='Your change does not make the mature mRNA shorter.';_v(this.B,d)}else if(a==2){b=new zw;b.b=GD;_v(this.B,b);d=new hw;d.b='Your change does not make the protein longer.';_v(this.B,d)}else if(a==3){b=new zw;b.b=GD;_v(this.B,b);d=new tw;d.b='Your change does not make the protein shorter.';_v(this.B,d)}else if(a==4){b=new zw;b.b=GD;_v(this.B,b);d=new nw;d.b='Your change does not prevent mRNA from being made.';_v(this.B,d);f=new kw;f.b='Your change does not prevent protein from being made';_v(this.B,f)}else if(a==5){c=new qw;c.a=c.a;c.b='Your protein does not have 5 amino acids.';_v(this.B,c);e=new ew;e.a=1;e.b='Your gene does not contain one intron.';_v(this.B,e)}};_.a=null;_.b=0;_.c=null;_.d=0;_.e=mB;_.f=null;_.g=mB;_.i=mB;_.j=null;_.k=null;_.n=false;_.o=null;_.p=null;_.q=null;_.r=null;_.s=null;_.t=null;_.u=null;_.v=null;_.w=null;_.x=null;_.z=null;_.A=mB;_.B=null;_.C=null;_.D=0;_.E=null;_.F=null;_.G=null;_.H=null;Hm(221,1,_A,xv);_.S=function yv(a){Br(this.a.j);this.a.o.H[HD]=mB};_.a=null;Hm(222,1,{},Av);_.M=function Bv(){gv(this.a);fv(this.a);hv(this.a);iv(this.a);typeof $wnd.genexIsReady===qB&&$wnd.genexIsReady()};_.a=null;Hm(223,1,_A,Dv);_.S=function Ev(a){var b,c;this.a.A=this.a.e;c=xc(this.a.o.H,HD);c=c.toUpperCase();c=tx(c,'[^AGCT]',mB);this.a.a=c;this.a.d=-1;b=jv(this.a,this.a.a,-1);mv(this.a,b,-1);this.a.e=Yu(b.b);this.a.b=b.b.b.length;Br(this.a.j);ev(this.a)};_.a=null;Hm(224,1,_A,Gv);_.S=function Hv(a){var b;this.a.a=this.a.f;b=jv(this.a,this.a.a,-1);mv(this.a,b,-1);this.a.e=Yu(b.b);this.a.b=b.b.b.length;ev(this.a)};_.a=null;Hm(225,1,_A,Jv);_.S=function Kv(a){Zq(this.a.j)};_.a=null;Hm(226,1,{},Nv);_.a=null;_.b=null;_.c=null;_.d=null;_.e=null;_.f=0;_.g=null;Hm(227,1,{},Pv);_.a=null;_.b=null;Hm(228,1,{48:1},Tv);_.a=0;_.b=0;_.c=false;_.d=false;_.e=0;_.f=0;_.g=false;Hm(229,1,{},Vv);_.a=null;_.b=null;Hm(230,1,{},Yv);_.tS=function Zv(){return Xv(this)};_.a=null;_.b=0;_.c=null;_.d=null;_.e=0;_.f=null;_.g=null;_.i=null;Hm(231,1,{},bw);_.a=null;Hm(233,1,aB);_.b='unassigned';Hm(232,233,aB,ew);_.ub=function fw(a){return a.b==this.a+1};_.a=0;Hm(234,233,aB,hw);_.ub=function iw(a){return a.c.length>a.i.length};Hm(235,233,aB,kw);_.ub=function lw(a){return px(a.c,mB)};Hm(236,233,aB,nw);_.ub=function ow(a){return px(a.d,mB)};Hm(237,233,aB,qw);_.ub=function rw(a){return a.c.length==this.a};_.a=0;Hm(238,233,aB,tw);_.ub=function uw(a){return a.c.length<a.i.length};Hm(239,233,aB,ww);_.ub=function xw(a){return a.d.length<a.g.length};Hm(240,233,aB,zw);_.ub=function Aw(a){var b,c,d,e;e=a.f;b=a.a;if(e.length!=b.length)return false;d=0;for(c=0;c<e.length;++c){e.charCodeAt(c)!=b.charCodeAt(c)&&++d}if(d==1)return true;return false};Hm(241,15,MA,Cw);Hm(242,1,{50:1,51:1,53:1},Hw);_.eQ=function Iw(a){return di(a,51)&&bi(a,51).a==this.a};_.hC=function Jw(){return this.a?1231:1237};_.tS=function Kw(){return this.a?'true':'false'};_.a=false;var Ew,Fw;Hm(243,1,{},Mw);_.tS=function Tw(){return ((this.a&2)!=0?'interface ':(this.a&1)!=0?mB:'class ')+this.c};_.a=0;_.b=0;_.c=null;Hm(244,15,MA,Vw);Hm(245,15,MA,Xw);Hm(246,15,MA,Zw,$w);Hm(247,15,MA,ax,bx);Hm(251,15,MA,gx,hx);var ix;Hm(253,1,{50:1,55:1},lx);_.tS=function mx(){return this.a+'.'+this.c+'(Unknown Source'+(this.b>=0?rB+this.b:mB)+NB};_.a=null;_.b=0;_.c=null;_=String.prototype;_.cM={1:1,50:1,52:1,53:1};_.eQ=function yx(a){return px(this,a)};_.hC=function zx(){return Gx(this)};_.tS=_.toString;var Bx,Cx=0,Dx;Hm(255,1,bB,Ox,Px);_.tS=function Qx(){return rc(this.a)};Hm(256,1,bB,Tx);_.tS=function Ux(){return rc(this.a)};Hm(257,15,MA,Wx);Hm(258,1,{});_.vb=function $x(a){throw new Wx('Add not supported on this collection')};_.wb=function _x(a){var b;b=Yx(this.ib(),a);return !!b};_.xb=function ay(){return this.zb()==0};_.yb=function by(a){var b;b=Yx(this.ib(),a);if(b){b.ob();return true}else{return false}};_.tS=function cy(){return Zx(this)};Hm(260,1,cB);_.eQ=function gy(a){var b,c,d,e,f;if(a===this){return true}if(!di(a,58)){return false}e=bi(a,58);if(this.d!=e.d){return false}for(c=new Oy((new Gy(e)).a);qz(c.a);){b=c.b=bi(rz(c.a),59);d=b.Bb();f=b.Cb();if(!(d==null?this.c:di(d,1)?rB+bi(d,1) in this.e:qy(this,d,~~xb(d)))){return false}if(!GA(f,d==null?this.b:di(d,1)?py(this,bi(d,1)):oy(this,d,~~xb(d)))){return false}}return true};_.hC=function hy(){var a,b,c;c=0;for(b=new Oy((new Gy(this)).a);qz(b.a);){a=b.b=bi(rz(b.a),59);c+=a.hC();c=~~c}return c};_.tS=function iy(){var a,b,c,d;d='{';a=false;for(c=new Oy((new Gy(this)).a);qz(c.a);){b=c.b=bi(rz(c.a),59);a?(d+=ID):(a=true);d+=mB+b.Bb();d+=AD;d+=mB+b.Cb()}return d+'}'};Hm(259,260,cB);_.Ab=function Ay(a,b){return gi(a)===gi(b)||a!=null&&wb(a,b)};_.a=null;_.b=null;_.c=false;_.d=0;_.e=null;Hm(262,258,dB);_.eQ=function Dy(a){var b,c,d;if(a===this){return true}if(!di(a,60)){return false}c=bi(a,60);if(c.zb()!=this.zb()){return false}for(b=c.ib();b.mb();){d=b.nb();if(!this.wb(d)){return false}}return true};_.hC=function Ey(){var a,b,c;a=0;for(b=this.ib();b.mb();){c=b.nb();if(c!=null){a+=xb(c);a=~~a}}return a};Hm(261,262,dB,Gy);_.wb=function Hy(a){return Fy(this,a)};_.ib=function Iy(){return new Oy(this.a)};_.yb=function Jy(a){var b;if(Fy(this,a)){b=bi(a,59).Bb();wy(this.a,b);return true}return false};_.zb=function Ky(){return this.a.d};_.a=null;Hm(263,1,{},Oy);_.mb=function Py(){return qz(this.a)};_.nb=function Qy(){return My(this)};_.ob=function Ry(){Ny(this)};_.a=null;_.b=null;_.c=null;Hm(265,1,eB);_.eQ=function Uy(a){var b;if(di(a,59)){b=bi(a,59);if(GA(this.Bb(),b.Bb())&&GA(this.Cb(),b.Cb())){return true}}return false};_.hC=function Vy(){var a,b;a=0;b=0;this.Bb()!=null&&(a=xb(this.Bb()));this.Cb()!=null&&(b=xb(this.Cb()));return a^b};_.tS=function Wy(){return this.Bb()+AD+this.Cb()};Hm(264,265,eB,Xy);_.Bb=function Yy(){return null};_.Cb=function Zy(){return this.a.b};_.Db=function $y(a){return uy(this.a,a)};_.a=null;Hm(266,265,eB,az);_.Bb=function bz(){return this.a};_.Cb=function cz(){return py(this.b,this.a)};_.Db=function dz(a){return vy(this.b,this.a,a)};_.a=null;_.b=null;Hm(267,258,{57:1});_.Eb=function fz(a,b){throw new Wx('Add not supported on this list')};_.vb=function gz(a){this.Eb(this.zb(),a);return true};_.eQ=function iz(a){var b,c,d,e,f;if(a===this){return true}if(!di(a,57)){return false}f=bi(a,57);if(this.zb()!=f.zb()){return false}d=new tz(this);e=f.ib();while(d.b<d.d.zb()){b=rz(d);c=rz(e);if(!(b==null?c==null:wb(b,c))){return false}}return true};_.hC=function jz(){var a,b,c;b=1;a=new tz(this);while(a.b<a.d.zb()){c=rz(a);b=31*b+(c==null?0:xb(c));b=~~b}return b};_.ib=function lz(){return new tz(this)};_.Gb=function mz(){return new zz(this,0)};_.Hb=function nz(a){return new zz(this,a)};_.Ib=function oz(a){throw new Wx('Remove not supported on this list')};Hm(268,1,{},tz);_.mb=function uz(){return qz(this)};_.nb=function vz(){return rz(this)};_.ob=function wz(){sz(this)};_.b=0;_.c=-1;_.d=null;Hm(269,268,{},zz);_.a=null;Hm(270,262,dB,Cz);_.wb=function Dz(a){return my(this.a,a)};_.ib=function Ez(){return Bz(this)};_.zb=function Fz(){return this.b.a.d};_.a=null;_.b=null;Hm(271,1,{},Iz);_.mb=function Jz(){return qz(this.a.a)};_.nb=function Kz(){return Hz(this)};_.ob=function Lz(){Ny(this.a)};_.a=null;Hm(272,267,fB,Uz);_.Eb=function Vz(a,b){(a<0||a>this.b)&&kz(a,this.b);cA(this.a,a,0,b);++this.b};_.vb=function Wz(a){return Nz(this,a)};_.wb=function Xz(a){return Qz(this,a,0)!=-1};_.Fb=function Yz(a){return Pz(this,a)};_.xb=function Zz(){return this.b==0};_.Ib=function $z(a){return Rz(this,a)};_.yb=function _z(a){return Sz(this,a)};_.zb=function aA(){return this.b};_.b=0;var dA;Hm(274,267,fB,gA);_.wb=function hA(a){return false};_.Fb=function iA(a){throw new ax};_.zb=function jA(){return 0};Hm(275,259,{50:1,58:1},mA);Hm(276,262,{50:1,60:1},rA);_.vb=function sA(a){return oA(this,a)};_.wb=function tA(a){return my(this.a,a)};_.xb=function uA(){return this.a.d==0};_.ib=function vA(){return Bz(fy(this.a))};_.yb=function wA(a){return qA(this,a)};_.zb=function xA(){return this.a.d};_.tS=function yA(){return Zx(fy(this.a))};_.a=null;Hm(277,265,eB,AA);_.Bb=function BA(){return this.a};_.Cb=function CA(){return this.b};_.Db=function DA(a){var b;b=this.b;this.b=a;return b};_.a=null;_.b=null;Hm(278,15,MA,FA);var gB=Fb;
+var mB='',aD='\n',sB=' ',_C='    ',bD='    .    |',fD=' N-',pB='(',NB=')',zD='+',ID=', ',cC='-',pD="-3'\n",kD='-C',vC='0',kC='0px',EC='1',$C="5'-",rB=':',lB=': ',gD='<\/EM>',lD='<\/pre><h3>',hD='<\/u>',nD='<EM class=',jD='<EM class=selected>',dD='<font color=red>none<\/font>\n',iD='<u>',AD='=',oD='>',uD='A',FD='AAAAAAAAAAAAA',KC='AUG',PC='Ala',YC='Arg',TC='Asn',VC='Asp',wD='C',ED='CAAAG',vB='CENTER',uB='CSS1Compat',XC='Cys',vD='G',CD='GGGGG',DD='GUGCG',SC='Gln',WC='Glu',ZC='Gly',RC='His',qD='INCORRECT',JC='Ile',wB='JUSTIFY',xB='LEFT',IC='Leu',UC='Lys',aC='Null widget handle. If you are creating a composite, ensure that initWidget() has been called.',rD='OK',HC='Phe',NC='Pro',yB='RIGHT',sC='Selected Base = ',MC='Ser',oB='String',bC='Style names cannot be empty',xD='T',BD='TATAA',OC='Thr',QC='Tyr',QD='UmbrellaException',LC='Val',GD='You did not make a single base substitution.',ZD='[Lcom.google.gwt.dom.client.',UD='[Lcom.google.gwt.user.client.ui.',LD='[Ljava.lang.',zC='absolute',tC='align',oC='cellPadding',nC='cellSpacing',_B='className',zB='click',yC='clip',SD='com.google.gwt.animation.client.',KD='com.google.gwt.core.client.',XD='com.google.gwt.core.client.impl.',YD='com.google.gwt.dom.client.',WD='com.google.gwt.event.dom.client.',_D='com.google.gwt.event.logical.shared.',RD='com.google.gwt.event.shared.',OD='com.google.gwt.i18n.client.',aE='com.google.gwt.text.shared.testing.',bE='com.google.gwt.touch.client.',TD='com.google.gwt.user.client.',$D='com.google.gwt.user.client.impl.',ND='com.google.gwt.user.client.ui.',PD='com.google.web.bindery.event.shared.',OB='dblclick',KB='dir',wC='display',HB='div',YB='dragenter',XB='dragover',qB='function',yD='g',tD='genex-button',MD='genex.client.gx.',dE='genex.client.problems.',cE='genex.client.requirements.',sD='genex_container',VB='gesturechange',WB='gestureend',UB='gesturestart',$B='height',kB='hidden',MB='ie9',JD='java.lang.',VD='java.util.',PB='keydown',QB='keypress',RB='keyup',dC='left',LB='ltr',mD='mature-',AB='mousedown',BB='mousemove',CB='mouseout',DB='mouseover',EB='mouseup',TB='mousewheel',GC='msie',xC='none',eD='none\n',nB='null',hB='offsetHeight',iB='offsetWidth',BC='onresize',FC='opera',jB='overflow',rC='popupContent',fC='position',jC='px',AC='px, ',lC='rect(0px, 0px, 0px, 0px)',CC='relative',tB='rtl',SB='scroll',gC='table',hC='tbody',qC='td',eC='top',FB='touchcancel',GB='touchend',IB='touchmove',JB='touchstart',pC='tr',HD='value',uC='verticalAlign',iC='visibility',mC='visible',ZB='width',DC='zoom',cD='|';var _,Gm={},VA={25:1,27:1},dB={60:1},QA={6:1,9:1,50:1,53:1,54:1},LA={50:1},IA={},$A={46:1},bB={52:1},fB={50:1,57:1},XA={24:1,29:1,37:1,40:1,41:1,43:1,45:1},cB={58:1},_A={11:1,27:1},SA={29:1},TA={47:1,50:1,56:1},MA={50:1,56:1},PA={6:1,8:1,50:1,53:1,54:1},eB={59:1},OA={6:1,7:1,50:1,53:1,54:1},NA={5:1,6:1,50:1,53:1,54:1},WA={23:1,27:1},ZA={44:1,50:1,53:1,54:1},JA={4:1,50:1},UA={27:1,36:1},KA={38:1},YA={24:1,29:1,37:1,40:1,41:1,42:1,43:1,45:1},aB={49:1},RA={10:1,50:1,53:1,54:1};Hm(1,-1,IA);_.eQ=function s(a){return this===a};_.gC=function t(){return this.cZ};_.hC=function u(){return Ib(this)};_.tS=function v(){return this.cZ.c+'@'+cx(this.hC())};_.toString=function(){return this.tS()};_.tM=HA;Hm(3,1,{});_.k=-1;_.n=false;_.o=false;_.p=null;_.q=-1;_.r=null;_.s=-1;_.t=false;Hm(4,1,{},C);_.a=null;Hm(5,1,{});Hm(6,1,{2:1});Hm(7,5,{});var G=null;Hm(8,7,{},M);Hm(10,1,KA);_.I=function W(){this.b||Sz(P,this);this.J()};_.b=false;_.c=0;var P;Hm(9,10,KA,X);_.J=function Y(){L(this.a)};_.a=null;Hm(11,6,{2:1,3:1},ab);_.a=null;_.b=null;Hm(12,1,{},db);Hm(17,1,MA);_.K=function kb(){return this.e};_.tS=function lb(){var a,b;a=this.cZ.c;b=this.K();return b!=null?a+lB+b:a};_.e=null;Hm(16,17,MA);Hm(15,16,MA,mb);Hm(14,15,MA,ob);_.K=function ub(){this.c==null&&(this.d=rb(this.b),this.a=this.a+lB+pb(this.b),this.c=pB+this.d+') '+tb(this.b)+this.a,undefined);return this.c};_.a=mB;_.b=null;_.c=null;_.d=null;Hm(21,1,{});var zb=0,Ab=0,Bb=0,Cb=-1;Hm(23,21,{},Ub);_.a=null;_.b=null;_.c=null;_.d=false;_.e=null;_.f=null;_.g=null;_.i=false;var Mb;Hm(24,1,{},_b);_.L=function ac(){this.a.d=true;Qb(this.a);this.a.d=false;return this.a.i=Rb(this.a)};_.a=null;Hm(25,1,{},cc);_.L=function dc(){this.a.d&&Zb(this.a.e,1);return this.a.i};_.a=null;Hm(28,1,{},kc);_.N=function lc(a){return ec(a)};Hm(46,1,{50:1,53:1,54:1});_.eQ=function Yc(a){return this===a};_.hC=function Zc(){return Ib(this)};_.tS=function $c(){return this.a};_.a=null;_.b=0;Hm(45,46,NA);var _c,ad,bd,cd,dd;Hm(47,45,NA,hd);Hm(48,45,NA,jd);Hm(49,45,NA,ld);Hm(50,45,NA,nd);Hm(51,46,OA);var pd,qd,rd,sd,td;Hm(52,51,OA,xd);Hm(53,51,OA,zd);Hm(54,51,OA,Bd);Hm(55,51,OA,Dd);Hm(56,46,PA);var Fd,Gd,Hd,Id,Jd;Hm(57,56,PA,Nd);Hm(58,56,PA,Pd);Hm(59,56,PA,Rd);Hm(60,56,PA,Td);Hm(61,46,QA);var Vd,Wd,Xd,Yd,Zd;Hm(62,61,QA,be);Hm(63,61,QA,de);Hm(64,61,QA,fe);Hm(65,61,QA,he);Hm(66,46,RA);var je,ke,le,me,ne,oe,pe,qe,re,se;Hm(67,66,RA,we);Hm(68,66,RA,ye);Hm(69,66,RA,Ae);Hm(70,66,RA,Ce);Hm(71,66,RA,Ee);Hm(72,66,RA,Ge);Hm(73,66,RA,Ie);Hm(74,66,RA,Ke);Hm(75,66,RA,Me);Hm(81,1,{});_.tS=function Te(){return 'An event type'};_.f=null;Hm(80,81,{});_.Q=function Ve(){this.e=false;this.f=null};_.e=false;Hm(79,80,{});_.P=function $e(){return this.R()};_.a=null;_.b=null;var We=null;Hm(78,79,{});Hm(77,78,{});Hm(76,77,{},df);_.O=function ef(a){bi(a,11).S(this)};_.R=function ff(){return bf};var bf;Hm(84,1,{});_.hC=function lf(){return this.c};_.tS=function mf(){return 'Event type'};_.c=0;var kf=0;Hm(83,84,{},nf);Hm(82,83,{12:1},of);_.a=null;_.b=null;Hm(85,77,{},tf);_.O=function uf(a){sf(this,bi(a,13))};_.R=function vf(){return qf};var qf;Hm(86,77,{},Af);_.O=function Bf(a){zf(this,bi(a,14))};_.R=function Cf(){return xf};var xf;Hm(87,77,{},Gf);_.O=function Hf(a){bi(bi(a,15),39)};_.R=function If(){return Ef};var Ef;Hm(88,77,{},Mf);_.O=function Nf(a){bi(bi(a,16),39)};_.R=function Of(){return Kf};var Kf;Hm(89,77,{},Tf);_.O=function Uf(a){Sf(this,bi(a,17))};_.R=function Vf(){return Qf};var Qf;Hm(90,1,{},Zf);_.a=null;Hm(93,78,{});var ag=null;Hm(92,93,{},dg);_.O=function eg(a){sn(bi(bi(a,18),34).a)};_.R=function fg(){return bg};var bg;Hm(94,93,{},jg);_.O=function kg(a){sn(bi(bi(a,19),33).a)};_.R=function lg(){return hg};var hg;Hm(95,1,{},ng);Hm(96,93,{},sg);_.O=function tg(a){rg(this,bi(a,20))};_.R=function ug(){return pg};var pg;Hm(97,93,{},zg);_.O=function Ag(a){yg(this,bi(a,21))};_.R=function Bg(){return wg};var wg;Hm(98,80,{},Fg);_.O=function Gg(a){Eg(this,bi(a,22))};_.P=function Ig(){return Dg};_.a=false;var Dg=null;Hm(99,80,{},Lg);_.O=function Mg(a){bi(a,23).T(this)};_.P=function Og(){return Kg};var Kg=null;Hm(100,80,{},Rg);_.O=function Sg(a){bi(a,25).U(this)};_.P=function Ug(){return Qg};_.a=0;var Qg=null;Hm(101,80,{},Yg);_.O=function Zg(a){Xg(bi(a,26))};_.P=function _g(){return Wg};var Wg=null;Hm(102,1,SA,eh,fh);_.V=function gh(a){ch(this,a)};_.a=null;_.b=null;Hm(105,1,{});Hm(104,105,{});_.a=null;_.b=0;_.c=false;Hm(103,104,{},vh);Hm(106,1,{28:1},xh);_.a=null;Hm(108,15,TA,Ah);_.a=null;Hm(107,108,TA,Dh);Hm(109,1,{27:1},Fh);Hm(111,46,{30:1,50:1,53:1,54:1},Oh);var Jh,Kh,Lh,Mh;Hm(112,1,{},Qh);_.qI=0;var Wh,Xh;Hm(121,1,{});Hm(122,1,{},Nm);var Mm=null;Hm(123,121,{},Qm);var Pm=null;Hm(124,1,{},Um);Hm(125,1,{},Zm);_.a=0;_.b=0;_.c=null;_.d=null;_.e=null;Hm(126,1,{32:1},cn,dn);_.eQ=function en(a){var b;if(!di(a,32)){return false}b=bi(a,32);return this.a==b.a&&this.b==b.b};_.hC=function fn(){return hi(this.a)^hi(this.b)};_.tS=function gn(){return 'Point('+this.a+','+this.b+NB};_.a=0;_.b=0;Hm(127,1,{},Bn);_.a=null;_.b=null;_.c=false;_.f=null;_.g=null;_.n=null;_.o=null;_.p=null;_.r=false;_.s=null;var jn=null;Hm(128,1,{22:1,27:1},Dn);_.a=null;Hm(129,1,{21:1,27:1},Fn);_.a=null;Hm(130,1,{20:1,27:1},Hn);_.a=null;Hm(131,1,{19:1,27:1,33:1},Jn);_.a=null;Hm(132,1,{18:1,27:1,34:1},Ln);_.a=null;Hm(133,1,UA,Nn);_.W=function On(a){var b;if(1==Zo(a.d.type)){b=new cn(a.d.clientX||0,a.d.clientY||0);if(pn(this.a,b)||qn(this.a,b)){a.a=true;a.d.stopPropagation();a.d.preventDefault()}}};_.a=null;Hm(134,1,{},Rn);_.L=function Sn(){var a,b,c,d,e,f,g;if(this!=this.e.g){Qn(this);return false}a=cb(this.a);Xm(this.d,a-this.c);this.c=a;Wm(this.d,a);e=Tm(this.d);e||Qn(this);zn(this.e,this.d.d);d=hi(this.d.d.a);c=tt(this.e.s);b=rt(this.e.s);f=st(this.e.s);g=hi(this.d.d.b);if((f<=g||0>=g)&&(b<=d||c>=d)){Qn(this);return false}return e};_.c=0;_.d=null;_.e=null;_.f=null;Hm(135,1,VA,Un);_.U=function Vn(a){Qn(this.a)};_.a=null;Hm(136,1,{},Xn);_.L=function Yn(){var a,b,c;a=eb();b=new tz(this.a.q);while(b.b<b.d.zb()){c=bi(rz(b),35);a-c.b>=2500&&sz(b)}return this.a.q.b!=0};_.a=null;Hm(137,1,{35:1},_n,ao);_.a=null;_.b=0;var bo=null,co=null;var lo=null;Hm(142,80,{},so);_.O=function to(a){bi(a,36).W(this);po.c=false};_.P=function vo(){return oo};_.Q=function wo(){qo(this)};_.a=false;_.b=false;_.c=false;_.d=null;var oo=null,po=null;var xo=null;Hm(144,1,WA,Bo);_.T=function Co(a){while((Q(),P).b>0){R(bi(Pz(P,0),38))}};var Do=false,Eo=null,Fo=0,Go=0,Ho=false;Hm(146,80,{},To);_.O=function Uo(a){ii(a);null.Jb()};_.P=function Vo(){return Ro};var Ro;Hm(147,102,SA,Xo);var Yo=false;var bp=null,cp=null,dp=null,ep=null,fp=null,gp=null;Hm(152,1,SA,sp);_.Y=function tp(a){return decodeURI(a.replace('%23','#'))};_.V=function up(a){ch(this.a,a)};_.Z=function vp(a){a=a==null?mB:a;if(!px(a,pp==null?mB:pp)){pp=a;$g(this)}};var pp=mB;Hm(155,1,{},zp);_.M=function Ap(){$wnd.__gwt_initWindowCloseHandler(gB(Oo),gB(No))};Hm(156,1,{},Cp);_.M=function Dp(){$wnd.__gwt_initWindowResizeHandler(gB(Po))};Hm(161,1,{40:1,43:1});_.$=function Op(){return this.H};_._=function Pp(a){jo(this.H,$B,a)};_.ab=function Sp(a){jo(this.H,ZB,a)};_.tS=function Tp(){if(!this.H){return '(null handle)'}return this.H.outerHTML};_.H=null;Hm(160,161,XA);_.bb=function bq(){};_.cb=function cq(){};_.V=function dq(a){Xp(this,a)};_.db=function eq(){Yp(this)};_.X=function fq(a){Zp(this,a)};_.eb=function gq(){$p(this)};_.fb=function hq(){};_.gb=function iq(){};_.D=false;_.E=0;_.F=null;_.G=null;Hm(159,160,XA);_.bb=function kq(){Aq(this,(yq(),wq))};_.cb=function lq(){Aq(this,(yq(),xq))};Hm(158,159,XA);_.ib=function pq(){return new uu(this.f)};_.hb=function qq(a){return nq(this,a)};Hm(157,158,XA);_.hb=function uq(a){return sq(this,a)};Hm(162,107,TA,zq);var wq,xq;Hm(163,1,{},Cq);_.jb=function Dq(a){a.db()};Hm(164,1,{},Fq);_.jb=function Gq(a){a.eb()};Hm(167,160,XA);_.db=function Kq(){var a;Yp(this);a=Nc(this.H);-1==a&&(this.H.tabIndex=0,undefined)};Hm(166,167,XA);Hm(165,166,XA,Mq);Hm(168,158,XA);_.d=null;_.e=null;Hm(171,159,XA);_.kb=function Wq(){return this.H};_.ib=function Xq(){return new Ft(this)};_.hb=function Yq(a){return Sq(this,a)};_.C=null;Hm(170,171,XA);_.kb=function gr(){return Cc(this.H)};_.$=function hr(){return Dc(Cc(this.H))};_.lb=function ir(){_q(this)};_.W=function jr(a){a.c&&(a.d,false)&&(a.a=true)};_.gb=function kr(){this.A&&Is(this.z,false,true)};_._=function lr(a){this.o=a;ar(this);a.length==0&&(this.o=null)};_.ab=function mr(a){this.p=a;ar(this);a.length==0&&(this.p=null)};_.k=false;_.n=false;_.o=null;_.p=null;_.q=null;_.s=null;_.t=false;_.u=false;_.v=-1;_.w=false;_.x=null;_.y=false;_.A=false;_.B=-1;Hm(169,170,XA);_.bb=function or(){Yp(this.j)};_.cb=function pr(){$p(this.j)};_.ib=function qr(){return new Ft(this.j)};_.hb=function rr(a){return Sq(this.j,a)};_.j=null;Hm(172,171,XA,ur);_.kb=function wr(){return this.a};_.a=null;_.b=null;Hm(173,169,XA,Gr);_.bb=function Ir(){try{Yp(this.j)}finally{Yp(this.a)}};_.cb=function Jr(){try{$p(this.j)}finally{$p(this.a)}};_.lb=function Kr(){Br(this)};_.X=function Lr(a){switch(Zo(a.type)){case 4:case 8:case 64:case 16:case 32:if(!this.f&&!Cr(this,a)){return}}Zp(this,a)};_.W=function Mr(a){var b;b=a.d;!a.a&&Zo(a.d.type)==4&&Cr(this,b)&&(b.preventDefault(),undefined);a.c&&(a.d,false)&&(a.a=true)};_.a=null;_.b=0;_.c=0;_.d=0;_.e=0;_.f=false;_.g=null;_.i=0;Hm(174,1,VA,Or);_.U=function Pr(a){this.a.i=a.a};_.a=null;Hm(178,160,XA);_.a=null;Hm(177,178,XA,Xr);Hm(176,177,XA,Zr,$r);Hm(175,176,XA,_r);Hm(179,1,{13:1,14:1,15:1,16:1,17:1,27:1,39:1},bs);_.a=null;Hm(180,1,{},es);_.a=null;_.b=null;_.c=null;var fs,gs,hs;Hm(181,1,{});Hm(182,181,{},ls);_.a=null;var ms;Hm(183,1,{},ps);_.a=null;Hm(184,168,XA,ss);_.hb=function ts(a){var b,c;c=Dc(a.H);b=nq(this,a);b&&tc(this.b,c);return b};_.b=null;Hm(185,1,VA,ws);_.U=function xs(a){vs()};Hm(186,1,UA,zs);_.W=function As(a){br(this.a,a)};_.a=null;Hm(187,1,{26:1,27:1},Cs);_.a=null;Hm(188,3,{},Js);_.a=null;_.b=false;_.c=false;_.d=0;_.e=-1;_.f=null;_.g=null;_.i=false;Hm(189,10,KA,Ls);_.J=function Ms(){this.a.g=null;x(this.a,eb())};_.a=null;Hm(191,157,YA,Vs);var Rs,Ss,Ts;Hm(192,1,{},$s);_.jb=function _s(a){a.D&&a.eb()};Hm(193,1,WA,bt);_.T=function ct(a){Xs()};Hm(194,191,YA,et);Hm(195,1,{});var gt=null;Hm(196,195,{},nt);var kt=null,lt=null;Hm(197,171,XA,xt);_.kb=function yt(){return this.a};_.db=function zt(){Yp(this);this.b.__listener=this};_.eb=function At(){this.b.__listener=null;$p(this)};_._=function Bt(a){jo(this.H,$B,a)};_.ab=function Ct(a){jo(this.H,ZB,a)};_.a=null;_.b=null;_.c=null;Hm(198,1,{},Ft);_.mb=function Gt(){return this.a};_.nb=function Ht(){return Et(this)};_.ob=function It(){!!this.b&&this.c.hb(this.b)};_.b=null;_.c=null;Hm(201,167,XA);_.X=function Nt(a){var b;b=Zo(a.type);(b&896)!=0?Zp(this,a):Zp(this,a)};_.fb=function Ot(){};Hm(200,201,XA);Hm(199,200,XA,Qt);Hm(202,46,ZA);var Tt,Ut,Vt,Wt,Xt;Hm(203,202,ZA,_t);Hm(204,202,ZA,bu);Hm(205,202,ZA,du);Hm(206,202,ZA,fu);Hm(207,168,XA,iu);_.hb=function ju(a){var b,c;c=Dc(a.H);b=nq(this,a);b&&tc(this.d,Dc(c));return b};Hm(208,1,{},qu);_.ib=function ru(){return new uu(this)};_.a=null;_.b=null;_.c=0;Hm(209,1,{},uu);_.mb=function vu(){return this.a<this.b.c-1};_.nb=function wu(){return tu(this)};_.ob=function xu(){if(this.a<0||this.a>=this.b.c){throw new Zw}this.b.b.hb(this.b.a[this.a--])};_.a=-1;_.b=null;Hm(213,1,{},Cu);_.a=null;_.b=null;_.c=null;Hm(214,1,$A,Eu);_.M=function Fu(){mh(this.a,this.c,this.b)};_.a=null;_.b=null;_.c=null;Hm(215,1,$A,Hu);_.M=function Iu(){oh(this.a,this.c,this.b)};_.a=null;_.b=null;_.c=null;Hm(217,1,{},Mu);_.a=0;Hm(218,1,{},Ou);_.a=0;_.b=0;_.c=0;Hm(219,1,{},cv);_.a=null;_.b=null;_.c=null;_.d=null;_.e=null;_.f=0;_.g=0;_.i=0;_.j=null;_.k=null;_.n=null;_.o=0;_.p=0;_.q=null;_.r=null;_.s=null;_.t=0;Hm(220,1,{},nv);_.pb=function ov(a){var b,c;if(a==39){++this.d;this.d>this.a.length-1&&(this.d=this.a.length-1);b=jv(this,this.a,this.d);mv(this,b,this.d);this.b=b.b.b.length;b.b.f+1;ev(this)}if(a==37){--this.d;this.d<0&&(this.d=0);b=jv(this,this.a,this.d);mv(this,b,this.d);this.b=b.b.b.length;b.b.f+1;ev(this)}if(a==8||a==46){this.A=this.e;c=new Px(this.a);Lx(c,this.d);this.a=rc(c.a);this.d>=0&&--this.d;b=jv(this,this.a,this.d);mv(this,b,this.d);this.e=Yu(b.b);this.b=b.b.b.length;ev(this)}};_.qb=function pv(a,b){var c,d;if(px(a,uD)||px(a,vD)||px(a,wD)||px(a,xD)){this.A=this.e;d=new Px(this.a);Mx(d,this.d,a);this.a=rc(d.a);++this.d;c=jv(this,this.a,this.d);mv(this,c,this.d);this.e=Yu(c.b);this.b=c.b.b.length;c.b.f+1;ev(this)}if(px(a,'a')||px(a,yD)||px(a,'c')||px(a,'t')){this.A=this.e;d=new Px(this.a);Nx(d,this.d,this.d+1,a.toUpperCase());this.a=rc(d.a);c=jv(this,this.a,this.d);mv(this,c,this.d);this.e=Yu(c.b);this.b=c.b.b.length;c.b.f+1;ev(this)}if(px(a,zD)||px(a,cC)||px(a,AD)||px(a,'_')){if(px(a,zD)||px(a,AD)){++this.d;this.d>this.a.length-1&&(this.d=this.a.length-1)}else{--this.d;this.d<0&&(this.d=0)}c=jv(this,this.a,this.d);mv(this,c,this.d);this.b=c.b.b.length;c.b.f+1;ev(this)}if(b==39){++this.d;this.d>this.a.length-1&&(this.d=this.a.length-1);c=jv(this,this.a,this.d);mv(this,c,this.d);this.b=c.b.b.length;c.b.f+1;ev(this)}if(b==37){--this.d;this.d<0&&(this.d=0);c=jv(this,this.a,this.d);mv(this,c,this.d);this.b=c.b.b.length;c.b.f+1;ev(this)}};_.rb=function qv(a){var b;if(a>=0&&a<=this.b){b=jv(this,this.a,a);mv(this,b,a);this.b=b.b.b.length;this.d=a;ev(this)}};_.sb=function sv(a){var b;a!=null&&Mv(this.y,a);this.y.e=BD;this.y.g=CD;this.y.c=DD;this.y.b=ED;this.y.d=FD;this.f=this.y.a;this.a=this.y.a;this.b=this.a.length;this.C=this.y.e;this.D=this.y.f;this.G=this.y.g;this.u=this.y.c;this.t=this.y.b;this.z=this.y.d;(px(this.u,xC)||px(this.t,xC))&&(this.z=mB);b=jv(this,this.f,-1);this.g=b.b.e;this.i=b.b.q;this.b=b.b.b.length;this.e=Yu(b.b);Yr(this.r,b.a.b+'<\/pre><\/body><\/html>')};_.tb=function uv(a){var b,c,d,e,f;this.B=new bw;if(a==1){b=new zw;b.b=GD;_v(this.B,b);d=new ww;d.b='Your change does not make the mature mRNA shorter.';_v(this.B,d)}else if(a==2){b=new zw;b.b=GD;_v(this.B,b);d=new hw;d.b='Your change does not make the protein longer.';_v(this.B,d)}else if(a==3){b=new zw;b.b=GD;_v(this.B,b);d=new tw;d.b='Your change does not make the protein shorter.';_v(this.B,d)}else if(a==4){b=new zw;b.b=GD;_v(this.B,b);d=new nw;d.b='Your change does not prevent mRNA from being made.';_v(this.B,d);f=new kw;f.b='Your change does not prevent protein from being made';_v(this.B,f)}else if(a==5){c=new qw;c.a=15;c.b='Your protein does not have 5 amino acids.';_v(this.B,c);e=new ew;e.a=1;e.b='Your gene does not contain one intron.';_v(this.B,e)}};_.a=null;_.b=0;_.c=null;_.d=0;_.e=mB;_.f=null;_.g=mB;_.i=mB;_.j=null;_.k=null;_.n=false;_.o=null;_.p=null;_.q=null;_.r=null;_.s=null;_.t=null;_.u=null;_.v=null;_.w=null;_.x=null;_.z=null;_.A=mB;_.B=null;_.C=null;_.D=0;_.E=null;_.F=null;_.G=null;_.H=null;Hm(221,1,_A,xv);_.S=function yv(a){Br(this.a.j);this.a.o.H[HD]=mB};_.a=null;Hm(222,1,{},Av);_.M=function Bv(){gv(this.a);fv(this.a);hv(this.a);iv(this.a);typeof $wnd.genexIsReady===qB&&$wnd.genexIsReady()};_.a=null;Hm(223,1,_A,Dv);_.S=function Ev(a){var b,c;this.a.A=this.a.e;c=xc(this.a.o.H,HD);c=c.toUpperCase();c=tx(c,'[^AGCT]',mB);this.a.a=c;this.a.d=-1;b=jv(this.a,this.a.a,-1);mv(this.a,b,-1);this.a.e=Yu(b.b);this.a.b=b.b.b.length;Br(this.a.j);ev(this.a)};_.a=null;Hm(224,1,_A,Gv);_.S=function Hv(a){var b;this.a.a=this.a.f;b=jv(this.a,this.a.a,-1);mv(this.a,b,-1);this.a.e=Yu(b.b);this.a.b=b.b.b.length;ev(this.a)};_.a=null;Hm(225,1,_A,Jv);_.S=function Kv(a){Zq(this.a.j)};_.a=null;Hm(226,1,{},Nv);_.a=null;_.b=null;_.c=null;_.d=null;_.e=null;_.f=0;_.g=null;Hm(227,1,{},Pv);_.a=null;_.b=null;Hm(228,1,{48:1},Tv);_.a=0;_.b=0;_.c=false;_.d=false;_.e=0;_.f=0;_.g=false;Hm(229,1,{},Vv);_.a=null;_.b=null;Hm(230,1,{},Yv);_.tS=function Zv(){return Xv(this)};_.a=null;_.b=0;_.c=null;_.d=null;_.e=0;_.f=null;_.g=null;_.i=null;Hm(231,1,{},bw);_.a=null;Hm(233,1,aB);_.b='unassigned';Hm(232,233,aB,ew);_.ub=function fw(a){return a.b==this.a+1};_.a=0;Hm(234,233,aB,hw);_.ub=function iw(a){return a.c.length>a.i.length};Hm(235,233,aB,kw);_.ub=function lw(a){return px(a.c,mB)};Hm(236,233,aB,nw);_.ub=function ow(a){return px(a.d,mB)};Hm(237,233,aB,qw);_.ub=function rw(a){return a.c.length==this.a};_.a=0;Hm(238,233,aB,tw);_.ub=function uw(a){return a.c.length<a.i.length};Hm(239,233,aB,ww);_.ub=function xw(a){return a.d.length<a.g.length};Hm(240,233,aB,zw);_.ub=function Aw(a){var b,c,d,e;e=a.f;b=a.a;if(e.length!=b.length)return false;d=0;for(c=0;c<e.length;++c){e.charCodeAt(c)!=b.charCodeAt(c)&&++d}if(d==1)return true;return false};Hm(241,15,MA,Cw);Hm(242,1,{50:1,51:1,53:1},Hw);_.eQ=function Iw(a){return di(a,51)&&bi(a,51).a==this.a};_.hC=function Jw(){return this.a?1231:1237};_.tS=function Kw(){return this.a?'true':'false'};_.a=false;var Ew,Fw;Hm(243,1,{},Mw);_.tS=function Tw(){return ((this.a&2)!=0?'interface ':(this.a&1)!=0?mB:'class ')+this.c};_.a=0;_.b=0;_.c=null;Hm(244,15,MA,Vw);Hm(245,15,MA,Xw);Hm(246,15,MA,Zw,$w);Hm(247,15,MA,ax,bx);Hm(251,15,MA,gx,hx);var ix;Hm(253,1,{50:1,55:1},lx);_.tS=function mx(){return this.a+'.'+this.c+'(Unknown Source'+(this.b>=0?rB+this.b:mB)+NB};_.a=null;_.b=0;_.c=null;_=String.prototype;_.cM={1:1,50:1,52:1,53:1};_.eQ=function yx(a){return px(this,a)};_.hC=function zx(){return Gx(this)};_.tS=_.toString;var Bx,Cx=0,Dx;Hm(255,1,bB,Ox,Px);_.tS=function Qx(){return rc(this.a)};Hm(256,1,bB,Tx);_.tS=function Ux(){return rc(this.a)};Hm(257,15,MA,Wx);Hm(258,1,{});_.vb=function $x(a){throw new Wx('Add not supported on this collection')};_.wb=function _x(a){var b;b=Yx(this.ib(),a);return !!b};_.xb=function ay(){return this.zb()==0};_.yb=function by(a){var b;b=Yx(this.ib(),a);if(b){b.ob();return true}else{return false}};_.tS=function cy(){return Zx(this)};Hm(260,1,cB);_.eQ=function gy(a){var b,c,d,e,f;if(a===this){return true}if(!di(a,58)){return false}e=bi(a,58);if(this.d!=e.d){return false}for(c=new Oy((new Gy(e)).a);qz(c.a);){b=c.b=bi(rz(c.a),59);d=b.Bb();f=b.Cb();if(!(d==null?this.c:di(d,1)?rB+bi(d,1) in this.e:qy(this,d,~~xb(d)))){return false}if(!GA(f,d==null?this.b:di(d,1)?py(this,bi(d,1)):oy(this,d,~~xb(d)))){return false}}return true};_.hC=function hy(){var a,b,c;c=0;for(b=new Oy((new Gy(this)).a);qz(b.a);){a=b.b=bi(rz(b.a),59);c+=a.hC();c=~~c}return c};_.tS=function iy(){var a,b,c,d;d='{';a=false;for(c=new Oy((new Gy(this)).a);qz(c.a);){b=c.b=bi(rz(c.a),59);a?(d+=ID):(a=true);d+=mB+b.Bb();d+=AD;d+=mB+b.Cb()}return d+'}'};Hm(259,260,cB);_.Ab=function Ay(a,b){return gi(a)===gi(b)||a!=null&&wb(a,b)};_.a=null;_.b=null;_.c=false;_.d=0;_.e=null;Hm(262,258,dB);_.eQ=function Dy(a){var b,c,d;if(a===this){return true}if(!di(a,60)){return false}c=bi(a,60);if(c.zb()!=this.zb()){return false}for(b=c.ib();b.mb();){d=b.nb();if(!this.wb(d)){return false}}return true};_.hC=function Ey(){var a,b,c;a=0;for(b=this.ib();b.mb();){c=b.nb();if(c!=null){a+=xb(c);a=~~a}}return a};Hm(261,262,dB,Gy);_.wb=function Hy(a){return Fy(this,a)};_.ib=function Iy(){return new Oy(this.a)};_.yb=function Jy(a){var b;if(Fy(this,a)){b=bi(a,59).Bb();wy(this.a,b);return true}return false};_.zb=function Ky(){return this.a.d};_.a=null;Hm(263,1,{},Oy);_.mb=function Py(){return qz(this.a)};_.nb=function Qy(){return My(this)};_.ob=function Ry(){Ny(this)};_.a=null;_.b=null;_.c=null;Hm(265,1,eB);_.eQ=function Uy(a){var b;if(di(a,59)){b=bi(a,59);if(GA(this.Bb(),b.Bb())&&GA(this.Cb(),b.Cb())){return true}}return false};_.hC=function Vy(){var a,b;a=0;b=0;this.Bb()!=null&&(a=xb(this.Bb()));this.Cb()!=null&&(b=xb(this.Cb()));return a^b};_.tS=function Wy(){return this.Bb()+AD+this.Cb()};Hm(264,265,eB,Xy);_.Bb=function Yy(){return null};_.Cb=function Zy(){return this.a.b};_.Db=function $y(a){return uy(this.a,a)};_.a=null;Hm(266,265,eB,az);_.Bb=function bz(){return this.a};_.Cb=function cz(){return py(this.b,this.a)};_.Db=function dz(a){return vy(this.b,this.a,a)};_.a=null;_.b=null;Hm(267,258,{57:1});_.Eb=function fz(a,b){throw new Wx('Add not supported on this list')};_.vb=function gz(a){this.Eb(this.zb(),a);return true};_.eQ=function iz(a){var b,c,d,e,f;if(a===this){return true}if(!di(a,57)){return false}f=bi(a,57);if(this.zb()!=f.zb()){return false}d=new tz(this);e=f.ib();while(d.b<d.d.zb()){b=rz(d);c=rz(e);if(!(b==null?c==null:wb(b,c))){return false}}return true};_.hC=function jz(){var a,b,c;b=1;a=new tz(this);while(a.b<a.d.zb()){c=rz(a);b=31*b+(c==null?0:xb(c));b=~~b}return b};_.ib=function lz(){return new tz(this)};_.Gb=function mz(){return new zz(this,0)};_.Hb=function nz(a){return new zz(this,a)};_.Ib=function oz(a){throw new Wx('Remove not supported on this list')};Hm(268,1,{},tz);_.mb=function uz(){return qz(this)};_.nb=function vz(){return rz(this)};_.ob=function wz(){sz(this)};_.b=0;_.c=-1;_.d=null;Hm(269,268,{},zz);_.a=null;Hm(270,262,dB,Cz);_.wb=function Dz(a){return my(this.a,a)};_.ib=function Ez(){return Bz(this)};_.zb=function Fz(){return this.b.a.d};_.a=null;_.b=null;Hm(271,1,{},Iz);_.mb=function Jz(){return qz(this.a.a)};_.nb=function Kz(){return Hz(this)};_.ob=function Lz(){Ny(this.a)};_.a=null;Hm(272,267,fB,Uz);_.Eb=function Vz(a,b){(a<0||a>this.b)&&kz(a,this.b);cA(this.a,a,0,b);++this.b};_.vb=function Wz(a){return Nz(this,a)};_.wb=function Xz(a){return Qz(this,a,0)!=-1};_.Fb=function Yz(a){return Pz(this,a)};_.xb=function Zz(){return this.b==0};_.Ib=function $z(a){return Rz(this,a)};_.yb=function _z(a){return Sz(this,a)};_.zb=function aA(){return this.b};_.b=0;var dA;Hm(274,267,fB,gA);_.wb=function hA(a){return false};_.Fb=function iA(a){throw new ax};_.zb=function jA(){return 0};Hm(275,259,{50:1,58:1},mA);Hm(276,262,{50:1,60:1},rA);_.vb=function sA(a){return oA(this,a)};_.wb=function tA(a){return my(this.a,a)};_.xb=function uA(){return this.a.d==0};_.ib=function vA(){return Bz(fy(this.a))};_.yb=function wA(a){return qA(this,a)};_.zb=function xA(){return this.a.d};_.tS=function yA(){return Zx(fy(this.a))};_.a=null;Hm(277,265,eB,AA);_.Bb=function BA(){return this.a};_.Cb=function CA(){return this.b};_.Db=function DA(a){var b;b=this.b;this.b=a;return b};_.a=null;_.b=null;Hm(278,15,MA,FA);var gB=Fb;
 --></script>
 <script><!--
 var Ql=Ow(JD,'Object',1),ti=Ow(KD,'JavaScriptObject$',18),Am=Nw(LD,'Object;',280),Wl=Ow(JD,'Throwable',17),Ll=Ow(JD,'Exception',16),Rl=Ow(JD,'RuntimeException',15),Sl=Ow(JD,'StackTraceElement',253),Bm=Nw(LD,'StackTraceElement;',281),Ej=Ow('com.google.gwt.lang.','SeedUtil',118),Kl=Ow(JD,'Enum',46),ql=Ow(MD,'GenexGWT',220),ml=Ow(MD,'GenexGWT$1',221),nl=Ow(MD,'GenexGWT$2',223),ol=Ow(MD,'GenexGWT$3',224),pl=Ow(MD,'GenexGWT$4',225),ll=Ow(MD,'GenexGWT$1DeferredCommand',222),ui=Ow(KD,'Scheduler',21),Hl=Ow(JD,'Boolean',242),qm=Nw(mB,'[C',282),Jl=Ow(JD,'Class',243),Vl=Ow(JD,oB,2),Cm=Nw(LD,'String;',283),Il=Ow(JD,'ClassCastException',244),Ul=Ow(JD,'StringBuilder',256),Gl=Ow(JD,'ArrayStoreException',241),si=Ow(KD,'JavaScriptException',14),Rk=Ow(ND,'UIObject',161),_k=Ow(ND,'Widget',160),xk=Ow(ND,'LabelBase',178),yk=Ow(ND,'Label',177),sk=Ow(ND,'HTML',176),tk=Ow(ND,'HasHorizontalAlignment$AutoHorizontalAlignmentConstant',181),uk=Ow(ND,'HasHorizontalAlignment$HorizontalAlignmentConstant',182),Dj=Pw(OD,'HasDirection$Direction',111,Ph),xm=Nw('[Lcom.google.gwt.i18n.client.','HasDirection$Direction;',284),zk=Ow(ND,'Panel',159),Ok=Ow(ND,'SimplePanel',171),Mk=Ow(ND,'ScrollPanel',197),Nk=Ow(ND,'SimplePanel$1',198),jk=Ow(ND,'ComplexPanel',158),ck=Ow(ND,'AbsolutePanel',157),hl=Ow(PD,QD,108),Bj=Ow(RD,QD,107),fk=Ow(ND,'AttachDetachException',162),dk=Ow(ND,'AttachDetachException$1',163),ek=Ow(ND,'AttachDetachException$2',164),Jk=Ow(ND,'RootPanel',191),Ik=Ow(ND,'RootPanel$DefaultRootPanel',194),Gk=Ow(ND,'RootPanel$1',192),Hk=Ow(ND,'RootPanel$2',193),Fk=Ow(ND,'PopupPanel',170),kk=Ow(ND,'DecoratedPopupPanel',169),pk=Ow(ND,'DialogBox',173),nk=Ow(ND,'DialogBox$CaptionImpl',175),ok=Ow(ND,'DialogBox$MouseHandler',179),mk=Ow(ND,'DialogBox$1',174),qi=Ow(SD,'Animation',3),Ek=Ow(ND,'PopupPanel$ResizeAnimation',188),Yj=Ow(TD,'Timer',10),Dk=Ow(ND,'PopupPanel$ResizeAnimation$1',189),Ak=Ow(ND,'PopupPanel$1',185),Bk=Ow(ND,'PopupPanel$3',186),Ck=Ow(ND,'PopupPanel$4',187),ji=Ow(SD,'Animation$1',4),pi=Ow(SD,'AnimationScheduler',5),ki=Ow(SD,'AnimationScheduler$AnimationHandle',6),Xj=Ow(TD,'Timer$1',144),cl=Ow(PD,'Event',81),xj=Ow(RD,'GwtEvent',80),Wj=Ow(TD,'Event$NativePreviewEvent',142),al=Ow(PD,'Event$Type',84),wj=Ow(RD,'GwtEvent$Type',83),ik=Ow(ND,'CellPanel',168),Yk=Ow(ND,'VerticalPanel',207),vk=Ow(ND,'HasVerticalAlignment$VerticalAlignmentConstant',183),rk=Ow(ND,'FocusWidget',167),Xk=Ow(ND,'ValueBoxBase',201),Pk=Ow(ND,'TextBoxBase',200),Qk=Ow(ND,'TextBox',199),Wk=Pw(ND,'ValueBoxBase$TextAlignment',202,Zt),ym=Nw(UD,'ValueBoxBase$TextAlignment;',285),Sk=Pw(ND,'ValueBoxBase$TextAlignment$1',203,null),Tk=Pw(ND,'ValueBoxBase$TextAlignment$2',204,null),Uk=Pw(ND,'ValueBoxBase$TextAlignment$3',205,null),Vk=Pw(ND,'ValueBoxBase$TextAlignment$4',206,null),Cj=Ow(OD,'AutoDirectionHandler',109),gk=Ow(ND,'ButtonBase',166),hk=Ow(ND,'Button',165),wk=Ow(ND,'HorizontalPanel',184),rl=Ow(MD,'GenexParams',226),im=Ow(VD,'AbstractMap',260),bm=Ow(VD,'AbstractHashMap',259),mm=Ow(VD,'HashMap',275),Yl=Ow(VD,'AbstractCollection',258),jm=Ow(VD,'AbstractSet',262),$l=Ow(VD,'AbstractHashMap$EntrySet',261),Zl=Ow(VD,'AbstractHashMap$EntrySetIterator',263),hm=Ow(VD,'AbstractMapEntry',265),_l=Ow(VD,'AbstractHashMap$MapEntryNull',264),am=Ow(VD,'AbstractHashMap$MapEntryString',266),gm=Ow(VD,'AbstractMap$1',270),fm=Ow(VD,'AbstractMap$1$1',271),nm=Ow(VD,'HashSet',276),dj=Ow(WD,'DomEvent',79),ej=Ow(WD,'HumanInputEvent',78),gj=Ow(WD,'MouseEvent',77),bj=Ow(WD,'ClickEvent',76),cj=Ow(WD,'DomEvent$Type',82),lk=Ow(ND,'DecoratorPanel',172),xi=Ow(XD,'SchedulerImpl',23),vi=Ow(XD,'SchedulerImpl$Flusher',24),wi=Ow(XD,'SchedulerImpl$Rescuer',25),yi=Ow(XD,'StackTraceCreator$Collector',28),ri=Ow(KD,'Duration',12),aj=Pw(YD,'Style$Unit',66,ue),wm=Nw(ZD,'Style$Unit;',286),Di=Pw(YD,'Style$Display',45,fd),sm=Nw(ZD,'Style$Display;',287),Ii=Pw(YD,'Style$Overflow',51,vd),tm=Nw(ZD,'Style$Overflow;',288),Ni=Pw(YD,'Style$Position',56,Ld),um=Nw(ZD,'Style$Position;',289),Si=Pw(YD,'Style$TextAlign',61,_d),vm=Nw(ZD,'Style$TextAlign;',290),Ti=Pw(YD,'Style$Unit$1',67,null),Ui=Pw(YD,'Style$Unit$2',68,null),Vi=Pw(YD,'Style$Unit$3',69,null),Wi=Pw(YD,'Style$Unit$4',70,null),Xi=Pw(YD,'Style$Unit$5',71,null),Yi=Pw(YD,'Style$Unit$6',72,null),Zi=Pw(YD,'Style$Unit$7',73,null),$i=Pw(YD,'Style$Unit$8',74,null),_i=Pw(YD,'Style$Unit$9',75,null),zi=Pw(YD,'Style$Display$1',47,null),Ai=Pw(YD,'Style$Display$2',48,null),Bi=Pw(YD,'Style$Display$3',49,null),Ci=Pw(YD,'Style$Display$4',50,null),Ei=Pw(YD,'Style$Overflow$1',52,null),Fi=Pw(YD,'Style$Overflow$2',53,null),Gi=Pw(YD,'Style$Overflow$3',54,null),Hi=Pw(YD,'Style$Overflow$4',55,null),Ji=Pw(YD,'Style$Position$1',57,null),Ki=Pw(YD,'Style$Position$2',58,null),Li=Pw(YD,'Style$Position$3',59,null),Mi=Pw(YD,'Style$Position$4',60,null),Oi=Pw(YD,'Style$TextAlign$1',62,null),Pi=Pw(YD,'Style$TextAlign$2',63,null),Qi=Pw(YD,'Style$TextAlign$3',64,null),Ri=Pw(YD,'Style$TextAlign$4',65,null),qk=Ow(ND,'DirectionalTextHelper',180),Xl=Ow(JD,'UnsupportedOperationException',257),Nl=Ow(JD,'IllegalStateException',246),Zj=Ow(TD,'Window$ClosingEvent',146),zj=Ow(RD,'HandlerManager',102),$j=Ow(TD,'Window$WindowHandlers',147),bl=Ow(PD,'EventBus',105),gl=Ow(PD,'SimpleEventBus',104),yj=Ow(RD,'HandlerManager$Bus',103),dl=Ow(PD,'SimpleEventBus$1',213),el=Ow(PD,'SimpleEventBus$2',214),fl=Ow(PD,'SimpleEventBus$3',215),$k=Ow(ND,'WidgetCollection',208),zm=Nw(UD,'Widget;',291),Zk=Ow(ND,'WidgetCollection$WidgetIterator',209),Pl=Ow(JD,'NullPointerException',251),Ml=Ow(JD,'IllegalArgumentException',245),Lk=Ow(ND,'ScrollImpl',195),Kk=Ow(ND,'ScrollImpl$ScrollImplTrident',196),Tl=Ow(JD,'StringBuffer',255),ak=Ow($D,'WindowImplIE$1',155),bk=Ow($D,'WindowImplIE$2',156),tj=Ow(_D,'CloseEvent',99),sj=Ow(_D,'AttachEvent',98),fj=Ow(WD,'MouseDownEvent',85),kj=Ow(WD,'MouseUpEvent',89),hj=Ow(WD,'MouseMoveEvent',86),jj=Ow(WD,'MouseOverEvent',88),ij=Ow(WD,'MouseOutEvent',87),Fj=Ow('com.google.gwt.text.shared.','AbstractRenderer',121),Hj=Ow(aE,'PassthroughRenderer',123),Gj=Ow(aE,'PassthroughParser',122),lj=Ow(WD,'PrivateMap',90),Aj=Ow(RD,'LegacyHandlerWrapper',106),Vj=Ow(bE,'TouchScroller',127),Uj=Ow(bE,'TouchScroller$TemporalPoint',137),Sj=Ow(bE,'TouchScroller$MomentumCommand',134),Tj=Ow(bE,'TouchScroller$MomentumTouchRemovalCommand',136),Rj=Ow(bE,'TouchScroller$MomentumCommand$1',135),Lj=Ow(bE,'TouchScroller$1',128),Mj=Ow(bE,'TouchScroller$2',129),Nj=Ow(bE,'TouchScroller$3',130),Oj=Ow(bE,'TouchScroller$4',131),Pj=Ow(bE,'TouchScroller$5',132),Qj=Ow(bE,'TouchScroller$6',133),pm=Ow(VD,'NoSuchElementException',278),om=Ow(VD,'MapEntryImpl',277),Ol=Ow(JD,'IndexOutOfBoundsException',247),pj=Ow(WD,'TouchEvent',93),rj=Ow(WD,'TouchStartEvent',97),oj=Ow(WD,'TouchEvent$TouchSupportDetector',95),qj=Ow(WD,'TouchMoveEvent',96),nj=Ow(WD,'TouchEndEvent',94),mj=Ow(WD,'TouchCancelEvent',92),Ij=Ow(bE,'DefaultMomentum',124),Jj=Ow(bE,'Momentum$State',125),em=Ow(VD,'AbstractList',267),km=Ow(VD,'ArrayList',272),cm=Ow(VD,'AbstractList$IteratorImpl',268),dm=Ow(VD,'AbstractList$ListIteratorImpl',269),ul=Ow(MD,'VisibleGene',229),kl=Ow(MD,'Gene',219),Cl=Ow(cE,'Requirement',233),Bl=Ow(cE,'ProteinLengthRequirement',237),xl=Ow(cE,'IntronNumberRequirement',232),wl=Ow(dE,'Problem',231),Fl=Ow(cE,'SingleMutationRequirement',240),El=Ow(cE,'ShortermRNARequirement',239),yl=Ow(cE,'LongerProteinRequirement',234),Dl=Ow(cE,'ShorterProteinRequirement',238),Al=Ow(cE,'NomRNARequirement',236),zl=Ow(cE,'NoProteinRequirement',235),uj=Ow(_D,'ResizeEvent',100),sl=Ow(MD,'HTMLContainer',227),_j=Ow($D,'HistoryImpl',152),tl=Ow(MD,'Nucleotide',228),jl=Ow(MD,'Exon',218),vl=Ow(dE,'GenexState',230),vj=Ow(_D,'ValueChangeEvent',101),lm=Ow(VD,'Collections$EmptyList',274),il=Ow(MD,'ColorSequencer',217),oi=Ow(SD,'AnimationSchedulerImpl',7),ni=Ow(SD,'AnimationSchedulerImplTimer',8),mi=Ow(SD,'AnimationSchedulerImplTimer$AnimationHandleImpl',11),rm=Nw('[Lcom.google.gwt.animation.client.','AnimationSchedulerImplTimer$AnimationHandleImpl;',292),li=Ow(SD,'AnimationSchedulerImplTimer$1',9),Kj=Ow(bE,'Point',126);$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalEnd'});if ($wnd.genex) $wnd.genex.onScriptLoad();
diff --git a/common/static/js/capa/genex/026A6180B5959B8660E084245FEE5E9E.cache.html b/common/static/js/capa/genex/73F4B6D6D466BAD6850A60128DF5B80D.cache.html
similarity index 91%
rename from common/static/js/capa/genex/026A6180B5959B8660E084245FEE5E9E.cache.html
rename to common/static/js/capa/genex/73F4B6D6D466BAD6850A60128DF5B80D.cache.html
index 13f25ec581..d5441b656e 100644
--- a/common/static/js/capa/genex/026A6180B5959B8660E084245FEE5E9E.cache.html
+++ b/common/static/js/capa/genex/73F4B6D6D466BAD6850A60128DF5B80D.cache.html
@@ -1,4 +1,4 @@
-<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.5.0";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '026A6180B5959B8660E084245FEE5E9E';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script><!--
+<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.5.0";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '73F4B6D6D466BAD6850A60128DF5B80D';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script><!--
 function mB(){}
 function gb(){}
 function ec(){}
@@ -642,7 +642,7 @@ function Xp(a,b){var c=(a.__eventBits||0)^b;a.__eventBits=b;if(!c)return;c&1&&(a
 function jv(a){if(Qx(a,'UUU'))return uD;if(Qx(a,'UUC'))return uD;if(Qx(a,'UUA'))return vD;if(Qx(a,'UUG'))return vD;if(Qx(a,'CUU'))return vD;if(Qx(a,'CUC'))return vD;if(Qx(a,'CUA'))return vD;if(Qx(a,'CUG'))return vD;if(Qx(a,'AUU'))return wD;if(Qx(a,'AUC'))return wD;if(Qx(a,'AUA'))return wD;if(Qx(a,xD))return 'Met';if(Qx(a,'GUU'))return yD;if(Qx(a,'GUC'))return yD;if(Qx(a,'GUA'))return yD;if(Qx(a,'GUG'))return yD;if(Qx(a,'UCU'))return zD;if(Qx(a,'UCC'))return zD;if(Qx(a,'UCA'))return zD;if(Qx(a,'UCG'))return zD;if(Qx(a,'CCU'))return AD;if(Qx(a,'CCC'))return AD;if(Qx(a,'CCA'))return AD;if(Qx(a,'CCG'))return AD;if(Qx(a,'ACU'))return BD;if(Qx(a,'ACC'))return BD;if(Qx(a,'ACA'))return BD;if(Qx(a,'ACG'))return BD;if(Qx(a,'GCU'))return CD;if(Qx(a,'GCC'))return CD;if(Qx(a,'GCA'))return CD;if(Qx(a,'GCG'))return CD;if(Qx(a,'UAU'))return DD;if(Qx(a,'UAC'))return DD;if(Qx(a,'UAA'))return XB;if(Qx(a,'UAG'))return XB;if(Qx(a,'CAU'))return ED;if(Qx(a,'CAC'))return ED;if(Qx(a,'CAA'))return FD;if(Qx(a,'CAG'))return FD;if(Qx(a,'AAU'))return GD;if(Qx(a,'AAC'))return GD;if(Qx(a,'AAA'))return HD;if(Qx(a,'AAG'))return HD;if(Qx(a,'GAU'))return ID;if(Qx(a,'GAC'))return ID;if(Qx(a,'GAA'))return JD;if(Qx(a,'GAG'))return JD;if(Qx(a,'UGU'))return KD;if(Qx(a,'UGC'))return KD;if(Qx(a,'UGA'))return XB;if(Qx(a,'UGG'))return 'Trp';if(Qx(a,'CGU'))return LD;if(Qx(a,'CGC'))return LD;if(Qx(a,'CGA'))return LD;if(Qx(a,'CGG'))return LD;if(Qx(a,'AGU'))return zD;if(Qx(a,'AGC'))return zD;if(Qx(a,'AGA'))return LD;if(Qx(a,'AGG'))return LD;if(Qx(a,'GGU'))return MD;if(Qx(a,'GGC'))return MD;if(Qx(a,'GGA'))return MD;if(Qx(a,'GGG'))return MD;return XB}
 --></script>
 <script><!--
-var XB='',bC='\n',hC=' ',OD='    ',PD='    .    |',TD=' N-',ZB='(',gC=')',lE='+',uE=', ',UC='-',bE="-3'\n",YD='-C',kD='0',_C='0px',rD='1',ND="5'-",aC=':',WB=': ',UD='<\/EM>',ZD='<\/pre><h3>',VD='<\/u>',_D='<EM class=',XD='<EM class=selected>',RD='<font color=red>none<\/font>\n',WD='<u>',mE='=',aE='>',RB='@',cC='@@',gE='A',rE='AAAAAAAAAAAAA',xD='AUG',CD='Ala',LD='Arg',GD='Asn',ID='Asp',mC='BODY',iE='C',qE='CAAAG',pC='CENTER',oC='CSS1Compat',KD='Cys',hE='G',oE='GGGGG',pE='GUGCG',FD='Gln',JD='Glu',MD='Gly',ED='His',cE='INCORRECT',wD='Ile',qC='JUSTIFY',rC='LEFT',vD='Leu',HD='Lys',SC='Null widget handle. If you are creating a composite, ensure that initWidget() has been called.',dE='OK',uD='Phe',AD='Pro',sC='RIGHT',hD='Selected Base = ',zD='Ser',YB='String',TC='Style names cannot be empty',jE='T',nE='TATAA',BD='Thr',DD='Tyr',CE='UmbrellaException',dC='Unknown',yD='Val',sE='You did not make a single base substitution.',eC='[',LE='[Lcom.google.gwt.dom.client.',GE='[Lcom.google.gwt.user.client.ui.',xE='[Ljava.lang.',fC=']',nC='absolute',iD='align',_B='anonymous',dD='cellPadding',cD='cellSpacing',RC='className',tC='click',nD='clip',EE='com.google.gwt.animation.client.',wE='com.google.gwt.core.client.',HE='com.google.gwt.core.client.impl.',KE='com.google.gwt.dom.client.',JE='com.google.gwt.event.dom.client.',ME='com.google.gwt.event.logical.shared.',DE='com.google.gwt.event.shared.',AE='com.google.gwt.i18n.client.',NE='com.google.gwt.text.shared.testing.',OE='com.google.gwt.touch.client.',FE='com.google.gwt.user.client.',RE='com.google.gwt.user.client.impl.',zE='com.google.gwt.user.client.ui.',BE='com.google.web.bindery.event.shared.',HC='dblclick',EC='dir',jC='direction',lD='display',BC='div',lC='fixed',$B='function',kE='g',fE='genex-button',yE='genex.client.gx.',QE='genex.client.problems.',PE='genex.client.requirements.',eE='genex_container',NC='gesturechange',OC='gestureend',MC='gesturestart',QC='height',VB='hidden',vE='java.lang.',IE='java.util.',IC='keydown',JC='keypress',KC='keyup',VC='left',FC='ltr',$D='mature-',uC='mousedown',vC='mousemove',wC='mouseout',xC='mouseover',yC='mouseup',LC='mousewheel',tD='msie',mD='none',SD='none\n',SB='offsetHeight',TB='offsetWidth',sD='opera',UB='overflow',gD='popupContent',kC='position',$C='px',oD='px, ',aD='rect(0px, 0px, 0px, 0px)',pD='relative',iC='rtl',GC='safari',XC='table',YC='tbody',fD='td',WC='top',zC='touchcancel',AC='touchend',CC='touchmove',DC='touchstart',eD='tr',tE='value',jD='verticalAlign',ZC='visibility',bD='visible',PC='width',qD='zoom',QD='|';var _,rn={},DB={25:1,27:1},NB={60:1},yB={6:1,9:1,50:1,53:1,54:1},tB={50:1},pB={},IB={46:1},LB={52:1},PB={50:1,57:1},qB={2:1},FB={24:1,29:1,37:1,40:1,41:1,43:1,45:1},MB={58:1},JB={11:1,27:1},AB={29:1},uB={50:1,56:1},BB={47:1,50:1,56:1},xB={6:1,8:1,50:1,53:1,54:1},OB={59:1},wB={6:1,7:1,50:1,53:1,54:1},vB={5:1,6:1,50:1,53:1,54:1},EB={23:1,27:1},HB={44:1,50:1,53:1,54:1},rB={4:1,50:1},CB={27:1,36:1},sB={38:1},GB={24:1,29:1,37:1,40:1,41:1,42:1,43:1,45:1},KB={49:1},zB={10:1,50:1,53:1,54:1};sn(1,-1,pB);_.eQ=function s(a){return this===a};_.gC=function t(){return this.cZ};_.hC=function u(){return Ub(this)};_.tS=function v(){return this.cZ.d+RB+Dx(this.hC())};_.toString=function(){return this.tS()};_.tM=mB;sn(3,1,{});_.n=-1;_.o=null;_.p=false;_.q=false;_.r=null;_.s=-1;_.t=null;_.u=-1;_.v=false;sn(4,1,{},C);_.J=function D(a){B(this,a)};_.b=null;sn(5,1,{});sn(6,1,qB);sn(7,5,{});var H=null;sn(8,7,{},M);_.M=function N(){return true};_.K=function O(a,b){var c;c=new bb(this,a);sA(this.b,c);this.b.c==1&&U(this.c,16);return c};sn(10,1,sB);_.N=function Y(){this.c||xA(R,this);this.O()};_.c=false;_.d=0;var R;sn(9,10,sB,Z);_.O=function $(){L(this.b)};_.b=null;sn(11,6,{2:1,3:1},bb);_.L=function cb(){K(this.c,this)};_.b=null;_.c=null;sn(12,7,{},gb);_.M=function hb(){return !!($wnd.webkitRequestAnimationFrame&&$wnd.webkitCancelRequestAnimationFrame)};_.K=function ib(a,b){var c;c=fb(a,b);return new kb(c)};sn(13,6,qB,kb);_.L=function lb(){eb(this.b)};_.b=0;sn(14,1,{},ob);sn(19,1,uB);_.P=function vb(){return this.f};_.tS=function wb(){var a,b;a=this.cZ.d;b=this.P();return b!=null?a+WB+b:a};_.f=null;sn(18,19,uB);sn(17,18,uB,yb);sn(16,17,uB,Ab);_.P=function Gb(){this.d==null&&(this.e=Db(this.c),this.b=this.b+WB+Bb(this.c),this.d=ZB+this.e+') '+Fb(this.c)+this.b,undefined);return this.d};_.b=XB;_.c=null;_.d=null;_.e=null;sn(23,1,{});var Lb=0,Mb=0,Nb=0,Ob=-1;sn(25,23,{},ec);_.b=null;_.c=null;_.d=null;_.e=false;_.f=null;_.g=null;_.i=null;_.j=false;var Yb;sn(26,1,{},lc);_.Q=function mc(){this.b.e=true;ac(this.b);this.b.e=false;return this.b.j=bc(this.b)};_.b=null;sn(27,1,{},oc);_.Q=function pc(){this.b.e&&jc(this.b.f,1);return this.b.j};_.b=null;sn(30,1,{},xc);_.R=function yc(){var a={};var b=[];var c=arguments.callee.caller.caller;while(c){var d=this.S(c.toString());b.push(d);var e=aC+d;var f=a[e];if(f){var g,h;for(g=0,h=f.length;g<h;g++){if(f[g]===c){return b}}}(f||(a[e]=[])).push(c);c=c.caller}return b};_.S=function zc(a){return qc(a)};_.T=function Ac(a){return []};sn(32,30,{});_.R=function Ec(){return tc(this.T(wc()),this.U())};_.T=function Fc(a){return Dc(this,a)};_.U=function Gc(){return 2};sn(31,32,{});_.R=function Nc(){return Ic(this)};_.S=function Oc(a){var b,c,d,e;if(a.length==0){return _B}e=$x(a);e.indexOf('at ')==0&&(e=Yx(e,3));c=e.indexOf(eC);c!=-1&&(e=$x(e.substr(0,c-0))+$x(Yx(e,e.indexOf(fC,c)+1)));c=e.indexOf(ZB);if(c==-1){d=e;e=XB}else{b=e.indexOf(gC,c);d=e.substr(c+1,b-(c+1));e=$x(e.substr(0,c-0))}c=Sx(e,dy(46));c!=-1&&(e=Yx(e,c+1));return (e.length>0?e:_B)+cC+d};_.T=function Pc(a){return Lc(this,a)};_.U=function Qc(){return 3};sn(33,31,{},Sc);sn(34,1,{});sn(35,34,{},Xc);_.b=XB;sn(51,1,{50:1,53:1,54:1});_.eQ=function Cd(a){return this===a};_.hC=function Dd(){return Ub(this)};_.tS=function Ed(){return this.b};_.b=null;_.c=0;sn(50,51,vB);var Fd,Gd,Hd,Id,Jd;sn(52,50,vB,Nd);sn(53,50,vB,Pd);sn(54,50,vB,Rd);sn(55,50,vB,Td);sn(56,51,wB);var Vd,Wd,Xd,Yd,Zd;sn(57,56,wB,be);sn(58,56,wB,de);sn(59,56,wB,fe);sn(60,56,wB,he);sn(61,51,xB);var je,ke,le,me,ne;sn(62,61,xB,re);sn(63,61,xB,te);sn(64,61,xB,ve);sn(65,61,xB,xe);sn(66,51,yB);var ze,Ae,Be,Ce,De;sn(67,66,yB,He);sn(68,66,yB,Je);sn(69,66,yB,Le);sn(70,66,yB,Ne);sn(71,51,zB);var Pe,Qe,Re,Se,Te,Ue,Ve,We,Xe,Ye;sn(72,71,zB,af);sn(73,71,zB,cf);sn(74,71,zB,ef);sn(75,71,zB,gf);sn(76,71,zB,jf);sn(77,71,zB,lf);sn(78,71,zB,nf);sn(79,71,zB,pf);sn(80,71,zB,rf);sn(86,1,{});_.tS=function yf(){return 'An event type'};_.g=null;sn(85,86,{});_.X=function Af(){this.f=false;this.g=null};_.f=false;sn(84,85,{});_.W=function Ff(){return this.Y()};_.b=null;_.c=null;var Bf=null;sn(83,84,{});sn(82,83,{});sn(81,82,{},Kf);_.V=function Lf(a){Hi(a,11).Z(this)};_.Y=function Mf(){return If};var If;sn(89,1,{});_.hC=function Rf(){return this.d};_.tS=function Sf(){return 'Event type'};_.d=0;var Qf=0;sn(88,89,{},Tf);sn(87,88,{12:1},Uf);_.b=null;_.c=null;sn(90,82,{},Zf);_.V=function $f(a){Yf(this,Hi(a,13))};_.Y=function _f(){return Wf};var Wf;sn(91,82,{},eg);_.V=function fg(a){dg(this,Hi(a,14))};_.Y=function gg(){return bg};var bg;sn(92,82,{},kg);_.V=function lg(a){Hi(Hi(a,15),39)};_.Y=function mg(){return ig};var ig;sn(93,82,{},qg);_.V=function rg(a){Hi(Hi(a,16),39)};_.Y=function sg(){return og};var og;sn(94,82,{},xg);_.V=function yg(a){wg(this,Hi(a,17))};_.Y=function zg(){return ug};var ug;sn(95,1,{},Dg);_.b=null;sn(98,83,{});var Gg=null;sn(97,98,{},Jg);_.V=function Kg(a){co(Hi(Hi(a,18),34).b)};_.Y=function Lg(){return Hg};var Hg;sn(99,98,{},Pg);_.V=function Qg(a){co(Hi(Hi(a,19),33).b)};_.Y=function Rg(){return Ng};var Ng;sn(100,1,{},Tg);sn(101,98,{},Yg);_.V=function Zg(a){Xg(this,Hi(a,20))};_.Y=function $g(){return Vg};var Vg;sn(102,98,{},dh);_.V=function eh(a){ch(this,Hi(a,21))};_.Y=function fh(){return ah};var ah;sn(103,85,{},jh);_.V=function kh(a){ih(this,Hi(a,22))};_.W=function mh(){return hh};_.b=false;var hh=null;sn(104,85,{},ph);_.V=function qh(a){Hi(a,23).$(this)};_.W=function sh(){return oh};var oh=null;sn(105,85,{},vh);_.V=function wh(a){Hi(a,25)._(this)};_.W=function yh(){return uh};_.b=0;var uh=null;sn(106,85,{},Ch);_.V=function Dh(a){Bh(Hi(a,26))};_.W=function Fh(){return Ah};var Ah=null;sn(107,1,AB,Kh,Lh);_.ab=function Mh(a){Ih(this,a)};_.b=null;_.c=null;sn(110,1,{});sn(109,110,{});_.b=null;_.c=0;_.d=false;sn(108,109,{},_h);sn(111,1,{28:1},bi);_.b=null;sn(113,17,BB,ei);_.b=null;sn(112,113,BB,hi);sn(114,1,{27:1},ji);sn(116,51,{30:1,50:1,53:1,54:1},si);var ni,oi,pi,qi;sn(117,1,{},ui);_.qI=0;var Ai,Bi;sn(126,1,{});sn(127,1,{},yn);var xn=null;sn(128,126,{},Bn);var An=null;sn(129,1,{},Fn);sn(130,1,{},Kn);_.b=0;_.c=0;_.d=null;_.e=null;_.f=null;sn(131,1,{32:1},Pn,Qn);_.eQ=function Rn(a){var b;if(!Ji(a,32)){return false}b=Hi(a,32);return this.b==b.b&&this.c==b.c};_.hC=function Sn(){return Ni(this.b)^Ni(this.c)};_.tS=function Tn(){return 'Point('+this.b+','+this.c+gC};_.b=0;_.c=0;sn(132,1,{},mo);_.b=null;_.c=null;_.d=false;_.g=null;_.i=null;_.o=null;_.p=null;_.q=null;_.s=false;_.t=null;var Vn=null;sn(133,1,{22:1,27:1},oo);_.b=null;sn(134,1,{21:1,27:1},qo);_.b=null;sn(135,1,{20:1,27:1},so);_.b=null;sn(136,1,{19:1,27:1,33:1},uo);_.b=null;sn(137,1,{18:1,27:1,34:1},wo);_.b=null;sn(138,1,CB,yo);_.bb=function zo(a){var b;if(1==Ip(a.e.type)){b=new Pn(a.e.clientX||0,a.e.clientY||0);if(_n(this.b,b)||ao(this.b,b)){a.b=true;a.e.stopPropagation();a.e.preventDefault()}}};_.b=null;sn(139,1,{},Co);_.Q=function Do(){var a,b,c,d,e,f,g;if(this!=this.f.i){Bo(this);return false}a=nb(this.b);In(this.e,a-this.d);this.d=a;Hn(this.e,a);e=En(this.e);e||Bo(this);ko(this.f,this.e.e);d=Ni(this.e.e.b);c=Vt(this.f.t);b=Tt(this.f.t);f=Ut(this.f.t);g=Ni(this.e.e.c);if((f<=g||0>=g)&&(b<=d||c>=d)){Bo(this);return false}return e};_.d=0;_.e=null;_.f=null;_.g=null;sn(140,1,DB,Fo);_._=function Go(a){Bo(this.b)};_.b=null;sn(141,1,{},Io);_.Q=function Jo(){var a,b,c;a=pb();b=new $z(this.b.r);while(b.c<b.e.Hb()){c=Hi(Yz(b),35);a-c.c>=2500&&Zz(b)}return this.b.r.c!=0};_.b=null;sn(142,1,{35:1},Mo,No);_.b=null;_.c=0;var Oo=null,Po=null;var Xo=null;sn(147,85,{},cp);_.V=function dp(a){Hi(a,36).bb(this);_o.d=false};_.W=function fp(){return $o};_.X=function gp(){ap(this)};_.b=false;_.c=false;_.d=false;_.e=null;var $o=null,_o=null;var hp=null;sn(149,1,EB,lp);_.$=function mp(a){while((S(),R).c>0){T(Hi(uA(R,0),38))}};var np=false,op=null,pp=0,qp=0,rp=false;sn(151,85,{},Cp);_.V=function Dp(a){Oi(a);null.Rb()};_.W=function Ep(){return Ap};var Ap;sn(152,107,AB,Gp);var Hp=false;var Mp=null,Np=null,Op=null,Pp=null,Qp=null,Rp=null;sn(155,1,AB);_.db=function _p(a){return decodeURI(a.replace('%23','#'))};_.ab=function aq(a){Ih(this.b,a)};_.eb=function bq(a){a=a==null?XB:a;if(!Qx(a,Zp==null?XB:Zp)){Zp=a;Eh(this)}};var Zp=XB;sn(157,155,AB);sn(156,157,AB,gq);sn(163,1,{40:1,43:1});_.fb=function tq(){return this.I};_.gb=function uq(a){Vo(this.I,QC,a)};_.hb=function xq(a){Vo(this.I,PC,a)};_.tS=function yq(){if(!this.I){return '(null handle)'}return this.I.outerHTML};_.I=null;sn(162,163,FB);_.ib=function Iq(){};_.jb=function Jq(){};_.ab=function Kq(a){Cq(this,a)};_.kb=function Lq(){Dq(this)};_.cb=function Mq(a){Eq(this,a)};_.lb=function Nq(){Fq(this)};_.mb=function Oq(){};_.nb=function Pq(){};_.E=false;_.F=0;_.G=null;_.H=null;sn(161,162,FB);_.ib=function Rq(){fr(this,(dr(),br))};_.jb=function Sq(){fr(this,(dr(),cr))};sn(160,161,FB);_.pb=function Wq(){return new Wu(this.g)};_.ob=function Xq(a){return Uq(this,a)};sn(159,160,FB);_.ob=function _q(a){return Zq(this,a)};sn(164,112,BB,er);var br,cr;sn(165,1,{},hr);_.qb=function ir(a){a.kb()};sn(166,1,{},kr);_.qb=function lr(a){a.lb()};sn(169,162,FB);_.kb=function pr(){var a;Dq(this);a=nd(this.I);-1==a&&(this.I.tabIndex=0,undefined)};sn(168,169,FB);sn(167,168,FB,rr);sn(170,160,FB);_.e=null;_.f=null;sn(173,161,FB);_.rb=function Br(){return this.I};_.pb=function Cr(){return new fu(this)};_.ob=function Dr(a){return xr(this,a)};_.D=null;sn(172,173,FB);_.rb=function Nr(){return gd(this.I)};_.fb=function Or(){return hd(gd(this.I))};_.sb=function Pr(){Gr(this)};_.bb=function Qr(a){a.d&&(a.e,false)&&(a.b=true)};_.nb=function Rr(){this.B&&nt(this.A,false,true)};_.gb=function Sr(a){this.p=a;Hr(this);a.length==0&&(this.p=null)};_.hb=function Tr(a){this.q=a;Hr(this);a.length==0&&(this.q=null)};_.n=false;_.o=false;_.p=null;_.q=null;_.r=null;_.t=null;_.u=false;_.v=false;_.w=-1;_.x=false;_.y=null;_.z=false;_.B=false;_.C=-1;sn(171,172,FB);_.ib=function Vr(){Dq(this.k)};_.jb=function Wr(){Fq(this.k)};_.pb=function Xr(){return new fu(this.k)};_.ob=function Yr(a){return xr(this.k,a)};_.k=null;sn(174,173,FB,_r);_.rb=function bs(){return this.b};_.b=null;_.c=null;sn(175,171,FB,ls);_.ib=function ns(){try{Dq(this.k)}finally{Dq(this.b)}};_.jb=function os(){try{Fq(this.k)}finally{Fq(this.b)}};_.sb=function ps(){gs(this)};_.cb=function qs(a){switch(Ip(a.type)){case 4:case 8:case 64:case 16:case 32:if(!this.g&&!hs(this,a)){return}}Eq(this,a)};_.bb=function rs(a){var b;b=a.e;!a.b&&Ip(a.e.type)==4&&hs(this,b)&&(b.preventDefault(),undefined);a.d&&(a.e,false)&&(a.b=true)};_.b=null;_.c=0;_.d=0;_.e=0;_.f=0;_.g=false;_.i=null;_.j=0;sn(176,1,DB,ts);_._=function us(a){this.b.j=a.b};_.b=null;sn(180,162,FB);_.b=null;sn(179,180,FB,Cs);sn(178,179,FB,Es,Fs);sn(177,178,FB,Gs);sn(181,1,{13:1,14:1,15:1,16:1,17:1,27:1,39:1},Is);_.b=null;sn(182,1,{},Ls);_.b=null;_.c=null;_.d=null;var Ms,Ns,Os;sn(183,1,{});sn(184,183,{},Ss);_.b=null;var Ts;sn(185,1,{},Ws);_.b=null;sn(186,170,FB,Zs);_.ob=function $s(a){var b,c;c=hd(a.I);b=Uq(this,a);b&&Zc(this.c,c);return b};_.c=null;sn(187,1,DB,bt);_._=function ct(a){at()};sn(188,1,CB,et);_.bb=function ft(a){Ir(this.b,a)};_.b=null;sn(189,1,{26:1,27:1},ht);_.b=null;sn(190,3,{},ot);_.b=null;_.c=false;_.d=false;_.e=0;_.f=-1;_.g=null;_.i=null;_.j=false;sn(191,10,sB,qt);_.O=function rt(){this.b.i=null;x(this.b,pb())};_.b=null;sn(193,159,GB,At);var wt,xt,yt;sn(194,1,{},Ft);_.qb=function Gt(a){a.E&&a.lb()};sn(195,1,EB,It);_.$=function Jt(a){Ct()};sn(196,193,GB,Lt);sn(197,1,{},Rt);var Nt=null;sn(198,173,FB,Zt);_.rb=function $t(){return this.b};_.kb=function _t(){Dq(this);this.c.__listener=this};_.lb=function au(){this.c.__listener=null;Fq(this)};_.gb=function bu(a){Vo(this.I,QC,a)};_.hb=function cu(a){Vo(this.I,PC,a)};_.b=null;_.c=null;_.d=null;sn(199,1,{},fu);_.tb=function gu(){return this.b};_.ub=function hu(){return eu(this)};_.vb=function iu(){!!this.c&&this.d.ob(this.c)};_.c=null;_.d=null;sn(202,169,FB);_.cb=function nu(a){var b;b=Ip(a.type);(b&896)!=0?Eq(this,a):Eq(this,a)};_.mb=function ou(){};sn(201,202,FB);sn(200,201,FB,qu);sn(203,51,HB);var tu,uu,vu,wu,xu;sn(204,203,HB,Bu);sn(205,203,HB,Du);sn(206,203,HB,Fu);sn(207,203,HB,Hu);sn(208,170,FB,Ku);_.ob=function Lu(a){var b,c;c=hd(a.I);b=Uq(this,a);b&&Zc(this.e,hd(c));return b};sn(209,1,{},Su);_.pb=function Tu(){return new Wu(this)};_.b=null;_.c=null;_.d=0;sn(210,1,{},Wu);_.tb=function Xu(){return this.b<this.c.d-1};_.ub=function Yu(){return Vu(this)};_.vb=function Zu(){if(this.b<0||this.b>=this.c.d){throw new yx}this.c.c.ob(this.c.b[this.b--])};_.b=-1;_.c=null;sn(214,1,{},cv);_.b=null;_.c=null;_.d=null;sn(215,1,IB,ev);_.wb=function fv(){Sh(this.b,this.d,this.c)};_.b=null;_.c=null;_.d=null;sn(216,1,IB,hv);_.wb=function iv(){Uh(this.b,this.d,this.c)};_.b=null;_.c=null;_.d=null;sn(218,1,{},mv);_.b=0;sn(219,1,{},ov);_.b=0;_.c=0;_.d=0;sn(220,1,{},Ev);_.b=null;_.c=null;_.d=null;_.e=null;_.f=null;_.g=0;_.i=0;_.j=0;_.k=null;_.n=null;_.o=null;_.p=0;_.q=0;_.r=null;_.s=null;_.t=null;_.u=0;sn(221,1,{},Pv);_.xb=function Qv(a){var b,c;if(a==39){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1);b=Lv(this,this.b,this.e);Ov(this,b,this.e);this.c=b.c.c.length;b.c.g+1;Gv(this)}if(a==37){--this.e;this.e<0&&(this.e=0);b=Lv(this,this.b,this.e);Ov(this,b,this.e);this.c=b.c.c.length;b.c.g+1;Gv(this)}if(a==8||a==46){this.B=this.f;c=new uy(this.b);qy(c,this.e);this.b=c.b.b;this.e>=0&&--this.e;b=Lv(this,this.b,this.e);Ov(this,b,this.e);this.f=yv(b.c);this.c=b.c.c.length;Gv(this)}};_.yb=function Rv(a,b){var c,d;if(Qx(a,gE)||Qx(a,hE)||Qx(a,iE)||Qx(a,jE)){this.B=this.f;d=new uy(this.b);ry(d,this.e,a);this.b=d.b.b;++this.e;c=Lv(this,this.b,this.e);Ov(this,c,this.e);this.f=yv(c.c);this.c=c.c.c.length;c.c.g+1;Gv(this)}if(Qx(a,'a')||Qx(a,kE)||Qx(a,'c')||Qx(a,'t')){this.B=this.f;d=new uy(this.b);sy(d,this.e,this.e+1,a.toUpperCase());this.b=d.b.b;c=Lv(this,this.b,this.e);Ov(this,c,this.e);this.f=yv(c.c);this.c=c.c.c.length;c.c.g+1;Gv(this)}if(Qx(a,lE)||Qx(a,UC)||Qx(a,mE)||Qx(a,'_')){if(Qx(a,lE)||Qx(a,mE)){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1)}else{--this.e;this.e<0&&(this.e=0)}c=Lv(this,this.b,this.e);Ov(this,c,this.e);this.c=c.c.c.length;c.c.g+1;Gv(this)}if(b==39){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1);c=Lv(this,this.b,this.e);Ov(this,c,this.e);this.c=c.c.c.length;c.c.g+1;Gv(this)}if(b==37){--this.e;this.e<0&&(this.e=0);c=Lv(this,this.b,this.e);Ov(this,c,this.e);this.c=c.c.c.length;c.c.g+1;Gv(this)}};_.zb=function Sv(a){var b;if(a>=0&&a<=this.c){b=Lv(this,this.b,a);Ov(this,b,a);this.c=b.c.c.length;this.e=a;Gv(this)}};_.Ab=function Uv(a){var b;a!=null&&lw(this.z,a);this.z.f=nE;this.z.i=oE;this.z.d=pE;this.z.c=qE;this.z.e=rE;this.g=this.z.b;this.b=this.z.b;this.c=this.b.length;this.D=this.z.f;this.E=this.z.g;this.H=this.z.i;this.v=this.z.d;this.u=this.z.c;this.A=this.z.e;(Qx(this.v,mD)||Qx(this.u,mD))&&(this.A=XB);b=Lv(this,this.g,-1);this.i=b.c.f;this.j=b.c.r;this.c=b.c.c.length;this.f=yv(b.c);Ds(this.s,b.b.c+'<\/pre><\/body><\/html>')};_.Bb=function Wv(a){var b,c,d,e,f;this.C=new Cw;if(a==1){b=new $w;b.c=sE;Aw(this.C,b);d=new Xw;d.c='Your change does not make the mature mRNA shorter.';Aw(this.C,d)}else if(a==2){b=new $w;b.c=sE;Aw(this.C,b);d=new Iw;d.c='Your change does not make the protein longer.';Aw(this.C,d)}else if(a==3){b=new $w;b.c=sE;Aw(this.C,b);d=new Uw;d.c='Your change does not make the protein shorter.';Aw(this.C,d)}else if(a==4){b=new $w;b.c=sE;Aw(this.C,b);d=new Ow;d.c='Your change does not prevent mRNA from being made.';Aw(this.C,d);f=new Lw;f.c='Your change does not prevent protein from being made';Aw(this.C,f)}else if(a==5){c=new Rw;c.b=c.b;c.c='Your protein does not have 5 amino acids.';Aw(this.C,c);e=new Fw;e.b=1;e.c='Your gene does not contain one intron.';Aw(this.C,e)}};_.b=null;_.c=0;_.d=null;_.e=0;_.f=XB;_.g=null;_.i=XB;_.j=XB;_.k=null;_.n=null;_.o=false;_.p=null;_.q=null;_.r=null;_.s=null;_.t=null;_.u=null;_.v=null;_.w=null;_.x=null;_.y=null;_.A=null;_.B=XB;_.C=null;_.D=null;_.E=0;_.F=null;_.G=null;_.H=null;_.I=null;sn(222,1,JB,Zv);_.Z=function $v(a){gs(this.b.k);this.b.p.I[tE]=XB};_.b=null;sn(223,1,{},aw);_.b=null;sn(224,1,JB,cw);_.Z=function dw(a){var b,c;this.b.B=this.b.f;c=bd(this.b.p.I,tE);c=c.toUpperCase();c=Wx(c,'[^AGCT]',XB);this.b.b=c;this.b.e=-1;b=Lv(this.b,this.b.b,-1);Ov(this.b,b,-1);this.b.f=yv(b.c);this.b.c=b.c.c.length;gs(this.b.k);Gv(this.b)};_.b=null;sn(225,1,JB,fw);_.Z=function gw(a){var b;this.b.b=this.b.g;b=Lv(this.b,this.b.b,-1);Ov(this.b,b,-1);this.b.f=yv(b.c);this.b.c=b.c.c.length;Gv(this.b)};_.b=null;sn(226,1,JB,iw);_.Z=function jw(a){Er(this.b.k)};_.b=null;sn(227,1,{},mw);_.b=null;_.c=null;_.d=null;_.e=null;_.f=null;_.g=0;_.i=null;sn(228,1,{},ow);_.b=null;_.c=null;sn(229,1,{48:1},sw);_.b=0;_.c=0;_.d=false;_.e=false;_.f=0;_.g=0;_.i=false;sn(230,1,{},uw);_.b=null;_.c=null;sn(231,1,{},xw);_.tS=function yw(){return ww(this)};_.b=null;_.c=0;_.d=null;_.e=null;_.f=0;_.g=null;_.i=null;_.j=null;sn(232,1,{},Cw);_.b=null;sn(234,1,KB);_.c='unassigned';sn(233,234,KB,Fw);_.Cb=function Gw(a){return a.c==this.b+1};_.b=0;sn(235,234,KB,Iw);_.Cb=function Jw(a){return a.d.length>a.j.length};sn(236,234,KB,Lw);_.Cb=function Mw(a){return Qx(a.d,XB)};sn(237,234,KB,Ow);_.Cb=function Pw(a){return Qx(a.e,XB)};sn(238,234,KB,Rw);_.Cb=function Sw(a){return a.d.length==this.b};_.b=0;sn(239,234,KB,Uw);_.Cb=function Vw(a){return a.d.length<a.j.length};sn(240,234,KB,Xw);_.Cb=function Yw(a){return a.e.length<a.i.length};sn(241,234,KB,$w);_.Cb=function _w(a){var b,c,d,e;e=a.g;b=a.b;if(e.length!=b.length)return false;d=0;for(c=0;c<e.length;++c){e.charCodeAt(c)!=b.charCodeAt(c)&&++d}if(d==1)return true;return false};sn(242,17,uB,bx);sn(243,1,{50:1,51:1,53:1},gx);_.eQ=function hx(a){return Ji(a,51)&&Hi(a,51).b==this.b};_.hC=function ix(){return this.b?1231:1237};_.tS=function jx(){return this.b?'true':'false'};_.b=false;var dx,ex;sn(244,1,{},lx);_.tS=function sx(){return ((this.b&2)!=0?'interface ':(this.b&1)!=0?XB:'class ')+this.d};_.b=0;_.c=0;_.d=null;sn(245,17,uB,ux);sn(246,17,uB,wx);sn(247,17,uB,yx,zx);sn(248,17,uB,Bx,Cx);sn(252,17,uB,Hx,Ix);var Jx;sn(254,1,{50:1,55:1},Mx);_.tS=function Nx(){return this.b+'.'+this.e+ZB+(this.c!=null?this.c:'Unknown Source')+(this.d>=0?aC+this.d:XB)+gC};_.b=null;_.c=null;_.d=0;_.e=null;_=String.prototype;_.cM={1:1,50:1,52:1,53:1};_.eQ=function cy(a){return Qx(this,a)};_.hC=function ey(){return ly(this)};_.tS=_.toString;var gy,hy=0,iy;sn(256,1,LB,ty,uy);_.tS=function vy(){return this.b.b};sn(257,1,LB,yy);_.tS=function zy(){return this.b.b};sn(258,17,uB,By);sn(259,1,{});_.Db=function Fy(a){throw new By('Add not supported on this collection')};_.Eb=function Gy(a){var b;b=Dy(this.pb(),a);return !!b};_.Fb=function Hy(){return this.Hb()==0};_.Gb=function Iy(a){var b;b=Dy(this.pb(),a);if(b){b.vb();return true}else{return false}};_.tS=function Jy(){return Ey(this)};sn(261,1,MB);_.eQ=function Ny(a){var b,c,d,e,f;if(a===this){return true}if(!Ji(a,58)){return false}e=Hi(a,58);if(this.e!=e.e){return false}for(c=new tz((new lz(e)).b);Xz(c.b);){b=c.c=Hi(Yz(c.b),59);d=b.Jb();f=b.Kb();if(!(d==null?this.d:Ji(d,1)?aC+Hi(d,1) in this.f:Xy(this,d,~~Jb(d)))){return false}if(!lB(f,d==null?this.c:Ji(d,1)?Wy(this,Hi(d,1)):Vy(this,d,~~Jb(d)))){return false}}return true};_.hC=function Oy(){var a,b,c;c=0;for(b=new tz((new lz(this)).b);Xz(b.b);){a=b.c=Hi(Yz(b.b),59);c+=a.hC();c=~~c}return c};_.tS=function Py(){var a,b,c,d;d='{';a=false;for(c=new tz((new lz(this)).b);Xz(c.b);){b=c.c=Hi(Yz(c.b),59);a?(d+=uE):(a=true);d+=XB+b.Jb();d+=mE;d+=XB+b.Kb()}return d+'}'};sn(260,261,MB);_.Ib=function fz(a,b){return Mi(a)===Mi(b)||a!=null&&Ib(a,b)};_.b=null;_.c=null;_.d=false;_.e=0;_.f=null;sn(263,259,NB);_.eQ=function iz(a){var b,c,d;if(a===this){return true}if(!Ji(a,60)){return false}c=Hi(a,60);if(c.Hb()!=this.Hb()){return false}for(b=c.pb();b.tb();){d=b.ub();if(!this.Eb(d)){return false}}return true};_.hC=function jz(){var a,b,c;a=0;for(b=this.pb();b.tb();){c=b.ub();if(c!=null){a+=Jb(c);a=~~a}}return a};sn(262,263,NB,lz);_.Eb=function mz(a){return kz(this,a)};_.pb=function nz(){return new tz(this.b)};_.Gb=function oz(a){var b;if(kz(this,a)){b=Hi(a,59).Jb();bz(this.b,b);return true}return false};_.Hb=function pz(){return this.b.e};_.b=null;sn(264,1,{},tz);_.tb=function uz(){return Xz(this.b)};_.ub=function vz(){return rz(this)};_.vb=function wz(){sz(this)};_.b=null;_.c=null;_.d=null;sn(266,1,OB);_.eQ=function zz(a){var b;if(Ji(a,59)){b=Hi(a,59);if(lB(this.Jb(),b.Jb())&&lB(this.Kb(),b.Kb())){return true}}return false};_.hC=function Az(){var a,b;a=0;b=0;this.Jb()!=null&&(a=Jb(this.Jb()));this.Kb()!=null&&(b=Jb(this.Kb()));return a^b};_.tS=function Bz(){return this.Jb()+mE+this.Kb()};sn(265,266,OB,Cz);_.Jb=function Dz(){return null};_.Kb=function Ez(){return this.b.c};_.Lb=function Fz(a){return _y(this.b,a)};_.b=null;sn(267,266,OB,Hz);_.Jb=function Iz(){return this.b};_.Kb=function Jz(){return Wy(this.c,this.b)};_.Lb=function Kz(a){return az(this.c,this.b,a)};_.b=null;_.c=null;sn(268,259,{57:1});_.Mb=function Mz(a,b){throw new By('Add not supported on this list')};_.Db=function Nz(a){this.Mb(this.Hb(),a);return true};_.eQ=function Pz(a){var b,c,d,e,f;if(a===this){return true}if(!Ji(a,57)){return false}f=Hi(a,57);if(this.Hb()!=f.Hb()){return false}d=new $z(this);e=f.pb();while(d.c<d.e.Hb()){b=Yz(d);c=Yz(e);if(!(b==null?c==null:Ib(b,c))){return false}}return true};_.hC=function Qz(){var a,b,c;b=1;a=new $z(this);while(a.c<a.e.Hb()){c=Yz(a);b=31*b+(c==null?0:Jb(c));b=~~b}return b};_.pb=function Sz(){return new $z(this)};_.Ob=function Tz(){return new eA(this,0)};_.Pb=function Uz(a){return new eA(this,a)};_.Qb=function Vz(a){throw new By('Remove not supported on this list')};sn(269,1,{},$z);_.tb=function _z(){return Xz(this)};_.ub=function aA(){return Yz(this)};_.vb=function bA(){Zz(this)};_.c=0;_.d=-1;_.e=null;sn(270,269,{},eA);_.b=null;sn(271,263,NB,hA);_.Eb=function iA(a){return Ty(this.b,a)};_.pb=function jA(){return gA(this)};_.Hb=function kA(){return this.c.b.e};_.b=null;_.c=null;sn(272,1,{},nA);_.tb=function oA(){return Xz(this.b.b)};_.ub=function pA(){return mA(this)};_.vb=function qA(){sz(this.b)};_.b=null;sn(273,268,PB,zA);_.Mb=function AA(a,b){(a<0||a>this.c)&&Rz(a,this.c);JA(this.b,a,0,b);++this.c};_.Db=function BA(a){return sA(this,a)};_.Eb=function CA(a){return vA(this,a,0)!=-1};_.Nb=function DA(a){return uA(this,a)};_.Fb=function EA(){return this.c==0};_.Qb=function FA(a){return wA(this,a)};_.Gb=function GA(a){return xA(this,a)};_.Hb=function HA(){return this.c};_.c=0;var KA;sn(275,268,PB,NA);_.Eb=function OA(a){return false};_.Nb=function PA(a){throw new Bx};_.Hb=function QA(){return 0};sn(276,260,{50:1,58:1},TA);sn(277,263,{50:1,60:1},YA);_.Db=function ZA(a){return VA(this,a)};_.Eb=function $A(a){return Ty(this.b,a)};_.Fb=function _A(){return this.b.e==0};_.pb=function aB(){return gA(My(this.b))};_.Gb=function bB(a){return XA(this,a)};_.Hb=function cB(){return this.b.e};_.tS=function dB(){return Ey(My(this.b))};_.b=null;sn(278,266,OB,fB);_.Jb=function gB(){return this.b};_.Kb=function hB(){return this.c};_.Lb=function iB(a){var b;b=this.c;this.c=a;return b};_.b=null;_.c=null;sn(279,17,uB,kB);var QB=Rb;
+var XB='',bC='\n',hC=' ',OD='    ',PD='    .    |',TD=' N-',ZB='(',gC=')',lE='+',uE=', ',UC='-',bE="-3'\n",YD='-C',kD='0',_C='0px',rD='1',ND="5'-",aC=':',WB=': ',UD='<\/EM>',ZD='<\/pre><h3>',VD='<\/u>',_D='<EM class=',XD='<EM class=selected>',RD='<font color=red>none<\/font>\n',WD='<u>',mE='=',aE='>',RB='@',cC='@@',gE='A',rE='AAAAAAAAAAAAA',xD='AUG',CD='Ala',LD='Arg',GD='Asn',ID='Asp',mC='BODY',iE='C',qE='CAAAG',pC='CENTER',oC='CSS1Compat',KD='Cys',hE='G',oE='GGGGG',pE='GUGCG',FD='Gln',JD='Glu',MD='Gly',ED='His',cE='INCORRECT',wD='Ile',qC='JUSTIFY',rC='LEFT',vD='Leu',HD='Lys',SC='Null widget handle. If you are creating a composite, ensure that initWidget() has been called.',dE='OK',uD='Phe',AD='Pro',sC='RIGHT',hD='Selected Base = ',zD='Ser',YB='String',TC='Style names cannot be empty',jE='T',nE='TATAA',BD='Thr',DD='Tyr',CE='UmbrellaException',dC='Unknown',yD='Val',sE='You did not make a single base substitution.',eC='[',LE='[Lcom.google.gwt.dom.client.',GE='[Lcom.google.gwt.user.client.ui.',xE='[Ljava.lang.',fC=']',nC='absolute',iD='align',_B='anonymous',dD='cellPadding',cD='cellSpacing',RC='className',tC='click',nD='clip',EE='com.google.gwt.animation.client.',wE='com.google.gwt.core.client.',HE='com.google.gwt.core.client.impl.',KE='com.google.gwt.dom.client.',JE='com.google.gwt.event.dom.client.',ME='com.google.gwt.event.logical.shared.',DE='com.google.gwt.event.shared.',AE='com.google.gwt.i18n.client.',NE='com.google.gwt.text.shared.testing.',OE='com.google.gwt.touch.client.',FE='com.google.gwt.user.client.',RE='com.google.gwt.user.client.impl.',zE='com.google.gwt.user.client.ui.',BE='com.google.web.bindery.event.shared.',HC='dblclick',EC='dir',jC='direction',lD='display',BC='div',lC='fixed',$B='function',kE='g',fE='genex-button',yE='genex.client.gx.',QE='genex.client.problems.',PE='genex.client.requirements.',eE='genex_container',NC='gesturechange',OC='gestureend',MC='gesturestart',QC='height',VB='hidden',vE='java.lang.',IE='java.util.',IC='keydown',JC='keypress',KC='keyup',VC='left',FC='ltr',$D='mature-',uC='mousedown',vC='mousemove',wC='mouseout',xC='mouseover',yC='mouseup',LC='mousewheel',tD='msie',mD='none',SD='none\n',SB='offsetHeight',TB='offsetWidth',sD='opera',UB='overflow',gD='popupContent',kC='position',$C='px',oD='px, ',aD='rect(0px, 0px, 0px, 0px)',pD='relative',iC='rtl',GC='safari',XC='table',YC='tbody',fD='td',WC='top',zC='touchcancel',AC='touchend',CC='touchmove',DC='touchstart',eD='tr',tE='value',jD='verticalAlign',ZC='visibility',bD='visible',PC='width',qD='zoom',QD='|';var _,rn={},DB={25:1,27:1},NB={60:1},yB={6:1,9:1,50:1,53:1,54:1},tB={50:1},pB={},IB={46:1},LB={52:1},PB={50:1,57:1},qB={2:1},FB={24:1,29:1,37:1,40:1,41:1,43:1,45:1},MB={58:1},JB={11:1,27:1},AB={29:1},uB={50:1,56:1},BB={47:1,50:1,56:1},xB={6:1,8:1,50:1,53:1,54:1},OB={59:1},wB={6:1,7:1,50:1,53:1,54:1},vB={5:1,6:1,50:1,53:1,54:1},EB={23:1,27:1},HB={44:1,50:1,53:1,54:1},rB={4:1,50:1},CB={27:1,36:1},sB={38:1},GB={24:1,29:1,37:1,40:1,41:1,42:1,43:1,45:1},KB={49:1},zB={10:1,50:1,53:1,54:1};sn(1,-1,pB);_.eQ=function s(a){return this===a};_.gC=function t(){return this.cZ};_.hC=function u(){return Ub(this)};_.tS=function v(){return this.cZ.d+RB+Dx(this.hC())};_.toString=function(){return this.tS()};_.tM=mB;sn(3,1,{});_.n=-1;_.o=null;_.p=false;_.q=false;_.r=null;_.s=-1;_.t=null;_.u=-1;_.v=false;sn(4,1,{},C);_.J=function D(a){B(this,a)};_.b=null;sn(5,1,{});sn(6,1,qB);sn(7,5,{});var H=null;sn(8,7,{},M);_.M=function N(){return true};_.K=function O(a,b){var c;c=new bb(this,a);sA(this.b,c);this.b.c==1&&U(this.c,16);return c};sn(10,1,sB);_.N=function Y(){this.c||xA(R,this);this.O()};_.c=false;_.d=0;var R;sn(9,10,sB,Z);_.O=function $(){L(this.b)};_.b=null;sn(11,6,{2:1,3:1},bb);_.L=function cb(){K(this.c,this)};_.b=null;_.c=null;sn(12,7,{},gb);_.M=function hb(){return !!($wnd.webkitRequestAnimationFrame&&$wnd.webkitCancelRequestAnimationFrame)};_.K=function ib(a,b){var c;c=fb(a,b);return new kb(c)};sn(13,6,qB,kb);_.L=function lb(){eb(this.b)};_.b=0;sn(14,1,{},ob);sn(19,1,uB);_.P=function vb(){return this.f};_.tS=function wb(){var a,b;a=this.cZ.d;b=this.P();return b!=null?a+WB+b:a};_.f=null;sn(18,19,uB);sn(17,18,uB,yb);sn(16,17,uB,Ab);_.P=function Gb(){this.d==null&&(this.e=Db(this.c),this.b=this.b+WB+Bb(this.c),this.d=ZB+this.e+') '+Fb(this.c)+this.b,undefined);return this.d};_.b=XB;_.c=null;_.d=null;_.e=null;sn(23,1,{});var Lb=0,Mb=0,Nb=0,Ob=-1;sn(25,23,{},ec);_.b=null;_.c=null;_.d=null;_.e=false;_.f=null;_.g=null;_.i=null;_.j=false;var Yb;sn(26,1,{},lc);_.Q=function mc(){this.b.e=true;ac(this.b);this.b.e=false;return this.b.j=bc(this.b)};_.b=null;sn(27,1,{},oc);_.Q=function pc(){this.b.e&&jc(this.b.f,1);return this.b.j};_.b=null;sn(30,1,{},xc);_.R=function yc(){var a={};var b=[];var c=arguments.callee.caller.caller;while(c){var d=this.S(c.toString());b.push(d);var e=aC+d;var f=a[e];if(f){var g,h;for(g=0,h=f.length;g<h;g++){if(f[g]===c){return b}}}(f||(a[e]=[])).push(c);c=c.caller}return b};_.S=function zc(a){return qc(a)};_.T=function Ac(a){return []};sn(32,30,{});_.R=function Ec(){return tc(this.T(wc()),this.U())};_.T=function Fc(a){return Dc(this,a)};_.U=function Gc(){return 2};sn(31,32,{});_.R=function Nc(){return Ic(this)};_.S=function Oc(a){var b,c,d,e;if(a.length==0){return _B}e=$x(a);e.indexOf('at ')==0&&(e=Yx(e,3));c=e.indexOf(eC);c!=-1&&(e=$x(e.substr(0,c-0))+$x(Yx(e,e.indexOf(fC,c)+1)));c=e.indexOf(ZB);if(c==-1){d=e;e=XB}else{b=e.indexOf(gC,c);d=e.substr(c+1,b-(c+1));e=$x(e.substr(0,c-0))}c=Sx(e,dy(46));c!=-1&&(e=Yx(e,c+1));return (e.length>0?e:_B)+cC+d};_.T=function Pc(a){return Lc(this,a)};_.U=function Qc(){return 3};sn(33,31,{},Sc);sn(34,1,{});sn(35,34,{},Xc);_.b=XB;sn(51,1,{50:1,53:1,54:1});_.eQ=function Cd(a){return this===a};_.hC=function Dd(){return Ub(this)};_.tS=function Ed(){return this.b};_.b=null;_.c=0;sn(50,51,vB);var Fd,Gd,Hd,Id,Jd;sn(52,50,vB,Nd);sn(53,50,vB,Pd);sn(54,50,vB,Rd);sn(55,50,vB,Td);sn(56,51,wB);var Vd,Wd,Xd,Yd,Zd;sn(57,56,wB,be);sn(58,56,wB,de);sn(59,56,wB,fe);sn(60,56,wB,he);sn(61,51,xB);var je,ke,le,me,ne;sn(62,61,xB,re);sn(63,61,xB,te);sn(64,61,xB,ve);sn(65,61,xB,xe);sn(66,51,yB);var ze,Ae,Be,Ce,De;sn(67,66,yB,He);sn(68,66,yB,Je);sn(69,66,yB,Le);sn(70,66,yB,Ne);sn(71,51,zB);var Pe,Qe,Re,Se,Te,Ue,Ve,We,Xe,Ye;sn(72,71,zB,af);sn(73,71,zB,cf);sn(74,71,zB,ef);sn(75,71,zB,gf);sn(76,71,zB,jf);sn(77,71,zB,lf);sn(78,71,zB,nf);sn(79,71,zB,pf);sn(80,71,zB,rf);sn(86,1,{});_.tS=function yf(){return 'An event type'};_.g=null;sn(85,86,{});_.X=function Af(){this.f=false;this.g=null};_.f=false;sn(84,85,{});_.W=function Ff(){return this.Y()};_.b=null;_.c=null;var Bf=null;sn(83,84,{});sn(82,83,{});sn(81,82,{},Kf);_.V=function Lf(a){Hi(a,11).Z(this)};_.Y=function Mf(){return If};var If;sn(89,1,{});_.hC=function Rf(){return this.d};_.tS=function Sf(){return 'Event type'};_.d=0;var Qf=0;sn(88,89,{},Tf);sn(87,88,{12:1},Uf);_.b=null;_.c=null;sn(90,82,{},Zf);_.V=function $f(a){Yf(this,Hi(a,13))};_.Y=function _f(){return Wf};var Wf;sn(91,82,{},eg);_.V=function fg(a){dg(this,Hi(a,14))};_.Y=function gg(){return bg};var bg;sn(92,82,{},kg);_.V=function lg(a){Hi(Hi(a,15),39)};_.Y=function mg(){return ig};var ig;sn(93,82,{},qg);_.V=function rg(a){Hi(Hi(a,16),39)};_.Y=function sg(){return og};var og;sn(94,82,{},xg);_.V=function yg(a){wg(this,Hi(a,17))};_.Y=function zg(){return ug};var ug;sn(95,1,{},Dg);_.b=null;sn(98,83,{});var Gg=null;sn(97,98,{},Jg);_.V=function Kg(a){co(Hi(Hi(a,18),34).b)};_.Y=function Lg(){return Hg};var Hg;sn(99,98,{},Pg);_.V=function Qg(a){co(Hi(Hi(a,19),33).b)};_.Y=function Rg(){return Ng};var Ng;sn(100,1,{},Tg);sn(101,98,{},Yg);_.V=function Zg(a){Xg(this,Hi(a,20))};_.Y=function $g(){return Vg};var Vg;sn(102,98,{},dh);_.V=function eh(a){ch(this,Hi(a,21))};_.Y=function fh(){return ah};var ah;sn(103,85,{},jh);_.V=function kh(a){ih(this,Hi(a,22))};_.W=function mh(){return hh};_.b=false;var hh=null;sn(104,85,{},ph);_.V=function qh(a){Hi(a,23).$(this)};_.W=function sh(){return oh};var oh=null;sn(105,85,{},vh);_.V=function wh(a){Hi(a,25)._(this)};_.W=function yh(){return uh};_.b=0;var uh=null;sn(106,85,{},Ch);_.V=function Dh(a){Bh(Hi(a,26))};_.W=function Fh(){return Ah};var Ah=null;sn(107,1,AB,Kh,Lh);_.ab=function Mh(a){Ih(this,a)};_.b=null;_.c=null;sn(110,1,{});sn(109,110,{});_.b=null;_.c=0;_.d=false;sn(108,109,{},_h);sn(111,1,{28:1},bi);_.b=null;sn(113,17,BB,ei);_.b=null;sn(112,113,BB,hi);sn(114,1,{27:1},ji);sn(116,51,{30:1,50:1,53:1,54:1},si);var ni,oi,pi,qi;sn(117,1,{},ui);_.qI=0;var Ai,Bi;sn(126,1,{});sn(127,1,{},yn);var xn=null;sn(128,126,{},Bn);var An=null;sn(129,1,{},Fn);sn(130,1,{},Kn);_.b=0;_.c=0;_.d=null;_.e=null;_.f=null;sn(131,1,{32:1},Pn,Qn);_.eQ=function Rn(a){var b;if(!Ji(a,32)){return false}b=Hi(a,32);return this.b==b.b&&this.c==b.c};_.hC=function Sn(){return Ni(this.b)^Ni(this.c)};_.tS=function Tn(){return 'Point('+this.b+','+this.c+gC};_.b=0;_.c=0;sn(132,1,{},mo);_.b=null;_.c=null;_.d=false;_.g=null;_.i=null;_.o=null;_.p=null;_.q=null;_.s=false;_.t=null;var Vn=null;sn(133,1,{22:1,27:1},oo);_.b=null;sn(134,1,{21:1,27:1},qo);_.b=null;sn(135,1,{20:1,27:1},so);_.b=null;sn(136,1,{19:1,27:1,33:1},uo);_.b=null;sn(137,1,{18:1,27:1,34:1},wo);_.b=null;sn(138,1,CB,yo);_.bb=function zo(a){var b;if(1==Ip(a.e.type)){b=new Pn(a.e.clientX||0,a.e.clientY||0);if(_n(this.b,b)||ao(this.b,b)){a.b=true;a.e.stopPropagation();a.e.preventDefault()}}};_.b=null;sn(139,1,{},Co);_.Q=function Do(){var a,b,c,d,e,f,g;if(this!=this.f.i){Bo(this);return false}a=nb(this.b);In(this.e,a-this.d);this.d=a;Hn(this.e,a);e=En(this.e);e||Bo(this);ko(this.f,this.e.e);d=Ni(this.e.e.b);c=Vt(this.f.t);b=Tt(this.f.t);f=Ut(this.f.t);g=Ni(this.e.e.c);if((f<=g||0>=g)&&(b<=d||c>=d)){Bo(this);return false}return e};_.d=0;_.e=null;_.f=null;_.g=null;sn(140,1,DB,Fo);_._=function Go(a){Bo(this.b)};_.b=null;sn(141,1,{},Io);_.Q=function Jo(){var a,b,c;a=pb();b=new $z(this.b.r);while(b.c<b.e.Hb()){c=Hi(Yz(b),35);a-c.c>=2500&&Zz(b)}return this.b.r.c!=0};_.b=null;sn(142,1,{35:1},Mo,No);_.b=null;_.c=0;var Oo=null,Po=null;var Xo=null;sn(147,85,{},cp);_.V=function dp(a){Hi(a,36).bb(this);_o.d=false};_.W=function fp(){return $o};_.X=function gp(){ap(this)};_.b=false;_.c=false;_.d=false;_.e=null;var $o=null,_o=null;var hp=null;sn(149,1,EB,lp);_.$=function mp(a){while((S(),R).c>0){T(Hi(uA(R,0),38))}};var np=false,op=null,pp=0,qp=0,rp=false;sn(151,85,{},Cp);_.V=function Dp(a){Oi(a);null.Rb()};_.W=function Ep(){return Ap};var Ap;sn(152,107,AB,Gp);var Hp=false;var Mp=null,Np=null,Op=null,Pp=null,Qp=null,Rp=null;sn(155,1,AB);_.db=function _p(a){return decodeURI(a.replace('%23','#'))};_.ab=function aq(a){Ih(this.b,a)};_.eb=function bq(a){a=a==null?XB:a;if(!Qx(a,Zp==null?XB:Zp)){Zp=a;Eh(this)}};var Zp=XB;sn(157,155,AB);sn(156,157,AB,gq);sn(163,1,{40:1,43:1});_.fb=function tq(){return this.I};_.gb=function uq(a){Vo(this.I,QC,a)};_.hb=function xq(a){Vo(this.I,PC,a)};_.tS=function yq(){if(!this.I){return '(null handle)'}return this.I.outerHTML};_.I=null;sn(162,163,FB);_.ib=function Iq(){};_.jb=function Jq(){};_.ab=function Kq(a){Cq(this,a)};_.kb=function Lq(){Dq(this)};_.cb=function Mq(a){Eq(this,a)};_.lb=function Nq(){Fq(this)};_.mb=function Oq(){};_.nb=function Pq(){};_.E=false;_.F=0;_.G=null;_.H=null;sn(161,162,FB);_.ib=function Rq(){fr(this,(dr(),br))};_.jb=function Sq(){fr(this,(dr(),cr))};sn(160,161,FB);_.pb=function Wq(){return new Wu(this.g)};_.ob=function Xq(a){return Uq(this,a)};sn(159,160,FB);_.ob=function _q(a){return Zq(this,a)};sn(164,112,BB,er);var br,cr;sn(165,1,{},hr);_.qb=function ir(a){a.kb()};sn(166,1,{},kr);_.qb=function lr(a){a.lb()};sn(169,162,FB);_.kb=function pr(){var a;Dq(this);a=nd(this.I);-1==a&&(this.I.tabIndex=0,undefined)};sn(168,169,FB);sn(167,168,FB,rr);sn(170,160,FB);_.e=null;_.f=null;sn(173,161,FB);_.rb=function Br(){return this.I};_.pb=function Cr(){return new fu(this)};_.ob=function Dr(a){return xr(this,a)};_.D=null;sn(172,173,FB);_.rb=function Nr(){return gd(this.I)};_.fb=function Or(){return hd(gd(this.I))};_.sb=function Pr(){Gr(this)};_.bb=function Qr(a){a.d&&(a.e,false)&&(a.b=true)};_.nb=function Rr(){this.B&&nt(this.A,false,true)};_.gb=function Sr(a){this.p=a;Hr(this);a.length==0&&(this.p=null)};_.hb=function Tr(a){this.q=a;Hr(this);a.length==0&&(this.q=null)};_.n=false;_.o=false;_.p=null;_.q=null;_.r=null;_.t=null;_.u=false;_.v=false;_.w=-1;_.x=false;_.y=null;_.z=false;_.B=false;_.C=-1;sn(171,172,FB);_.ib=function Vr(){Dq(this.k)};_.jb=function Wr(){Fq(this.k)};_.pb=function Xr(){return new fu(this.k)};_.ob=function Yr(a){return xr(this.k,a)};_.k=null;sn(174,173,FB,_r);_.rb=function bs(){return this.b};_.b=null;_.c=null;sn(175,171,FB,ls);_.ib=function ns(){try{Dq(this.k)}finally{Dq(this.b)}};_.jb=function os(){try{Fq(this.k)}finally{Fq(this.b)}};_.sb=function ps(){gs(this)};_.cb=function qs(a){switch(Ip(a.type)){case 4:case 8:case 64:case 16:case 32:if(!this.g&&!hs(this,a)){return}}Eq(this,a)};_.bb=function rs(a){var b;b=a.e;!a.b&&Ip(a.e.type)==4&&hs(this,b)&&(b.preventDefault(),undefined);a.d&&(a.e,false)&&(a.b=true)};_.b=null;_.c=0;_.d=0;_.e=0;_.f=0;_.g=false;_.i=null;_.j=0;sn(176,1,DB,ts);_._=function us(a){this.b.j=a.b};_.b=null;sn(180,162,FB);_.b=null;sn(179,180,FB,Cs);sn(178,179,FB,Es,Fs);sn(177,178,FB,Gs);sn(181,1,{13:1,14:1,15:1,16:1,17:1,27:1,39:1},Is);_.b=null;sn(182,1,{},Ls);_.b=null;_.c=null;_.d=null;var Ms,Ns,Os;sn(183,1,{});sn(184,183,{},Ss);_.b=null;var Ts;sn(185,1,{},Ws);_.b=null;sn(186,170,FB,Zs);_.ob=function $s(a){var b,c;c=hd(a.I);b=Uq(this,a);b&&Zc(this.c,c);return b};_.c=null;sn(187,1,DB,bt);_._=function ct(a){at()};sn(188,1,CB,et);_.bb=function ft(a){Ir(this.b,a)};_.b=null;sn(189,1,{26:1,27:1},ht);_.b=null;sn(190,3,{},ot);_.b=null;_.c=false;_.d=false;_.e=0;_.f=-1;_.g=null;_.i=null;_.j=false;sn(191,10,sB,qt);_.O=function rt(){this.b.i=null;x(this.b,pb())};_.b=null;sn(193,159,GB,At);var wt,xt,yt;sn(194,1,{},Ft);_.qb=function Gt(a){a.E&&a.lb()};sn(195,1,EB,It);_.$=function Jt(a){Ct()};sn(196,193,GB,Lt);sn(197,1,{},Rt);var Nt=null;sn(198,173,FB,Zt);_.rb=function $t(){return this.b};_.kb=function _t(){Dq(this);this.c.__listener=this};_.lb=function au(){this.c.__listener=null;Fq(this)};_.gb=function bu(a){Vo(this.I,QC,a)};_.hb=function cu(a){Vo(this.I,PC,a)};_.b=null;_.c=null;_.d=null;sn(199,1,{},fu);_.tb=function gu(){return this.b};_.ub=function hu(){return eu(this)};_.vb=function iu(){!!this.c&&this.d.ob(this.c)};_.c=null;_.d=null;sn(202,169,FB);_.cb=function nu(a){var b;b=Ip(a.type);(b&896)!=0?Eq(this,a):Eq(this,a)};_.mb=function ou(){};sn(201,202,FB);sn(200,201,FB,qu);sn(203,51,HB);var tu,uu,vu,wu,xu;sn(204,203,HB,Bu);sn(205,203,HB,Du);sn(206,203,HB,Fu);sn(207,203,HB,Hu);sn(208,170,FB,Ku);_.ob=function Lu(a){var b,c;c=hd(a.I);b=Uq(this,a);b&&Zc(this.e,hd(c));return b};sn(209,1,{},Su);_.pb=function Tu(){return new Wu(this)};_.b=null;_.c=null;_.d=0;sn(210,1,{},Wu);_.tb=function Xu(){return this.b<this.c.d-1};_.ub=function Yu(){return Vu(this)};_.vb=function Zu(){if(this.b<0||this.b>=this.c.d){throw new yx}this.c.c.ob(this.c.b[this.b--])};_.b=-1;_.c=null;sn(214,1,{},cv);_.b=null;_.c=null;_.d=null;sn(215,1,IB,ev);_.wb=function fv(){Sh(this.b,this.d,this.c)};_.b=null;_.c=null;_.d=null;sn(216,1,IB,hv);_.wb=function iv(){Uh(this.b,this.d,this.c)};_.b=null;_.c=null;_.d=null;sn(218,1,{},mv);_.b=0;sn(219,1,{},ov);_.b=0;_.c=0;_.d=0;sn(220,1,{},Ev);_.b=null;_.c=null;_.d=null;_.e=null;_.f=null;_.g=0;_.i=0;_.j=0;_.k=null;_.n=null;_.o=null;_.p=0;_.q=0;_.r=null;_.s=null;_.t=null;_.u=0;sn(221,1,{},Pv);_.xb=function Qv(a){var b,c;if(a==39){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1);b=Lv(this,this.b,this.e);Ov(this,b,this.e);this.c=b.c.c.length;b.c.g+1;Gv(this)}if(a==37){--this.e;this.e<0&&(this.e=0);b=Lv(this,this.b,this.e);Ov(this,b,this.e);this.c=b.c.c.length;b.c.g+1;Gv(this)}if(a==8||a==46){this.B=this.f;c=new uy(this.b);qy(c,this.e);this.b=c.b.b;this.e>=0&&--this.e;b=Lv(this,this.b,this.e);Ov(this,b,this.e);this.f=yv(b.c);this.c=b.c.c.length;Gv(this)}};_.yb=function Rv(a,b){var c,d;if(Qx(a,gE)||Qx(a,hE)||Qx(a,iE)||Qx(a,jE)){this.B=this.f;d=new uy(this.b);ry(d,this.e,a);this.b=d.b.b;++this.e;c=Lv(this,this.b,this.e);Ov(this,c,this.e);this.f=yv(c.c);this.c=c.c.c.length;c.c.g+1;Gv(this)}if(Qx(a,'a')||Qx(a,kE)||Qx(a,'c')||Qx(a,'t')){this.B=this.f;d=new uy(this.b);sy(d,this.e,this.e+1,a.toUpperCase());this.b=d.b.b;c=Lv(this,this.b,this.e);Ov(this,c,this.e);this.f=yv(c.c);this.c=c.c.c.length;c.c.g+1;Gv(this)}if(Qx(a,lE)||Qx(a,UC)||Qx(a,mE)||Qx(a,'_')){if(Qx(a,lE)||Qx(a,mE)){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1)}else{--this.e;this.e<0&&(this.e=0)}c=Lv(this,this.b,this.e);Ov(this,c,this.e);this.c=c.c.c.length;c.c.g+1;Gv(this)}if(b==39){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1);c=Lv(this,this.b,this.e);Ov(this,c,this.e);this.c=c.c.c.length;c.c.g+1;Gv(this)}if(b==37){--this.e;this.e<0&&(this.e=0);c=Lv(this,this.b,this.e);Ov(this,c,this.e);this.c=c.c.c.length;c.c.g+1;Gv(this)}};_.zb=function Sv(a){var b;if(a>=0&&a<=this.c){b=Lv(this,this.b,a);Ov(this,b,a);this.c=b.c.c.length;this.e=a;Gv(this)}};_.Ab=function Uv(a){var b;a!=null&&lw(this.z,a);this.z.f=nE;this.z.i=oE;this.z.d=pE;this.z.c=qE;this.z.e=rE;this.g=this.z.b;this.b=this.z.b;this.c=this.b.length;this.D=this.z.f;this.E=this.z.g;this.H=this.z.i;this.v=this.z.d;this.u=this.z.c;this.A=this.z.e;(Qx(this.v,mD)||Qx(this.u,mD))&&(this.A=XB);b=Lv(this,this.g,-1);this.i=b.c.f;this.j=b.c.r;this.c=b.c.c.length;this.f=yv(b.c);Ds(this.s,b.b.c+'<\/pre><\/body><\/html>')};_.Bb=function Wv(a){var b,c,d,e,f;this.C=new Cw;if(a==1){b=new $w;b.c=sE;Aw(this.C,b);d=new Xw;d.c='Your change does not make the mature mRNA shorter.';Aw(this.C,d)}else if(a==2){b=new $w;b.c=sE;Aw(this.C,b);d=new Iw;d.c='Your change does not make the protein longer.';Aw(this.C,d)}else if(a==3){b=new $w;b.c=sE;Aw(this.C,b);d=new Uw;d.c='Your change does not make the protein shorter.';Aw(this.C,d)}else if(a==4){b=new $w;b.c=sE;Aw(this.C,b);d=new Ow;d.c='Your change does not prevent mRNA from being made.';Aw(this.C,d);f=new Lw;f.c='Your change does not prevent protein from being made';Aw(this.C,f)}else if(a==5){c=new Rw;c.b=15;c.c='Your protein does not have 5 amino acids.';Aw(this.C,c);e=new Fw;e.b=1;e.c='Your gene does not contain one intron.';Aw(this.C,e)}};_.b=null;_.c=0;_.d=null;_.e=0;_.f=XB;_.g=null;_.i=XB;_.j=XB;_.k=null;_.n=null;_.o=false;_.p=null;_.q=null;_.r=null;_.s=null;_.t=null;_.u=null;_.v=null;_.w=null;_.x=null;_.y=null;_.A=null;_.B=XB;_.C=null;_.D=null;_.E=0;_.F=null;_.G=null;_.H=null;_.I=null;sn(222,1,JB,Zv);_.Z=function $v(a){gs(this.b.k);this.b.p.I[tE]=XB};_.b=null;sn(223,1,{},aw);_.b=null;sn(224,1,JB,cw);_.Z=function dw(a){var b,c;this.b.B=this.b.f;c=bd(this.b.p.I,tE);c=c.toUpperCase();c=Wx(c,'[^AGCT]',XB);this.b.b=c;this.b.e=-1;b=Lv(this.b,this.b.b,-1);Ov(this.b,b,-1);this.b.f=yv(b.c);this.b.c=b.c.c.length;gs(this.b.k);Gv(this.b)};_.b=null;sn(225,1,JB,fw);_.Z=function gw(a){var b;this.b.b=this.b.g;b=Lv(this.b,this.b.b,-1);Ov(this.b,b,-1);this.b.f=yv(b.c);this.b.c=b.c.c.length;Gv(this.b)};_.b=null;sn(226,1,JB,iw);_.Z=function jw(a){Er(this.b.k)};_.b=null;sn(227,1,{},mw);_.b=null;_.c=null;_.d=null;_.e=null;_.f=null;_.g=0;_.i=null;sn(228,1,{},ow);_.b=null;_.c=null;sn(229,1,{48:1},sw);_.b=0;_.c=0;_.d=false;_.e=false;_.f=0;_.g=0;_.i=false;sn(230,1,{},uw);_.b=null;_.c=null;sn(231,1,{},xw);_.tS=function yw(){return ww(this)};_.b=null;_.c=0;_.d=null;_.e=null;_.f=0;_.g=null;_.i=null;_.j=null;sn(232,1,{},Cw);_.b=null;sn(234,1,KB);_.c='unassigned';sn(233,234,KB,Fw);_.Cb=function Gw(a){return a.c==this.b+1};_.b=0;sn(235,234,KB,Iw);_.Cb=function Jw(a){return a.d.length>a.j.length};sn(236,234,KB,Lw);_.Cb=function Mw(a){return Qx(a.d,XB)};sn(237,234,KB,Ow);_.Cb=function Pw(a){return Qx(a.e,XB)};sn(238,234,KB,Rw);_.Cb=function Sw(a){return a.d.length==this.b};_.b=0;sn(239,234,KB,Uw);_.Cb=function Vw(a){return a.d.length<a.j.length};sn(240,234,KB,Xw);_.Cb=function Yw(a){return a.e.length<a.i.length};sn(241,234,KB,$w);_.Cb=function _w(a){var b,c,d,e;e=a.g;b=a.b;if(e.length!=b.length)return false;d=0;for(c=0;c<e.length;++c){e.charCodeAt(c)!=b.charCodeAt(c)&&++d}if(d==1)return true;return false};sn(242,17,uB,bx);sn(243,1,{50:1,51:1,53:1},gx);_.eQ=function hx(a){return Ji(a,51)&&Hi(a,51).b==this.b};_.hC=function ix(){return this.b?1231:1237};_.tS=function jx(){return this.b?'true':'false'};_.b=false;var dx,ex;sn(244,1,{},lx);_.tS=function sx(){return ((this.b&2)!=0?'interface ':(this.b&1)!=0?XB:'class ')+this.d};_.b=0;_.c=0;_.d=null;sn(245,17,uB,ux);sn(246,17,uB,wx);sn(247,17,uB,yx,zx);sn(248,17,uB,Bx,Cx);sn(252,17,uB,Hx,Ix);var Jx;sn(254,1,{50:1,55:1},Mx);_.tS=function Nx(){return this.b+'.'+this.e+ZB+(this.c!=null?this.c:'Unknown Source')+(this.d>=0?aC+this.d:XB)+gC};_.b=null;_.c=null;_.d=0;_.e=null;_=String.prototype;_.cM={1:1,50:1,52:1,53:1};_.eQ=function cy(a){return Qx(this,a)};_.hC=function ey(){return ly(this)};_.tS=_.toString;var gy,hy=0,iy;sn(256,1,LB,ty,uy);_.tS=function vy(){return this.b.b};sn(257,1,LB,yy);_.tS=function zy(){return this.b.b};sn(258,17,uB,By);sn(259,1,{});_.Db=function Fy(a){throw new By('Add not supported on this collection')};_.Eb=function Gy(a){var b;b=Dy(this.pb(),a);return !!b};_.Fb=function Hy(){return this.Hb()==0};_.Gb=function Iy(a){var b;b=Dy(this.pb(),a);if(b){b.vb();return true}else{return false}};_.tS=function Jy(){return Ey(this)};sn(261,1,MB);_.eQ=function Ny(a){var b,c,d,e,f;if(a===this){return true}if(!Ji(a,58)){return false}e=Hi(a,58);if(this.e!=e.e){return false}for(c=new tz((new lz(e)).b);Xz(c.b);){b=c.c=Hi(Yz(c.b),59);d=b.Jb();f=b.Kb();if(!(d==null?this.d:Ji(d,1)?aC+Hi(d,1) in this.f:Xy(this,d,~~Jb(d)))){return false}if(!lB(f,d==null?this.c:Ji(d,1)?Wy(this,Hi(d,1)):Vy(this,d,~~Jb(d)))){return false}}return true};_.hC=function Oy(){var a,b,c;c=0;for(b=new tz((new lz(this)).b);Xz(b.b);){a=b.c=Hi(Yz(b.b),59);c+=a.hC();c=~~c}return c};_.tS=function Py(){var a,b,c,d;d='{';a=false;for(c=new tz((new lz(this)).b);Xz(c.b);){b=c.c=Hi(Yz(c.b),59);a?(d+=uE):(a=true);d+=XB+b.Jb();d+=mE;d+=XB+b.Kb()}return d+'}'};sn(260,261,MB);_.Ib=function fz(a,b){return Mi(a)===Mi(b)||a!=null&&Ib(a,b)};_.b=null;_.c=null;_.d=false;_.e=0;_.f=null;sn(263,259,NB);_.eQ=function iz(a){var b,c,d;if(a===this){return true}if(!Ji(a,60)){return false}c=Hi(a,60);if(c.Hb()!=this.Hb()){return false}for(b=c.pb();b.tb();){d=b.ub();if(!this.Eb(d)){return false}}return true};_.hC=function jz(){var a,b,c;a=0;for(b=this.pb();b.tb();){c=b.ub();if(c!=null){a+=Jb(c);a=~~a}}return a};sn(262,263,NB,lz);_.Eb=function mz(a){return kz(this,a)};_.pb=function nz(){return new tz(this.b)};_.Gb=function oz(a){var b;if(kz(this,a)){b=Hi(a,59).Jb();bz(this.b,b);return true}return false};_.Hb=function pz(){return this.b.e};_.b=null;sn(264,1,{},tz);_.tb=function uz(){return Xz(this.b)};_.ub=function vz(){return rz(this)};_.vb=function wz(){sz(this)};_.b=null;_.c=null;_.d=null;sn(266,1,OB);_.eQ=function zz(a){var b;if(Ji(a,59)){b=Hi(a,59);if(lB(this.Jb(),b.Jb())&&lB(this.Kb(),b.Kb())){return true}}return false};_.hC=function Az(){var a,b;a=0;b=0;this.Jb()!=null&&(a=Jb(this.Jb()));this.Kb()!=null&&(b=Jb(this.Kb()));return a^b};_.tS=function Bz(){return this.Jb()+mE+this.Kb()};sn(265,266,OB,Cz);_.Jb=function Dz(){return null};_.Kb=function Ez(){return this.b.c};_.Lb=function Fz(a){return _y(this.b,a)};_.b=null;sn(267,266,OB,Hz);_.Jb=function Iz(){return this.b};_.Kb=function Jz(){return Wy(this.c,this.b)};_.Lb=function Kz(a){return az(this.c,this.b,a)};_.b=null;_.c=null;sn(268,259,{57:1});_.Mb=function Mz(a,b){throw new By('Add not supported on this list')};_.Db=function Nz(a){this.Mb(this.Hb(),a);return true};_.eQ=function Pz(a){var b,c,d,e,f;if(a===this){return true}if(!Ji(a,57)){return false}f=Hi(a,57);if(this.Hb()!=f.Hb()){return false}d=new $z(this);e=f.pb();while(d.c<d.e.Hb()){b=Yz(d);c=Yz(e);if(!(b==null?c==null:Ib(b,c))){return false}}return true};_.hC=function Qz(){var a,b,c;b=1;a=new $z(this);while(a.c<a.e.Hb()){c=Yz(a);b=31*b+(c==null?0:Jb(c));b=~~b}return b};_.pb=function Sz(){return new $z(this)};_.Ob=function Tz(){return new eA(this,0)};_.Pb=function Uz(a){return new eA(this,a)};_.Qb=function Vz(a){throw new By('Remove not supported on this list')};sn(269,1,{},$z);_.tb=function _z(){return Xz(this)};_.ub=function aA(){return Yz(this)};_.vb=function bA(){Zz(this)};_.c=0;_.d=-1;_.e=null;sn(270,269,{},eA);_.b=null;sn(271,263,NB,hA);_.Eb=function iA(a){return Ty(this.b,a)};_.pb=function jA(){return gA(this)};_.Hb=function kA(){return this.c.b.e};_.b=null;_.c=null;sn(272,1,{},nA);_.tb=function oA(){return Xz(this.b.b)};_.ub=function pA(){return mA(this)};_.vb=function qA(){sz(this.b)};_.b=null;sn(273,268,PB,zA);_.Mb=function AA(a,b){(a<0||a>this.c)&&Rz(a,this.c);JA(this.b,a,0,b);++this.c};_.Db=function BA(a){return sA(this,a)};_.Eb=function CA(a){return vA(this,a,0)!=-1};_.Nb=function DA(a){return uA(this,a)};_.Fb=function EA(){return this.c==0};_.Qb=function FA(a){return wA(this,a)};_.Gb=function GA(a){return xA(this,a)};_.Hb=function HA(){return this.c};_.c=0;var KA;sn(275,268,PB,NA);_.Eb=function OA(a){return false};_.Nb=function PA(a){throw new Bx};_.Hb=function QA(){return 0};sn(276,260,{50:1,58:1},TA);sn(277,263,{50:1,60:1},YA);_.Db=function ZA(a){return VA(this,a)};_.Eb=function $A(a){return Ty(this.b,a)};_.Fb=function _A(){return this.b.e==0};_.pb=function aB(){return gA(My(this.b))};_.Gb=function bB(a){return XA(this,a)};_.Hb=function cB(){return this.b.e};_.tS=function dB(){return Ey(My(this.b))};_.b=null;sn(278,266,OB,fB);_.Jb=function gB(){return this.b};_.Kb=function hB(){return this.c};_.Lb=function iB(a){var b;b=this.c;this.c=a;return b};_.b=null;_.c=null;sn(279,17,uB,kB);var QB=Rb;
 --></script>
 <script><!--
 var Am=nx(vE,'Object',1),_i=nx(wE,'JavaScriptObject$',20),ln=mx(xE,'Object;',284),Gm=nx(vE,'Throwable',19),vm=nx(vE,'Exception',18),Bm=nx(vE,'RuntimeException',17),Cm=nx(vE,'StackTraceElement',254),mn=mx(xE,'StackTraceElement;',286),pk=nx('com.google.gwt.lang.','SeedUtil',123),um=nx(vE,'Enum',51),am=nx(yE,'GenexGWT',221),Yl=nx(yE,'GenexGWT$1',222),Zl=nx(yE,'GenexGWT$2',224),$l=nx(yE,'GenexGWT$3',225),_l=nx(yE,'GenexGWT$4',226),Xl=nx(yE,'GenexGWT$1DeferredCommand',223),aj=nx(wE,'Scheduler',23),rm=nx(vE,'Boolean',243),an=mx(XB,'[C',287),tm=nx(vE,'Class',244),Fm=nx(vE,YB,2),nn=mx(xE,'String;',285),sm=nx(vE,'ClassCastException',245),Em=nx(vE,'StringBuilder',257),qm=nx(vE,'ArrayStoreException',242),$i=nx(wE,'JavaScriptException',16),Bl=nx(zE,'UIObject',163),Ll=nx(zE,'Widget',162),il=nx(zE,'LabelBase',180),jl=nx(zE,'Label',179),dl=nx(zE,'HTML',178),el=nx(zE,'HasHorizontalAlignment$AutoHorizontalAlignmentConstant',183),fl=nx(zE,'HasHorizontalAlignment$HorizontalAlignmentConstant',184),ok=ox(AE,'HasDirection$Direction',116,ti),hn=mx('[Lcom.google.gwt.i18n.client.','HasDirection$Direction;',288),kl=nx(zE,'Panel',161),yl=nx(zE,'SimplePanel',173),wl=nx(zE,'ScrollPanel',198),xl=nx(zE,'SimplePanel$1',199),Wk=nx(zE,'ComplexPanel',160),Pk=nx(zE,'AbsolutePanel',159),Tl=nx(BE,CE,113),mk=nx(DE,CE,112),Sk=nx(zE,'AttachDetachException',164),Qk=nx(zE,'AttachDetachException$1',165),Rk=nx(zE,'AttachDetachException$2',166),ul=nx(zE,'RootPanel',193),tl=nx(zE,'RootPanel$DefaultRootPanel',196),rl=nx(zE,'RootPanel$1',194),sl=nx(zE,'RootPanel$2',195),ql=nx(zE,'PopupPanel',172),Xk=nx(zE,'DecoratedPopupPanel',171),al=nx(zE,'DialogBox',175),$k=nx(zE,'DialogBox$CaptionImpl',177),_k=nx(zE,'DialogBox$MouseHandler',181),Zk=nx(zE,'DialogBox$1',176),Yi=nx(EE,'Animation',3),pl=nx(zE,'PopupPanel$ResizeAnimation',190),Jk=nx(FE,'Timer',10),ol=nx(zE,'PopupPanel$ResizeAnimation$1',191),ll=nx(zE,'PopupPanel$1',187),ml=nx(zE,'PopupPanel$3',188),nl=nx(zE,'PopupPanel$4',189),Pi=nx(EE,'Animation$1',4),Xi=nx(EE,'AnimationScheduler',5),Qi=nx(EE,'AnimationScheduler$AnimationHandle',6),Ik=nx(FE,'Timer$1',149),Ol=nx(BE,'Event',86),ik=nx(DE,'GwtEvent',85),Hk=nx(FE,'Event$NativePreviewEvent',147),Ml=nx(BE,'Event$Type',89),hk=nx(DE,'GwtEvent$Type',88),Vk=nx(zE,'CellPanel',170),Il=nx(zE,'VerticalPanel',208),gl=nx(zE,'HasVerticalAlignment$VerticalAlignmentConstant',185),cl=nx(zE,'FocusWidget',169),Hl=nx(zE,'ValueBoxBase',202),zl=nx(zE,'TextBoxBase',201),Al=nx(zE,'TextBox',200),Gl=ox(zE,'ValueBoxBase$TextAlignment',203,zu),jn=mx(GE,'ValueBoxBase$TextAlignment;',289),Cl=ox(zE,'ValueBoxBase$TextAlignment$1',204,null),Dl=ox(zE,'ValueBoxBase$TextAlignment$2',205,null),El=ox(zE,'ValueBoxBase$TextAlignment$3',206,null),Fl=ox(zE,'ValueBoxBase$TextAlignment$4',207,null),nk=nx(AE,'AutoDirectionHandler',114),Tk=nx(zE,'ButtonBase',168),Uk=nx(zE,'Button',167),hl=nx(zE,'HorizontalPanel',186),jj=nx(HE,'StringBufferImpl',34),bm=nx(yE,'GenexParams',227),Um=nx(IE,'AbstractMap',261),Nm=nx(IE,'AbstractHashMap',260),Ym=nx(IE,'HashMap',276),Im=nx(IE,'AbstractCollection',259),Vm=nx(IE,'AbstractSet',263),Km=nx(IE,'AbstractHashMap$EntrySet',262),Jm=nx(IE,'AbstractHashMap$EntrySetIterator',264),Tm=nx(IE,'AbstractMapEntry',266),Lm=nx(IE,'AbstractHashMap$MapEntryNull',265),Mm=nx(IE,'AbstractHashMap$MapEntryString',267),Sm=nx(IE,'AbstractMap$1',271),Rm=nx(IE,'AbstractMap$1$1',272),Zm=nx(IE,'HashSet',277),Qj=nx(JE,'DomEvent',84),Rj=nx(JE,'HumanInputEvent',83),Tj=nx(JE,'MouseEvent',82),Oj=nx(JE,'ClickEvent',81),Pj=nx(JE,'DomEvent$Type',87),Yk=nx(zE,'DecoratorPanel',174),dj=nx(HE,'SchedulerImpl',25),bj=nx(HE,'SchedulerImpl$Flusher',26),cj=nx(HE,'SchedulerImpl$Rescuer',27),hj=nx(HE,'StackTraceCreator$Collector',30),gj=nx(HE,'StackTraceCreator$CollectorMoz',32),fj=nx(HE,'StackTraceCreator$CollectorChrome',31),ej=nx(HE,'StackTraceCreator$CollectorChromeNoSourceMap',33),ij=nx(HE,'StringBufferImplAppend',35),Zi=nx(wE,'Duration',14),Nj=ox(KE,'Style$Unit',71,$e),gn=mx(LE,'Style$Unit;',290),oj=ox(KE,'Style$Display',50,Ld),cn=mx(LE,'Style$Display;',291),tj=ox(KE,'Style$Overflow',56,_d),dn=mx(LE,'Style$Overflow;',292),yj=ox(KE,'Style$Position',61,pe),en=mx(LE,'Style$Position;',293),Dj=ox(KE,'Style$TextAlign',66,Fe),fn=mx(LE,'Style$TextAlign;',294),Ej=ox(KE,'Style$Unit$1',72,null),Fj=ox(KE,'Style$Unit$2',73,null),Gj=ox(KE,'Style$Unit$3',74,null),Hj=ox(KE,'Style$Unit$4',75,null),Ij=ox(KE,'Style$Unit$5',76,null),Jj=ox(KE,'Style$Unit$6',77,null),Kj=ox(KE,'Style$Unit$7',78,null),Lj=ox(KE,'Style$Unit$8',79,null),Mj=ox(KE,'Style$Unit$9',80,null),kj=ox(KE,'Style$Display$1',52,null),lj=ox(KE,'Style$Display$2',53,null),mj=ox(KE,'Style$Display$3',54,null),nj=ox(KE,'Style$Display$4',55,null),pj=ox(KE,'Style$Overflow$1',57,null),qj=ox(KE,'Style$Overflow$2',58,null),rj=ox(KE,'Style$Overflow$3',59,null),sj=ox(KE,'Style$Overflow$4',60,null),uj=ox(KE,'Style$Position$1',62,null),vj=ox(KE,'Style$Position$2',63,null),wj=ox(KE,'Style$Position$3',64,null),xj=ox(KE,'Style$Position$4',65,null),zj=ox(KE,'Style$TextAlign$1',67,null),Aj=ox(KE,'Style$TextAlign$2',68,null),Bj=ox(KE,'Style$TextAlign$3',69,null),Cj=ox(KE,'Style$TextAlign$4',70,null),bl=nx(zE,'DirectionalTextHelper',182),Hm=nx(vE,'UnsupportedOperationException',258),xm=nx(vE,'IllegalStateException',247),Kk=nx(FE,'Window$ClosingEvent',151),kk=nx(DE,'HandlerManager',107),Lk=nx(FE,'Window$WindowHandlers',152),Nl=nx(BE,'EventBus',110),Sl=nx(BE,'SimpleEventBus',109),jk=nx(DE,'HandlerManager$Bus',108),Pl=nx(BE,'SimpleEventBus$1',214),Ql=nx(BE,'SimpleEventBus$2',215),Rl=nx(BE,'SimpleEventBus$3',216),Kl=nx(zE,'WidgetCollection',209),kn=mx(GE,'Widget;',295),Jl=nx(zE,'WidgetCollection$WidgetIterator',210),zm=nx(vE,'NullPointerException',252),wm=nx(vE,'IllegalArgumentException',246),vl=nx(zE,'ScrollImpl',197),Dm=nx(vE,'StringBuffer',256),ek=nx(ME,'CloseEvent',104),dk=nx(ME,'AttachEvent',103),Sj=nx(JE,'MouseDownEvent',90),Xj=nx(JE,'MouseUpEvent',94),Uj=nx(JE,'MouseMoveEvent',91),Wj=nx(JE,'MouseOverEvent',93),Vj=nx(JE,'MouseOutEvent',92),qk=nx('com.google.gwt.text.shared.','AbstractRenderer',126),sk=nx(NE,'PassthroughRenderer',128),rk=nx(NE,'PassthroughParser',127),Yj=nx(JE,'PrivateMap',95),lk=nx(DE,'LegacyHandlerWrapper',111),Gk=nx(OE,'TouchScroller',132),Fk=nx(OE,'TouchScroller$TemporalPoint',142),Dk=nx(OE,'TouchScroller$MomentumCommand',139),Ek=nx(OE,'TouchScroller$MomentumTouchRemovalCommand',141),Ck=nx(OE,'TouchScroller$MomentumCommand$1',140),wk=nx(OE,'TouchScroller$1',133),xk=nx(OE,'TouchScroller$2',134),yk=nx(OE,'TouchScroller$3',135),zk=nx(OE,'TouchScroller$4',136),Ak=nx(OE,'TouchScroller$5',137),Bk=nx(OE,'TouchScroller$6',138),_m=nx(IE,'NoSuchElementException',279),$m=nx(IE,'MapEntryImpl',278),ym=nx(vE,'IndexOutOfBoundsException',248),ak=nx(JE,'TouchEvent',98),ck=nx(JE,'TouchStartEvent',102),_j=nx(JE,'TouchEvent$TouchSupportDetector',100),bk=nx(JE,'TouchMoveEvent',101),$j=nx(JE,'TouchEndEvent',99),Zj=nx(JE,'TouchCancelEvent',97),tk=nx(OE,'DefaultMomentum',129),uk=nx(OE,'Momentum$State',130),Qm=nx(IE,'AbstractList',268),Wm=nx(IE,'ArrayList',273),Om=nx(IE,'AbstractList$IteratorImpl',269),Pm=nx(IE,'AbstractList$ListIteratorImpl',270),em=nx(yE,'VisibleGene',230),Wl=nx(yE,'Gene',220),mm=nx(PE,'Requirement',234),lm=nx(PE,'ProteinLengthRequirement',238),hm=nx(PE,'IntronNumberRequirement',233),gm=nx(QE,'Problem',232),pm=nx(PE,'SingleMutationRequirement',241),om=nx(PE,'ShortermRNARequirement',240),im=nx(PE,'LongerProteinRequirement',235),nm=nx(PE,'ShorterProteinRequirement',239),km=nx(PE,'NomRNARequirement',237),jm=nx(PE,'NoProteinRequirement',236),fk=nx(ME,'ResizeEvent',105),cm=nx(yE,'HTMLContainer',228),Ok=nx(RE,'HistoryImpl',155),Nk=nx(RE,'HistoryImplTimer',157),Mk=nx(RE,'HistoryImplSafari',156),dm=nx(yE,'Nucleotide',229),Vl=nx(yE,'Exon',219),fm=nx(QE,'GenexState',231),gk=nx(ME,'ValueChangeEvent',106),Xm=nx(IE,'Collections$EmptyList',275),Ul=nx(yE,'ColorSequencer',218),Wi=nx(EE,'AnimationSchedulerImpl',7),Ti=nx(EE,'AnimationSchedulerImplTimer',8),Si=nx(EE,'AnimationSchedulerImplTimer$AnimationHandleImpl',11),bn=mx('[Lcom.google.gwt.animation.client.','AnimationSchedulerImplTimer$AnimationHandleImpl;',296),Ri=nx(EE,'AnimationSchedulerImplTimer$1',9),Vi=nx(EE,'AnimationSchedulerImplWebkit',12),Ui=nx(EE,'AnimationSchedulerImplWebkit$AnimationHandleImpl',13),vk=nx(OE,'Point',131);$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalEnd'});if ($wnd.genex) $wnd.genex.onScriptLoad();
diff --git a/common/static/js/capa/genex/DF3D3A7FAEE63D711CF2D95BDB3F538C.cache.html b/common/static/js/capa/genex/BA18AC23ACC5016C5D0799E864BBDFFE.cache.html
similarity index 91%
rename from common/static/js/capa/genex/DF3D3A7FAEE63D711CF2D95BDB3F538C.cache.html
rename to common/static/js/capa/genex/BA18AC23ACC5016C5D0799E864BBDFFE.cache.html
index 913b90be20..261aa02849 100644
--- a/common/static/js/capa/genex/DF3D3A7FAEE63D711CF2D95BDB3F538C.cache.html
+++ b/common/static/js/capa/genex/BA18AC23ACC5016C5D0799E864BBDFFE.cache.html
@@ -1,4 +1,4 @@
-<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.5.0";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = 'DF3D3A7FAEE63D711CF2D95BDB3F538C';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script><!--
+<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.5.0";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = 'BA18AC23ACC5016C5D0799E864BBDFFE';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script><!--
 function GA(){}
 function Gf(){}
 function kf(){}
@@ -632,7 +632,7 @@ function Iu(a){if(ox(a,'UUU'))return CC;if(ox(a,'UUC'))return CC;if(ox(a,'UUA'))
 function kp(){$wnd.__gwt_globalEventArray==null&&($wnd.__gwt_globalEventArray=new Array);$wnd.__gwt_globalEventArray[$wnd.__gwt_globalEventArray.length]=fB(function(){return mo($wnd.event)});var d=fB(function(){var a=Fc;Fc=this;if($wnd.event.returnValue==null){$wnd.event.returnValue=true;if(!np()){Fc=a;return}}var b,c=this;while(c&&!(b=c.__listener)){c=c.parentElement}b&&!ki(b)&&ji(b,37)&&lo($wnd.event,c,b);Fc=a});var e=fB(function(){var a=$doc.createEventObject();$wnd.event.returnValue==null&&$wnd.event.srcElement.fireEvent&&$wnd.event.srcElement.fireEvent(OB,a);if(this.__eventBits&2){d.call(this)}else if($wnd.event.returnValue==null){$wnd.event.returnValue=true;np()}});var f=fB(function(){this.__gwtLastUnhandledEvent=$wnd.event.type;d.call(this)});var g=$moduleName.replace(/\./g,PB);$wnd['__gwt_dispatchEvent_'+g]=d;hp=(new Function(QB,'return function() { w.__gwt_dispatchEvent_'+g+'.call(this) }'))($wnd);$wnd['__gwt_dispatchDblClickEvent_'+g]=e;gp=(new Function(QB,'return function() { w.__gwt_dispatchDblClickEvent_'+g+RB))($wnd);$wnd['__gwt_dispatchUnhandledEvent_'+g]=f;jp=(new Function(QB,SB+g+RB))($wnd);ip=(new Function(QB,SB+g+'.call(w.event.srcElement)}'))($wnd);var h=fB(function(){d.call($doc.body)});var i=fB(function(){e.call($doc.body)});$doc.body.attachEvent(OB,h);$doc.body.attachEvent('onmousedown',h);$doc.body.attachEvent('onmouseup',h);$doc.body.attachEvent('onmousemove',h);$doc.body.attachEvent('onmousewheel',h);$doc.body.attachEvent('onkeydown',h);$doc.body.attachEvent('onkeypress',h);$doc.body.attachEvent('onkeyup',h);$doc.body.attachEvent('onfocus',h);$doc.body.attachEvent('onblur',h);$doc.body.attachEvent('ondblclick',i);$doc.body.attachEvent('oncontextmenu',h)}
 --></script>
 <script><!--
-var lB='',XC='\n',rB=' ',WC='    ',YC='    .    |',aD=' N-',oB='(',MB=')',uD='+',DD=', ',ZB='-',kD="-3'\n",fD='-C',RB='.call(this)}',qC='0',fC='0px',zC='1',VC="5'-",qB=':',kB=': ',bD='<\/EM>',gD='<\/pre><h3>',cD='<\/u>',iD='<EM class=',eD='<EM class=selected>',$C='<font color=red>none<\/font>\n',dD='<u>',vD='=',jD='>',pD='A',AD='AAAAAAAAAAAAA',FC='AUG',KC='Ala',TC='Arg',OC='Asn',QC='Asp',rD='C',zD='CAAAG',vB='CENTER',tB='CSS1Compat',SC='Cys',qD='G',xD='GGGGG',yD='GUGCG',NC='Gln',RC='Glu',UC='Gly',MC='His',lD='INCORRECT',EC='Ile',wB='JUSTIFY',xB='LEFT',DC='Leu',PC='Lys',XB='Null widget handle. If you are creating a composite, ensure that initWidget() has been called.',mD='OK',CC='Phe',IC='Pro',yB='RIGHT',nC='Selected Base = ',HC='Ser',nB='String',YB='Style names cannot be empty',sD='T',wD='TATAA',JC='Thr',LC='Tyr',LD='UmbrellaException',GC='Val',BD='You did not make a single base substitution.',UD='[Lcom.google.gwt.dom.client.',PD='[Lcom.google.gwt.user.client.ui.',GD='[Ljava.lang.',PB='_',uC='absolute',oC='align',jC='cellPadding',iC='cellSpacing',WB='className',zB='click',tC='clip',ND='com.google.gwt.animation.client.',FD='com.google.gwt.core.client.',SD='com.google.gwt.core.client.impl.',TD='com.google.gwt.dom.client.',RD='com.google.gwt.event.dom.client.',WD='com.google.gwt.event.logical.shared.',MD='com.google.gwt.event.shared.',JD='com.google.gwt.i18n.client.',XD='com.google.gwt.text.shared.testing.',YD='com.google.gwt.touch.client.',OD='com.google.gwt.user.client.',VD='com.google.gwt.user.client.impl.',ID='com.google.gwt.user.client.ui.',KD='com.google.web.bindery.event.shared.',JB='dir',rC='display',sB='div',pB='function',tD='g',oD='genex-button',HD='genex.client.gx.',$D='genex.client.problems.',ZD='genex.client.requirements.',nD='genex_container',VB='height',jB='hidden',LB='ie8',ED='java.lang.',QD='java.util.',$B='left',KB='ltr',hD='mature-',AB='mousedown',BB='mousemove',CB='mouseout',DB='mouseover',EB='mouseup',BC='msie',sC='none',_C='none\n',mB='null',gB='offsetHeight',hB='offsetWidth',OB='onclick',TB='onload',wC='onresize',AC='opera',iB='overflow',mC='popupContent',aC='position',eC='px',vC='px, ',gC='rect(0px, 0px, 0px, 0px)',xC='relative',SB='return function() { w.__gwt_dispatchUnhandledEvent_',uB='rtl',NB='scroll',bC='table',cC='tbody',lC='td',_B='top',FB='touchcancel',GB='touchend',HB='touchmove',IB='touchstart',kC='tr',CD='value',pC='verticalAlign',dC='visibility',hC='visible',QB='w',UB='width',yC='zoom',ZC='|';var _,Mm={},UA={25:1,27:1},cB={60:1},PA={6:1,9:1,50:1,53:1,54:1},KA={50:1},HA={},ZA={46:1},aB={52:1},eB={50:1,57:1},WA={24:1,29:1,37:1,40:1,41:1,43:1,45:1},bB={58:1},$A={11:1,27:1},RA={29:1},SA={47:1,50:1,56:1},LA={50:1,56:1},OA={6:1,8:1,50:1,53:1,54:1},dB={59:1},NA={6:1,7:1,50:1,53:1,54:1},MA={5:1,6:1,50:1,53:1,54:1},VA={23:1,27:1},YA={44:1,50:1,53:1,54:1},IA={4:1,50:1},TA={27:1,36:1},JA={38:1},XA={24:1,29:1,37:1,40:1,41:1,42:1,43:1,45:1},_A={49:1},QA={10:1,50:1,53:1,54:1};Nm(1,-1,HA);_.eQ=function s(a){return this===a};_.gC=function t(){return this.cZ};_.hC=function u(){return Ib(this)};_.tS=function v(){return this.cZ.c+'@'+bx(this.hC())};_.toString=function(){return this.tS()};_.tM=GA;Nm(3,1,{});_.k=-1;_.n=false;_.o=false;_.p=null;_.q=-1;_.r=null;_.s=-1;_.t=false;Nm(4,1,{},C);_.a=null;Nm(5,1,{});Nm(6,1,{2:1});Nm(7,5,{});var G=null;Nm(8,7,{},M);Nm(10,1,JA);_.I=function W(){this.b||Rz(P,this);this.J()};_.b=false;_.c=0;var P;Nm(9,10,JA,X);_.J=function Y(){L(this.a)};_.a=null;Nm(11,6,{2:1,3:1},ab);_.a=null;_.b=null;Nm(12,1,{},db);Nm(17,1,LA);_.K=function kb(){return this.e};_.tS=function lb(){var a,b;a=this.cZ.c;b=this.K();return b!=null?a+kB+b:a};_.e=null;Nm(16,17,LA);Nm(15,16,LA,mb);Nm(14,15,LA,ob);_.K=function ub(){this.c==null&&(this.d=rb(this.b),this.a=this.a+kB+pb(this.b),this.c=oB+this.d+') '+tb(this.b)+this.a,undefined);return this.c};_.a=lB;_.b=null;_.c=null;_.d=null;Nm(21,1,{});var zb=0,Ab=0,Bb=0,Cb=-1;Nm(23,21,{},Ub);_.a=null;_.b=null;_.c=null;_.d=false;_.e=null;_.f=null;_.g=null;_.i=false;var Mb;Nm(24,1,{},_b);_.L=function ac(){this.a.d=true;Qb(this.a);this.a.d=false;return this.a.i=Rb(this.a)};_.a=null;Nm(25,1,{},cc);_.L=function dc(){this.a.d&&Zb(this.a.e,1);return this.a.i};_.a=null;Nm(28,1,{},kc);_.N=function lc(a){return ec(a)};var Fc=null;Nm(45,1,{50:1,53:1,54:1});_.eQ=function cd(a){return this===a};_.hC=function dd(){return Ib(this)};_.tS=function ed(){return this.a};_.a=null;_.b=0;Nm(44,45,MA);var fd,gd,hd,id,jd;Nm(46,44,MA,nd);Nm(47,44,MA,pd);Nm(48,44,MA,rd);Nm(49,44,MA,td);Nm(50,45,NA);var vd,wd,xd,yd,zd;Nm(51,50,NA,Dd);Nm(52,50,NA,Fd);Nm(53,50,NA,Hd);Nm(54,50,NA,Jd);Nm(55,45,OA);var Ld,Md,Nd,Od,Pd;Nm(56,55,OA,Td);Nm(57,55,OA,Vd);Nm(58,55,OA,Xd);Nm(59,55,OA,Zd);Nm(60,45,PA);var _d,ae,be,ce,de;Nm(61,60,PA,he);Nm(62,60,PA,je);Nm(63,60,PA,le);Nm(64,60,PA,ne);Nm(65,45,QA);var pe,qe,re,se,te,ue,ve,we,xe,ye;Nm(66,65,QA,Ce);Nm(67,65,QA,Ee);Nm(68,65,QA,Ge);Nm(69,65,QA,Ie);Nm(70,65,QA,Ke);Nm(71,65,QA,Me);Nm(72,65,QA,Oe);Nm(73,65,QA,Qe);Nm(74,65,QA,Se);Nm(80,1,{});_.tS=function Ze(){return 'An event type'};_.f=null;Nm(79,80,{});_.Q=function _e(){this.e=false;this.f=null};_.e=false;Nm(78,79,{});_.P=function ef(){return this.R()};_.a=null;_.b=null;var af=null;Nm(77,78,{});Nm(76,77,{});Nm(75,76,{},kf);_.O=function lf(a){hi(a,11).S(this)};_.R=function mf(){return hf};var hf;Nm(83,1,{});_.hC=function rf(){return this.c};_.tS=function sf(){return 'Event type'};_.c=0;var qf=0;Nm(82,83,{},tf);Nm(81,82,{12:1},uf);_.a=null;_.b=null;Nm(84,76,{},zf);_.O=function Af(a){yf(this,hi(a,13))};_.R=function Bf(){return wf};var wf;Nm(85,76,{},Gf);_.O=function Hf(a){Ff(this,hi(a,14))};_.R=function If(){return Df};var Df;Nm(86,76,{},Mf);_.O=function Nf(a){hi(hi(a,15),39)};_.R=function Of(){return Kf};var Kf;Nm(87,76,{},Sf);_.O=function Tf(a){hi(hi(a,16),39)};_.R=function Uf(){return Qf};var Qf;Nm(88,76,{},Zf);_.O=function $f(a){Yf(this,hi(a,17))};_.R=function _f(){return Wf};var Wf;Nm(89,1,{},dg);_.a=null;Nm(92,77,{});var gg=null;Nm(91,92,{},jg);_.O=function kg(a){yn(hi(hi(a,18),34).a)};_.R=function lg(){return hg};var hg;Nm(93,92,{},pg);_.O=function qg(a){yn(hi(hi(a,19),33).a)};_.R=function rg(){return ng};var ng;Nm(94,1,{},tg);Nm(95,92,{},yg);_.O=function zg(a){xg(this,hi(a,20))};_.R=function Ag(){return vg};var vg;Nm(96,92,{},Fg);_.O=function Gg(a){Eg(this,hi(a,21))};_.R=function Hg(){return Cg};var Cg;Nm(97,79,{},Lg);_.O=function Mg(a){Kg(this,hi(a,22))};_.P=function Og(){return Jg};_.a=false;var Jg=null;Nm(98,79,{},Rg);_.O=function Sg(a){hi(a,23).T(this)};_.P=function Ug(){return Qg};var Qg=null;Nm(99,79,{},Xg);_.O=function Yg(a){hi(a,25).U(this)};_.P=function $g(){return Wg};_.a=0;var Wg=null;Nm(100,79,{},ch);_.O=function dh(a){bh(hi(a,26))};_.P=function fh(){return ah};var ah=null;Nm(101,1,RA,kh,lh);_.V=function mh(a){ih(this,a)};_.a=null;_.b=null;Nm(104,1,{});Nm(103,104,{});_.a=null;_.b=0;_.c=false;Nm(102,103,{},Bh);Nm(105,1,{28:1},Dh);_.a=null;Nm(107,15,SA,Gh);_.a=null;Nm(106,107,SA,Jh);Nm(108,1,{27:1},Lh);Nm(110,45,{30:1,50:1,53:1,54:1},Uh);var Ph,Qh,Rh,Sh;Nm(111,1,{},Wh);_.qI=0;var ai,bi;Nm(120,1,{});Nm(121,1,{},Tm);var Sm=null;Nm(122,120,{},Wm);var Vm=null;Nm(123,1,{},$m);Nm(124,1,{},dn);_.a=0;_.b=0;_.c=null;_.d=null;_.e=null;Nm(125,1,{32:1},jn,kn);_.eQ=function ln(a){var b;if(!ji(a,32)){return false}b=hi(a,32);return this.a==b.a&&this.b==b.b};_.hC=function mn(){return ni(this.a)^ni(this.b)};_.tS=function nn(){return 'Point('+this.a+','+this.b+MB};_.a=0;_.b=0;Nm(126,1,{},Hn);_.a=null;_.b=null;_.c=false;_.f=null;_.g=null;_.n=null;_.o=null;_.p=null;_.r=false;_.s=null;var pn=null;Nm(127,1,{22:1,27:1},Jn);_.a=null;Nm(128,1,{21:1,27:1},Ln);_.a=null;Nm(129,1,{20:1,27:1},Nn);_.a=null;Nm(130,1,{19:1,27:1,33:1},Pn);_.a=null;Nm(131,1,{18:1,27:1,34:1},Rn);_.a=null;Nm(132,1,TA,Tn);_.W=function Un(a){var b;if(1==dp(a.d.type)){b=new jn(a.d.clientX||0,a.d.clientY||0);if(vn(this.a,b)||wn(this.a,b)){a.a=true;a.d.cancelBubble=true;Ic(a.d)}}};_.a=null;Nm(133,1,{},Xn);_.L=function Yn(){var a,b,c,d,e,f,g;if(this!=this.e.g){Wn(this);return false}a=cb(this.a);bn(this.d,a-this.c);this.c=a;an(this.d,a);e=Zm(this.d);e||Wn(this);Fn(this.e,this.d.d);d=ni(this.d.d.a);c=st(this.e.s);b=qt(this.e.s);f=rt(this.e.s);g=ni(this.d.d.b);if((f<=g||0>=g)&&(b<=d||c>=d)){Wn(this);return false}return e};_.c=0;_.d=null;_.e=null;_.f=null;Nm(134,1,UA,$n);_.U=function _n(a){Wn(this.a)};_.a=null;Nm(135,1,{},bo);_.L=function co(){var a,b,c;a=eb();b=new sz(this.a.q);while(b.b<b.d.zb()){c=hi(qz(b),35);a-c.b>=2500&&rz(b)}return this.a.q.b!=0};_.a=null;Nm(136,1,{35:1},go,ho);_.a=null;_.b=0;var io=null,jo=null;var ro=null;Nm(141,79,{},yo);_.O=function zo(a){hi(a,36).W(this);vo.c=false};_.P=function Bo(){return uo};_.Q=function Co(){wo(this)};_.a=false;_.b=false;_.c=false;_.d=null;var uo=null,vo=null;var Do=null;Nm(143,1,VA,Ho);_.T=function Io(a){while((Q(),P).b>0){R(hi(Oz(P,0),38))}};var Jo=false,Ko=null,Lo=0,Mo=0,No=false;Nm(145,79,{},Zo);_.O=function $o(a){oi(a);null.Jb()};_.P=function _o(){return Xo};var Xo;Nm(146,101,RA,bp);var cp=false;var gp=null,hp=null,ip=null,jp=null;Nm(149,1,RA,sp);_.Y=function tp(a){return decodeURI(a.replace('%23','#'))};_.V=function up(a){ih(this.a,a)};_.Z=function vp(a){a=a==null?lB:a;if(!ox(a,pp==null?lB:pp)){pp=a;eh(this)}};var pp=lB;Nm(152,1,{},zp);_.M=function Ap(){$wnd.__gwt_initWindowCloseHandler(fB(Uo),fB(To))};Nm(153,1,{},Cp);_.M=function Dp(){$wnd.__gwt_initWindowResizeHandler(fB(Vo))};Nm(158,1,{40:1,43:1});_.$=function Np(){return this.H};_._=function Op(a){po(this.H,VB,a)};_.ab=function Rp(a){po(this.H,UB,a)};_.tS=function Sp(){if(!this.H){return '(null handle)'}return this.H.outerHTML};_.H=null;Nm(157,158,WA);_.bb=function aq(){};_.cb=function bq(){};_.V=function cq(a){Wp(this,a)};_.db=function dq(){Xp(this)};_.X=function eq(a){Yp(this,a)};_.eb=function fq(){Zp(this)};_.fb=function gq(){};_.gb=function hq(){};_.D=false;_.E=0;_.F=null;_.G=null;Nm(156,157,WA);_.bb=function jq(){zq(this,(xq(),vq))};_.cb=function kq(){zq(this,(xq(),wq))};Nm(155,156,WA);_.ib=function oq(){return new tu(this.f)};_.hb=function pq(a){return mq(this,a)};Nm(154,155,WA);_.hb=function tq(a){return rq(this,a)};Nm(159,106,SA,yq);var vq,wq;Nm(160,1,{},Bq);_.jb=function Cq(a){a.db()};Nm(161,1,{},Eq);_.jb=function Fq(a){a.eb()};Nm(164,157,WA);_.db=function Jq(){var a;Xp(this);a=this.H.tabIndex;-1==a&&(this.H.tabIndex=0,undefined)};Nm(163,164,WA);Nm(162,163,WA,Lq);Nm(165,155,WA);_.d=null;_.e=null;Nm(168,156,WA);_.kb=function Vq(){return this.H};_.ib=function Wq(){return new Et(this)};_.hb=function Xq(a){return Rq(this,a)};_.C=null;Nm(167,168,WA);_.kb=function fr(){return Dc(this.H)};_.$=function gr(){return Ec(Dc(this.H))};_.lb=function hr(){$q(this)};_.W=function ir(a){a.c&&(a.d,false)&&(a.a=true)};_.gb=function jr(){this.A&&Hs(this.z,false,true)};_._=function kr(a){this.o=a;_q(this);a.length==0&&(this.o=null)};_.ab=function lr(a){this.p=a;_q(this);a.length==0&&(this.p=null)};_.k=false;_.n=false;_.o=null;_.p=null;_.q=null;_.s=null;_.t=false;_.u=false;_.v=-1;_.w=false;_.x=null;_.y=false;_.A=false;_.B=-1;Nm(166,167,WA);_.bb=function nr(){Xp(this.j)};_.cb=function or(){Zp(this.j)};_.ib=function pr(){return new Et(this.j)};_.hb=function qr(a){return Rq(this.j,a)};_.j=null;Nm(169,168,WA,tr);_.kb=function vr(){return this.a};_.a=null;_.b=null;Nm(170,166,WA,Fr);_.bb=function Hr(){try{Xp(this.j)}finally{Xp(this.a)}};_.cb=function Ir(){try{Zp(this.j)}finally{Zp(this.a)}};_.lb=function Jr(){Ar(this)};_.X=function Kr(a){switch(dp(a.type)){case 4:case 8:case 64:case 16:case 32:if(!this.f&&!Br(this,a)){return}}Yp(this,a)};_.W=function Lr(a){var b;b=a.d;!a.a&&dp(a.d.type)==4&&Br(this,b)&&Ic(b);a.c&&(a.d,false)&&(a.a=true)};_.a=null;_.b=0;_.c=0;_.d=0;_.e=0;_.f=false;_.g=null;_.i=0;Nm(171,1,UA,Nr);_.U=function Or(a){this.a.i=a.a};_.a=null;Nm(175,157,WA);_.a=null;Nm(174,175,WA,Wr);Nm(173,174,WA,Yr,Zr);Nm(172,173,WA,$r);Nm(176,1,{13:1,14:1,15:1,16:1,17:1,27:1,39:1},as);_.a=null;Nm(177,1,{},ds);_.a=null;_.b=null;_.c=null;var es,fs,gs;Nm(178,1,{});Nm(179,178,{},ks);_.a=null;var ls;Nm(180,1,{},os);_.a=null;Nm(181,165,WA,rs);_.hb=function ss(a){var b,c;c=Ec(a.H);b=mq(this,a);b&&tc(this.b,c);return b};_.b=null;Nm(182,1,UA,vs);_.U=function ws(a){us()};Nm(183,1,TA,ys);_.W=function zs(a){ar(this.a,a)};_.a=null;Nm(184,1,{26:1,27:1},Bs);_.a=null;Nm(185,3,{},Is);_.a=null;_.b=false;_.c=false;_.d=0;_.e=-1;_.f=null;_.g=null;_.i=false;Nm(186,10,JA,Ks);_.J=function Ls(){this.a.g=null;x(this.a,eb())};_.a=null;Nm(188,154,XA,Us);var Qs,Rs,Ss;Nm(189,1,{},Zs);_.jb=function $s(a){a.D&&a.eb()};Nm(190,1,VA,at);_.T=function bt(a){Ws()};Nm(191,188,XA,dt);Nm(192,1,{});var ft=null;Nm(193,192,{},mt);var jt=null,kt=null;Nm(194,168,WA,wt);_.kb=function xt(){return this.a};_.db=function yt(){Xp(this);this.b.__listener=this};_.eb=function zt(){this.b.__listener=null;Zp(this)};_._=function At(a){po(this.H,VB,a)};_.ab=function Bt(a){po(this.H,UB,a)};_.a=null;_.b=null;_.c=null;Nm(195,1,{},Et);_.mb=function Ft(){return this.a};_.nb=function Gt(){return Dt(this)};_.ob=function Ht(){!!this.b&&this.c.hb(this.b)};_.b=null;_.c=null;Nm(198,164,WA);_.X=function Mt(a){var b;b=dp(a.type);(b&896)!=0?Yp(this,a):Yp(this,a)};_.fb=function Nt(){};Nm(197,198,WA);Nm(196,197,WA,Pt);Nm(199,45,YA);var St,Tt,Ut,Vt,Wt;Nm(200,199,YA,$t);Nm(201,199,YA,au);Nm(202,199,YA,cu);Nm(203,199,YA,eu);Nm(204,165,WA,hu);_.hb=function iu(a){var b,c;c=Ec(a.H);b=mq(this,a);b&&tc(this.d,Ec(c));return b};Nm(205,1,{},pu);_.ib=function qu(){return new tu(this)};_.a=null;_.b=null;_.c=0;Nm(206,1,{},tu);_.mb=function uu(){return this.a<this.b.c-1};_.nb=function vu(){return su(this)};_.ob=function wu(){if(this.a<0||this.a>=this.b.c){throw new Yw}this.b.b.hb(this.b.a[this.a--])};_.a=-1;_.b=null;Nm(210,1,{},Bu);_.a=null;_.b=null;_.c=null;Nm(211,1,ZA,Du);_.M=function Eu(){sh(this.a,this.c,this.b)};_.a=null;_.b=null;_.c=null;Nm(212,1,ZA,Gu);_.M=function Hu(){uh(this.a,this.c,this.b)};_.a=null;_.b=null;_.c=null;Nm(214,1,{},Lu);_.a=0;Nm(215,1,{},Nu);_.a=0;_.b=0;_.c=0;Nm(216,1,{},bv);_.a=null;_.b=null;_.c=null;_.d=null;_.e=null;_.f=0;_.g=0;_.i=0;_.j=null;_.k=null;_.n=null;_.o=0;_.p=0;_.q=null;_.r=null;_.s=null;_.t=0;Nm(217,1,{},mv);_.pb=function nv(a){var b,c;if(a==39){++this.d;this.d>this.a.length-1&&(this.d=this.a.length-1);b=iv(this,this.a,this.d);lv(this,b,this.d);this.b=b.b.b.length;b.b.f+1;dv(this)}if(a==37){--this.d;this.d<0&&(this.d=0);b=iv(this,this.a,this.d);lv(this,b,this.d);this.b=b.b.b.length;b.b.f+1;dv(this)}if(a==8||a==46){this.A=this.e;c=new Ox(this.a);Kx(c,this.d);this.a=rc(c.a);this.d>=0&&--this.d;b=iv(this,this.a,this.d);lv(this,b,this.d);this.e=Xu(b.b);this.b=b.b.b.length;dv(this)}};_.qb=function ov(a,b){var c,d;if(ox(a,pD)||ox(a,qD)||ox(a,rD)||ox(a,sD)){this.A=this.e;d=new Ox(this.a);Lx(d,this.d,a);this.a=rc(d.a);++this.d;c=iv(this,this.a,this.d);lv(this,c,this.d);this.e=Xu(c.b);this.b=c.b.b.length;c.b.f+1;dv(this)}if(ox(a,'a')||ox(a,tD)||ox(a,'c')||ox(a,'t')){this.A=this.e;d=new Ox(this.a);Mx(d,this.d,this.d+1,a.toUpperCase());this.a=rc(d.a);c=iv(this,this.a,this.d);lv(this,c,this.d);this.e=Xu(c.b);this.b=c.b.b.length;c.b.f+1;dv(this)}if(ox(a,uD)||ox(a,ZB)||ox(a,vD)||ox(a,PB)){if(ox(a,uD)||ox(a,vD)){++this.d;this.d>this.a.length-1&&(this.d=this.a.length-1)}else{--this.d;this.d<0&&(this.d=0)}c=iv(this,this.a,this.d);lv(this,c,this.d);this.b=c.b.b.length;c.b.f+1;dv(this)}if(b==39){++this.d;this.d>this.a.length-1&&(this.d=this.a.length-1);c=iv(this,this.a,this.d);lv(this,c,this.d);this.b=c.b.b.length;c.b.f+1;dv(this)}if(b==37){--this.d;this.d<0&&(this.d=0);c=iv(this,this.a,this.d);lv(this,c,this.d);this.b=c.b.b.length;c.b.f+1;dv(this)}};_.rb=function pv(a){var b;if(a>=0&&a<=this.b){b=iv(this,this.a,a);lv(this,b,a);this.b=b.b.b.length;this.d=a;dv(this)}};_.sb=function rv(a){var b;a!=null&&Lv(this.y,a);this.y.e=wD;this.y.g=xD;this.y.c=yD;this.y.b=zD;this.y.d=AD;this.f=this.y.a;this.a=this.y.a;this.b=this.a.length;this.C=this.y.e;this.D=this.y.f;this.G=this.y.g;this.u=this.y.c;this.t=this.y.b;this.z=this.y.d;(ox(this.u,sC)||ox(this.t,sC))&&(this.z=lB);b=iv(this,this.f,-1);this.g=b.b.e;this.i=b.b.q;this.b=b.b.b.length;this.e=Xu(b.b);Xr(this.r,b.a.b+'<\/pre><\/body><\/html>')};_.tb=function tv(a){var b,c,d,e,f;this.B=new aw;if(a==1){b=new yw;b.b=BD;$v(this.B,b);d=new vw;d.b='Your change does not make the mature mRNA shorter.';$v(this.B,d)}else if(a==2){b=new yw;b.b=BD;$v(this.B,b);d=new gw;d.b='Your change does not make the protein longer.';$v(this.B,d)}else if(a==3){b=new yw;b.b=BD;$v(this.B,b);d=new sw;d.b='Your change does not make the protein shorter.';$v(this.B,d)}else if(a==4){b=new yw;b.b=BD;$v(this.B,b);d=new mw;d.b='Your change does not prevent mRNA from being made.';$v(this.B,d);f=new jw;f.b='Your change does not prevent protein from being made';$v(this.B,f)}else if(a==5){c=new pw;c.a=c.a;c.b='Your protein does not have 5 amino acids.';$v(this.B,c);e=new dw;e.a=1;e.b='Your gene does not contain one intron.';$v(this.B,e)}};_.a=null;_.b=0;_.c=null;_.d=0;_.e=lB;_.f=null;_.g=lB;_.i=lB;_.j=null;_.k=null;_.n=false;_.o=null;_.p=null;_.q=null;_.r=null;_.s=null;_.t=null;_.u=null;_.v=null;_.w=null;_.x=null;_.z=null;_.A=lB;_.B=null;_.C=null;_.D=0;_.E=null;_.F=null;_.G=null;_.H=null;Nm(218,1,$A,wv);_.S=function xv(a){Ar(this.a.j);this.a.o.H[CD]=lB};_.a=null;Nm(219,1,{},zv);_.M=function Av(){fv(this.a);ev(this.a);gv(this.a);hv(this.a);typeof $wnd.genexIsReady===pB&&$wnd.genexIsReady()};_.a=null;Nm(220,1,$A,Cv);_.S=function Dv(a){var b,c;this.a.A=this.a.e;c=xc(this.a.o.H,CD);c=c.toUpperCase();c=sx(c,'[^AGCT]',lB);this.a.a=c;this.a.d=-1;b=iv(this.a,this.a.a,-1);lv(this.a,b,-1);this.a.e=Xu(b.b);this.a.b=b.b.b.length;Ar(this.a.j);dv(this.a)};_.a=null;Nm(221,1,$A,Fv);_.S=function Gv(a){var b;this.a.a=this.a.f;b=iv(this.a,this.a.a,-1);lv(this.a,b,-1);this.a.e=Xu(b.b);this.a.b=b.b.b.length;dv(this.a)};_.a=null;Nm(222,1,$A,Iv);_.S=function Jv(a){Yq(this.a.j)};_.a=null;Nm(223,1,{},Mv);_.a=null;_.b=null;_.c=null;_.d=null;_.e=null;_.f=0;_.g=null;Nm(224,1,{},Ov);_.a=null;_.b=null;Nm(225,1,{48:1},Sv);_.a=0;_.b=0;_.c=false;_.d=false;_.e=0;_.f=0;_.g=false;Nm(226,1,{},Uv);_.a=null;_.b=null;Nm(227,1,{},Xv);_.tS=function Yv(){return Wv(this)};_.a=null;_.b=0;_.c=null;_.d=null;_.e=0;_.f=null;_.g=null;_.i=null;Nm(228,1,{},aw);_.a=null;Nm(230,1,_A);_.b='unassigned';Nm(229,230,_A,dw);_.ub=function ew(a){return a.b==this.a+1};_.a=0;Nm(231,230,_A,gw);_.ub=function hw(a){return a.c.length>a.i.length};Nm(232,230,_A,jw);_.ub=function kw(a){return ox(a.c,lB)};Nm(233,230,_A,mw);_.ub=function nw(a){return ox(a.d,lB)};Nm(234,230,_A,pw);_.ub=function qw(a){return a.c.length==this.a};_.a=0;Nm(235,230,_A,sw);_.ub=function tw(a){return a.c.length<a.i.length};Nm(236,230,_A,vw);_.ub=function ww(a){return a.d.length<a.g.length};Nm(237,230,_A,yw);_.ub=function zw(a){var b,c,d,e;e=a.f;b=a.a;if(e.length!=b.length)return false;d=0;for(c=0;c<e.length;++c){e.charCodeAt(c)!=b.charCodeAt(c)&&++d}if(d==1)return true;return false};Nm(238,15,LA,Bw);Nm(239,1,{50:1,51:1,53:1},Gw);_.eQ=function Hw(a){return ji(a,51)&&hi(a,51).a==this.a};_.hC=function Iw(){return this.a?1231:1237};_.tS=function Jw(){return this.a?'true':'false'};_.a=false;var Dw,Ew;Nm(240,1,{},Lw);_.tS=function Sw(){return ((this.a&2)!=0?'interface ':(this.a&1)!=0?lB:'class ')+this.c};_.a=0;_.b=0;_.c=null;Nm(241,15,LA,Uw);Nm(242,15,LA,Ww);Nm(243,15,LA,Yw,Zw);Nm(244,15,LA,_w,ax);Nm(248,15,LA,fx,gx);var hx;Nm(250,1,{50:1,55:1},kx);_.tS=function lx(){return this.a+'.'+this.c+'(Unknown Source'+(this.b>=0?qB+this.b:lB)+MB};_.a=null;_.b=0;_.c=null;_=String.prototype;_.cM={1:1,50:1,52:1,53:1};_.eQ=function xx(a){return ox(this,a)};_.hC=function yx(){return Fx(this)};_.tS=_.toString;var Ax,Bx=0,Cx;Nm(252,1,aB,Nx,Ox);_.tS=function Px(){return rc(this.a)};Nm(253,1,aB,Sx);_.tS=function Tx(){return rc(this.a)};Nm(254,15,LA,Vx);Nm(255,1,{});_.vb=function Zx(a){throw new Vx('Add not supported on this collection')};_.wb=function $x(a){var b;b=Xx(this.ib(),a);return !!b};_.xb=function _x(){return this.zb()==0};_.yb=function ay(a){var b;b=Xx(this.ib(),a);if(b){b.ob();return true}else{return false}};_.tS=function by(){return Yx(this)};Nm(257,1,bB);_.eQ=function fy(a){var b,c,d,e,f;if(a===this){return true}if(!ji(a,58)){return false}e=hi(a,58);if(this.d!=e.d){return false}for(c=new Ny((new Fy(e)).a);pz(c.a);){b=c.b=hi(qz(c.a),59);d=b.Bb();f=b.Cb();if(!(d==null?this.c:ji(d,1)?qB+hi(d,1) in this.e:py(this,d,~~xb(d)))){return false}if(!FA(f,d==null?this.b:ji(d,1)?oy(this,hi(d,1)):ny(this,d,~~xb(d)))){return false}}return true};_.hC=function gy(){var a,b,c;c=0;for(b=new Ny((new Fy(this)).a);pz(b.a);){a=b.b=hi(qz(b.a),59);c+=a.hC();c=~~c}return c};_.tS=function hy(){var a,b,c,d;d='{';a=false;for(c=new Ny((new Fy(this)).a);pz(c.a);){b=c.b=hi(qz(c.a),59);a?(d+=DD):(a=true);d+=lB+b.Bb();d+=vD;d+=lB+b.Cb()}return d+'}'};Nm(256,257,bB);_.Ab=function zy(a,b){return mi(a)===mi(b)||a!=null&&wb(a,b)};_.a=null;_.b=null;_.c=false;_.d=0;_.e=null;Nm(259,255,cB);_.eQ=function Cy(a){var b,c,d;if(a===this){return true}if(!ji(a,60)){return false}c=hi(a,60);if(c.zb()!=this.zb()){return false}for(b=c.ib();b.mb();){d=b.nb();if(!this.wb(d)){return false}}return true};_.hC=function Dy(){var a,b,c;a=0;for(b=this.ib();b.mb();){c=b.nb();if(c!=null){a+=xb(c);a=~~a}}return a};Nm(258,259,cB,Fy);_.wb=function Gy(a){return Ey(this,a)};_.ib=function Hy(){return new Ny(this.a)};_.yb=function Iy(a){var b;if(Ey(this,a)){b=hi(a,59).Bb();vy(this.a,b);return true}return false};_.zb=function Jy(){return this.a.d};_.a=null;Nm(260,1,{},Ny);_.mb=function Oy(){return pz(this.a)};_.nb=function Py(){return Ly(this)};_.ob=function Qy(){My(this)};_.a=null;_.b=null;_.c=null;Nm(262,1,dB);_.eQ=function Ty(a){var b;if(ji(a,59)){b=hi(a,59);if(FA(this.Bb(),b.Bb())&&FA(this.Cb(),b.Cb())){return true}}return false};_.hC=function Uy(){var a,b;a=0;b=0;this.Bb()!=null&&(a=xb(this.Bb()));this.Cb()!=null&&(b=xb(this.Cb()));return a^b};_.tS=function Vy(){return this.Bb()+vD+this.Cb()};Nm(261,262,dB,Wy);_.Bb=function Xy(){return null};_.Cb=function Yy(){return this.a.b};_.Db=function Zy(a){return ty(this.a,a)};_.a=null;Nm(263,262,dB,_y);_.Bb=function az(){return this.a};_.Cb=function bz(){return oy(this.b,this.a)};_.Db=function cz(a){return uy(this.b,this.a,a)};_.a=null;_.b=null;Nm(264,255,{57:1});_.Eb=function ez(a,b){throw new Vx('Add not supported on this list')};_.vb=function fz(a){this.Eb(this.zb(),a);return true};_.eQ=function hz(a){var b,c,d,e,f;if(a===this){return true}if(!ji(a,57)){return false}f=hi(a,57);if(this.zb()!=f.zb()){return false}d=new sz(this);e=f.ib();while(d.b<d.d.zb()){b=qz(d);c=qz(e);if(!(b==null?c==null:wb(b,c))){return false}}return true};_.hC=function iz(){var a,b,c;b=1;a=new sz(this);while(a.b<a.d.zb()){c=qz(a);b=31*b+(c==null?0:xb(c));b=~~b}return b};_.ib=function kz(){return new sz(this)};_.Gb=function lz(){return new yz(this,0)};_.Hb=function mz(a){return new yz(this,a)};_.Ib=function nz(a){throw new Vx('Remove not supported on this list')};Nm(265,1,{},sz);_.mb=function tz(){return pz(this)};_.nb=function uz(){return qz(this)};_.ob=function vz(){rz(this)};_.b=0;_.c=-1;_.d=null;Nm(266,265,{},yz);_.a=null;Nm(267,259,cB,Bz);_.wb=function Cz(a){return ly(this.a,a)};_.ib=function Dz(){return Az(this)};_.zb=function Ez(){return this.b.a.d};_.a=null;_.b=null;Nm(268,1,{},Hz);_.mb=function Iz(){return pz(this.a.a)};_.nb=function Jz(){return Gz(this)};_.ob=function Kz(){My(this.a)};_.a=null;Nm(269,264,eB,Tz);_.Eb=function Uz(a,b){(a<0||a>this.b)&&jz(a,this.b);bA(this.a,a,0,b);++this.b};_.vb=function Vz(a){return Mz(this,a)};_.wb=function Wz(a){return Pz(this,a,0)!=-1};_.Fb=function Xz(a){return Oz(this,a)};_.xb=function Yz(){return this.b==0};_.Ib=function Zz(a){return Qz(this,a)};_.yb=function $z(a){return Rz(this,a)};_.zb=function _z(){return this.b};_.b=0;var cA;Nm(271,264,eB,fA);_.wb=function gA(a){return false};_.Fb=function hA(a){throw new _w};_.zb=function iA(){return 0};Nm(272,256,{50:1,58:1},lA);Nm(273,259,{50:1,60:1},qA);_.vb=function rA(a){return nA(this,a)};_.wb=function sA(a){return ly(this.a,a)};_.xb=function tA(){return this.a.d==0};_.ib=function uA(){return Az(ey(this.a))};_.yb=function vA(a){return pA(this,a)};_.zb=function wA(){return this.a.d};_.tS=function xA(){return Yx(ey(this.a))};_.a=null;Nm(274,262,dB,zA);_.Bb=function AA(){return this.a};_.Cb=function BA(){return this.b};_.Db=function CA(a){var b;b=this.b;this.b=a;return b};_.a=null;_.b=null;Nm(275,15,LA,EA);var fB=Fb;
+var lB='',XC='\n',rB=' ',WC='    ',YC='    .    |',aD=' N-',oB='(',MB=')',uD='+',DD=', ',ZB='-',kD="-3'\n",fD='-C',RB='.call(this)}',qC='0',fC='0px',zC='1',VC="5'-",qB=':',kB=': ',bD='<\/EM>',gD='<\/pre><h3>',cD='<\/u>',iD='<EM class=',eD='<EM class=selected>',$C='<font color=red>none<\/font>\n',dD='<u>',vD='=',jD='>',pD='A',AD='AAAAAAAAAAAAA',FC='AUG',KC='Ala',TC='Arg',OC='Asn',QC='Asp',rD='C',zD='CAAAG',vB='CENTER',tB='CSS1Compat',SC='Cys',qD='G',xD='GGGGG',yD='GUGCG',NC='Gln',RC='Glu',UC='Gly',MC='His',lD='INCORRECT',EC='Ile',wB='JUSTIFY',xB='LEFT',DC='Leu',PC='Lys',XB='Null widget handle. If you are creating a composite, ensure that initWidget() has been called.',mD='OK',CC='Phe',IC='Pro',yB='RIGHT',nC='Selected Base = ',HC='Ser',nB='String',YB='Style names cannot be empty',sD='T',wD='TATAA',JC='Thr',LC='Tyr',LD='UmbrellaException',GC='Val',BD='You did not make a single base substitution.',UD='[Lcom.google.gwt.dom.client.',PD='[Lcom.google.gwt.user.client.ui.',GD='[Ljava.lang.',PB='_',uC='absolute',oC='align',jC='cellPadding',iC='cellSpacing',WB='className',zB='click',tC='clip',ND='com.google.gwt.animation.client.',FD='com.google.gwt.core.client.',SD='com.google.gwt.core.client.impl.',TD='com.google.gwt.dom.client.',RD='com.google.gwt.event.dom.client.',WD='com.google.gwt.event.logical.shared.',MD='com.google.gwt.event.shared.',JD='com.google.gwt.i18n.client.',XD='com.google.gwt.text.shared.testing.',YD='com.google.gwt.touch.client.',OD='com.google.gwt.user.client.',VD='com.google.gwt.user.client.impl.',ID='com.google.gwt.user.client.ui.',KD='com.google.web.bindery.event.shared.',JB='dir',rC='display',sB='div',pB='function',tD='g',oD='genex-button',HD='genex.client.gx.',$D='genex.client.problems.',ZD='genex.client.requirements.',nD='genex_container',VB='height',jB='hidden',LB='ie8',ED='java.lang.',QD='java.util.',$B='left',KB='ltr',hD='mature-',AB='mousedown',BB='mousemove',CB='mouseout',DB='mouseover',EB='mouseup',BC='msie',sC='none',_C='none\n',mB='null',gB='offsetHeight',hB='offsetWidth',OB='onclick',TB='onload',wC='onresize',AC='opera',iB='overflow',mC='popupContent',aC='position',eC='px',vC='px, ',gC='rect(0px, 0px, 0px, 0px)',xC='relative',SB='return function() { w.__gwt_dispatchUnhandledEvent_',uB='rtl',NB='scroll',bC='table',cC='tbody',lC='td',_B='top',FB='touchcancel',GB='touchend',HB='touchmove',IB='touchstart',kC='tr',CD='value',pC='verticalAlign',dC='visibility',hC='visible',QB='w',UB='width',yC='zoom',ZC='|';var _,Mm={},UA={25:1,27:1},cB={60:1},PA={6:1,9:1,50:1,53:1,54:1},KA={50:1},HA={},ZA={46:1},aB={52:1},eB={50:1,57:1},WA={24:1,29:1,37:1,40:1,41:1,43:1,45:1},bB={58:1},$A={11:1,27:1},RA={29:1},SA={47:1,50:1,56:1},LA={50:1,56:1},OA={6:1,8:1,50:1,53:1,54:1},dB={59:1},NA={6:1,7:1,50:1,53:1,54:1},MA={5:1,6:1,50:1,53:1,54:1},VA={23:1,27:1},YA={44:1,50:1,53:1,54:1},IA={4:1,50:1},TA={27:1,36:1},JA={38:1},XA={24:1,29:1,37:1,40:1,41:1,42:1,43:1,45:1},_A={49:1},QA={10:1,50:1,53:1,54:1};Nm(1,-1,HA);_.eQ=function s(a){return this===a};_.gC=function t(){return this.cZ};_.hC=function u(){return Ib(this)};_.tS=function v(){return this.cZ.c+'@'+bx(this.hC())};_.toString=function(){return this.tS()};_.tM=GA;Nm(3,1,{});_.k=-1;_.n=false;_.o=false;_.p=null;_.q=-1;_.r=null;_.s=-1;_.t=false;Nm(4,1,{},C);_.a=null;Nm(5,1,{});Nm(6,1,{2:1});Nm(7,5,{});var G=null;Nm(8,7,{},M);Nm(10,1,JA);_.I=function W(){this.b||Rz(P,this);this.J()};_.b=false;_.c=0;var P;Nm(9,10,JA,X);_.J=function Y(){L(this.a)};_.a=null;Nm(11,6,{2:1,3:1},ab);_.a=null;_.b=null;Nm(12,1,{},db);Nm(17,1,LA);_.K=function kb(){return this.e};_.tS=function lb(){var a,b;a=this.cZ.c;b=this.K();return b!=null?a+kB+b:a};_.e=null;Nm(16,17,LA);Nm(15,16,LA,mb);Nm(14,15,LA,ob);_.K=function ub(){this.c==null&&(this.d=rb(this.b),this.a=this.a+kB+pb(this.b),this.c=oB+this.d+') '+tb(this.b)+this.a,undefined);return this.c};_.a=lB;_.b=null;_.c=null;_.d=null;Nm(21,1,{});var zb=0,Ab=0,Bb=0,Cb=-1;Nm(23,21,{},Ub);_.a=null;_.b=null;_.c=null;_.d=false;_.e=null;_.f=null;_.g=null;_.i=false;var Mb;Nm(24,1,{},_b);_.L=function ac(){this.a.d=true;Qb(this.a);this.a.d=false;return this.a.i=Rb(this.a)};_.a=null;Nm(25,1,{},cc);_.L=function dc(){this.a.d&&Zb(this.a.e,1);return this.a.i};_.a=null;Nm(28,1,{},kc);_.N=function lc(a){return ec(a)};var Fc=null;Nm(45,1,{50:1,53:1,54:1});_.eQ=function cd(a){return this===a};_.hC=function dd(){return Ib(this)};_.tS=function ed(){return this.a};_.a=null;_.b=0;Nm(44,45,MA);var fd,gd,hd,id,jd;Nm(46,44,MA,nd);Nm(47,44,MA,pd);Nm(48,44,MA,rd);Nm(49,44,MA,td);Nm(50,45,NA);var vd,wd,xd,yd,zd;Nm(51,50,NA,Dd);Nm(52,50,NA,Fd);Nm(53,50,NA,Hd);Nm(54,50,NA,Jd);Nm(55,45,OA);var Ld,Md,Nd,Od,Pd;Nm(56,55,OA,Td);Nm(57,55,OA,Vd);Nm(58,55,OA,Xd);Nm(59,55,OA,Zd);Nm(60,45,PA);var _d,ae,be,ce,de;Nm(61,60,PA,he);Nm(62,60,PA,je);Nm(63,60,PA,le);Nm(64,60,PA,ne);Nm(65,45,QA);var pe,qe,re,se,te,ue,ve,we,xe,ye;Nm(66,65,QA,Ce);Nm(67,65,QA,Ee);Nm(68,65,QA,Ge);Nm(69,65,QA,Ie);Nm(70,65,QA,Ke);Nm(71,65,QA,Me);Nm(72,65,QA,Oe);Nm(73,65,QA,Qe);Nm(74,65,QA,Se);Nm(80,1,{});_.tS=function Ze(){return 'An event type'};_.f=null;Nm(79,80,{});_.Q=function _e(){this.e=false;this.f=null};_.e=false;Nm(78,79,{});_.P=function ef(){return this.R()};_.a=null;_.b=null;var af=null;Nm(77,78,{});Nm(76,77,{});Nm(75,76,{},kf);_.O=function lf(a){hi(a,11).S(this)};_.R=function mf(){return hf};var hf;Nm(83,1,{});_.hC=function rf(){return this.c};_.tS=function sf(){return 'Event type'};_.c=0;var qf=0;Nm(82,83,{},tf);Nm(81,82,{12:1},uf);_.a=null;_.b=null;Nm(84,76,{},zf);_.O=function Af(a){yf(this,hi(a,13))};_.R=function Bf(){return wf};var wf;Nm(85,76,{},Gf);_.O=function Hf(a){Ff(this,hi(a,14))};_.R=function If(){return Df};var Df;Nm(86,76,{},Mf);_.O=function Nf(a){hi(hi(a,15),39)};_.R=function Of(){return Kf};var Kf;Nm(87,76,{},Sf);_.O=function Tf(a){hi(hi(a,16),39)};_.R=function Uf(){return Qf};var Qf;Nm(88,76,{},Zf);_.O=function $f(a){Yf(this,hi(a,17))};_.R=function _f(){return Wf};var Wf;Nm(89,1,{},dg);_.a=null;Nm(92,77,{});var gg=null;Nm(91,92,{},jg);_.O=function kg(a){yn(hi(hi(a,18),34).a)};_.R=function lg(){return hg};var hg;Nm(93,92,{},pg);_.O=function qg(a){yn(hi(hi(a,19),33).a)};_.R=function rg(){return ng};var ng;Nm(94,1,{},tg);Nm(95,92,{},yg);_.O=function zg(a){xg(this,hi(a,20))};_.R=function Ag(){return vg};var vg;Nm(96,92,{},Fg);_.O=function Gg(a){Eg(this,hi(a,21))};_.R=function Hg(){return Cg};var Cg;Nm(97,79,{},Lg);_.O=function Mg(a){Kg(this,hi(a,22))};_.P=function Og(){return Jg};_.a=false;var Jg=null;Nm(98,79,{},Rg);_.O=function Sg(a){hi(a,23).T(this)};_.P=function Ug(){return Qg};var Qg=null;Nm(99,79,{},Xg);_.O=function Yg(a){hi(a,25).U(this)};_.P=function $g(){return Wg};_.a=0;var Wg=null;Nm(100,79,{},ch);_.O=function dh(a){bh(hi(a,26))};_.P=function fh(){return ah};var ah=null;Nm(101,1,RA,kh,lh);_.V=function mh(a){ih(this,a)};_.a=null;_.b=null;Nm(104,1,{});Nm(103,104,{});_.a=null;_.b=0;_.c=false;Nm(102,103,{},Bh);Nm(105,1,{28:1},Dh);_.a=null;Nm(107,15,SA,Gh);_.a=null;Nm(106,107,SA,Jh);Nm(108,1,{27:1},Lh);Nm(110,45,{30:1,50:1,53:1,54:1},Uh);var Ph,Qh,Rh,Sh;Nm(111,1,{},Wh);_.qI=0;var ai,bi;Nm(120,1,{});Nm(121,1,{},Tm);var Sm=null;Nm(122,120,{},Wm);var Vm=null;Nm(123,1,{},$m);Nm(124,1,{},dn);_.a=0;_.b=0;_.c=null;_.d=null;_.e=null;Nm(125,1,{32:1},jn,kn);_.eQ=function ln(a){var b;if(!ji(a,32)){return false}b=hi(a,32);return this.a==b.a&&this.b==b.b};_.hC=function mn(){return ni(this.a)^ni(this.b)};_.tS=function nn(){return 'Point('+this.a+','+this.b+MB};_.a=0;_.b=0;Nm(126,1,{},Hn);_.a=null;_.b=null;_.c=false;_.f=null;_.g=null;_.n=null;_.o=null;_.p=null;_.r=false;_.s=null;var pn=null;Nm(127,1,{22:1,27:1},Jn);_.a=null;Nm(128,1,{21:1,27:1},Ln);_.a=null;Nm(129,1,{20:1,27:1},Nn);_.a=null;Nm(130,1,{19:1,27:1,33:1},Pn);_.a=null;Nm(131,1,{18:1,27:1,34:1},Rn);_.a=null;Nm(132,1,TA,Tn);_.W=function Un(a){var b;if(1==dp(a.d.type)){b=new jn(a.d.clientX||0,a.d.clientY||0);if(vn(this.a,b)||wn(this.a,b)){a.a=true;a.d.cancelBubble=true;Ic(a.d)}}};_.a=null;Nm(133,1,{},Xn);_.L=function Yn(){var a,b,c,d,e,f,g;if(this!=this.e.g){Wn(this);return false}a=cb(this.a);bn(this.d,a-this.c);this.c=a;an(this.d,a);e=Zm(this.d);e||Wn(this);Fn(this.e,this.d.d);d=ni(this.d.d.a);c=st(this.e.s);b=qt(this.e.s);f=rt(this.e.s);g=ni(this.d.d.b);if((f<=g||0>=g)&&(b<=d||c>=d)){Wn(this);return false}return e};_.c=0;_.d=null;_.e=null;_.f=null;Nm(134,1,UA,$n);_.U=function _n(a){Wn(this.a)};_.a=null;Nm(135,1,{},bo);_.L=function co(){var a,b,c;a=eb();b=new sz(this.a.q);while(b.b<b.d.zb()){c=hi(qz(b),35);a-c.b>=2500&&rz(b)}return this.a.q.b!=0};_.a=null;Nm(136,1,{35:1},go,ho);_.a=null;_.b=0;var io=null,jo=null;var ro=null;Nm(141,79,{},yo);_.O=function zo(a){hi(a,36).W(this);vo.c=false};_.P=function Bo(){return uo};_.Q=function Co(){wo(this)};_.a=false;_.b=false;_.c=false;_.d=null;var uo=null,vo=null;var Do=null;Nm(143,1,VA,Ho);_.T=function Io(a){while((Q(),P).b>0){R(hi(Oz(P,0),38))}};var Jo=false,Ko=null,Lo=0,Mo=0,No=false;Nm(145,79,{},Zo);_.O=function $o(a){oi(a);null.Jb()};_.P=function _o(){return Xo};var Xo;Nm(146,101,RA,bp);var cp=false;var gp=null,hp=null,ip=null,jp=null;Nm(149,1,RA,sp);_.Y=function tp(a){return decodeURI(a.replace('%23','#'))};_.V=function up(a){ih(this.a,a)};_.Z=function vp(a){a=a==null?lB:a;if(!ox(a,pp==null?lB:pp)){pp=a;eh(this)}};var pp=lB;Nm(152,1,{},zp);_.M=function Ap(){$wnd.__gwt_initWindowCloseHandler(fB(Uo),fB(To))};Nm(153,1,{},Cp);_.M=function Dp(){$wnd.__gwt_initWindowResizeHandler(fB(Vo))};Nm(158,1,{40:1,43:1});_.$=function Np(){return this.H};_._=function Op(a){po(this.H,VB,a)};_.ab=function Rp(a){po(this.H,UB,a)};_.tS=function Sp(){if(!this.H){return '(null handle)'}return this.H.outerHTML};_.H=null;Nm(157,158,WA);_.bb=function aq(){};_.cb=function bq(){};_.V=function cq(a){Wp(this,a)};_.db=function dq(){Xp(this)};_.X=function eq(a){Yp(this,a)};_.eb=function fq(){Zp(this)};_.fb=function gq(){};_.gb=function hq(){};_.D=false;_.E=0;_.F=null;_.G=null;Nm(156,157,WA);_.bb=function jq(){zq(this,(xq(),vq))};_.cb=function kq(){zq(this,(xq(),wq))};Nm(155,156,WA);_.ib=function oq(){return new tu(this.f)};_.hb=function pq(a){return mq(this,a)};Nm(154,155,WA);_.hb=function tq(a){return rq(this,a)};Nm(159,106,SA,yq);var vq,wq;Nm(160,1,{},Bq);_.jb=function Cq(a){a.db()};Nm(161,1,{},Eq);_.jb=function Fq(a){a.eb()};Nm(164,157,WA);_.db=function Jq(){var a;Xp(this);a=this.H.tabIndex;-1==a&&(this.H.tabIndex=0,undefined)};Nm(163,164,WA);Nm(162,163,WA,Lq);Nm(165,155,WA);_.d=null;_.e=null;Nm(168,156,WA);_.kb=function Vq(){return this.H};_.ib=function Wq(){return new Et(this)};_.hb=function Xq(a){return Rq(this,a)};_.C=null;Nm(167,168,WA);_.kb=function fr(){return Dc(this.H)};_.$=function gr(){return Ec(Dc(this.H))};_.lb=function hr(){$q(this)};_.W=function ir(a){a.c&&(a.d,false)&&(a.a=true)};_.gb=function jr(){this.A&&Hs(this.z,false,true)};_._=function kr(a){this.o=a;_q(this);a.length==0&&(this.o=null)};_.ab=function lr(a){this.p=a;_q(this);a.length==0&&(this.p=null)};_.k=false;_.n=false;_.o=null;_.p=null;_.q=null;_.s=null;_.t=false;_.u=false;_.v=-1;_.w=false;_.x=null;_.y=false;_.A=false;_.B=-1;Nm(166,167,WA);_.bb=function nr(){Xp(this.j)};_.cb=function or(){Zp(this.j)};_.ib=function pr(){return new Et(this.j)};_.hb=function qr(a){return Rq(this.j,a)};_.j=null;Nm(169,168,WA,tr);_.kb=function vr(){return this.a};_.a=null;_.b=null;Nm(170,166,WA,Fr);_.bb=function Hr(){try{Xp(this.j)}finally{Xp(this.a)}};_.cb=function Ir(){try{Zp(this.j)}finally{Zp(this.a)}};_.lb=function Jr(){Ar(this)};_.X=function Kr(a){switch(dp(a.type)){case 4:case 8:case 64:case 16:case 32:if(!this.f&&!Br(this,a)){return}}Yp(this,a)};_.W=function Lr(a){var b;b=a.d;!a.a&&dp(a.d.type)==4&&Br(this,b)&&Ic(b);a.c&&(a.d,false)&&(a.a=true)};_.a=null;_.b=0;_.c=0;_.d=0;_.e=0;_.f=false;_.g=null;_.i=0;Nm(171,1,UA,Nr);_.U=function Or(a){this.a.i=a.a};_.a=null;Nm(175,157,WA);_.a=null;Nm(174,175,WA,Wr);Nm(173,174,WA,Yr,Zr);Nm(172,173,WA,$r);Nm(176,1,{13:1,14:1,15:1,16:1,17:1,27:1,39:1},as);_.a=null;Nm(177,1,{},ds);_.a=null;_.b=null;_.c=null;var es,fs,gs;Nm(178,1,{});Nm(179,178,{},ks);_.a=null;var ls;Nm(180,1,{},os);_.a=null;Nm(181,165,WA,rs);_.hb=function ss(a){var b,c;c=Ec(a.H);b=mq(this,a);b&&tc(this.b,c);return b};_.b=null;Nm(182,1,UA,vs);_.U=function ws(a){us()};Nm(183,1,TA,ys);_.W=function zs(a){ar(this.a,a)};_.a=null;Nm(184,1,{26:1,27:1},Bs);_.a=null;Nm(185,3,{},Is);_.a=null;_.b=false;_.c=false;_.d=0;_.e=-1;_.f=null;_.g=null;_.i=false;Nm(186,10,JA,Ks);_.J=function Ls(){this.a.g=null;x(this.a,eb())};_.a=null;Nm(188,154,XA,Us);var Qs,Rs,Ss;Nm(189,1,{},Zs);_.jb=function $s(a){a.D&&a.eb()};Nm(190,1,VA,at);_.T=function bt(a){Ws()};Nm(191,188,XA,dt);Nm(192,1,{});var ft=null;Nm(193,192,{},mt);var jt=null,kt=null;Nm(194,168,WA,wt);_.kb=function xt(){return this.a};_.db=function yt(){Xp(this);this.b.__listener=this};_.eb=function zt(){this.b.__listener=null;Zp(this)};_._=function At(a){po(this.H,VB,a)};_.ab=function Bt(a){po(this.H,UB,a)};_.a=null;_.b=null;_.c=null;Nm(195,1,{},Et);_.mb=function Ft(){return this.a};_.nb=function Gt(){return Dt(this)};_.ob=function Ht(){!!this.b&&this.c.hb(this.b)};_.b=null;_.c=null;Nm(198,164,WA);_.X=function Mt(a){var b;b=dp(a.type);(b&896)!=0?Yp(this,a):Yp(this,a)};_.fb=function Nt(){};Nm(197,198,WA);Nm(196,197,WA,Pt);Nm(199,45,YA);var St,Tt,Ut,Vt,Wt;Nm(200,199,YA,$t);Nm(201,199,YA,au);Nm(202,199,YA,cu);Nm(203,199,YA,eu);Nm(204,165,WA,hu);_.hb=function iu(a){var b,c;c=Ec(a.H);b=mq(this,a);b&&tc(this.d,Ec(c));return b};Nm(205,1,{},pu);_.ib=function qu(){return new tu(this)};_.a=null;_.b=null;_.c=0;Nm(206,1,{},tu);_.mb=function uu(){return this.a<this.b.c-1};_.nb=function vu(){return su(this)};_.ob=function wu(){if(this.a<0||this.a>=this.b.c){throw new Yw}this.b.b.hb(this.b.a[this.a--])};_.a=-1;_.b=null;Nm(210,1,{},Bu);_.a=null;_.b=null;_.c=null;Nm(211,1,ZA,Du);_.M=function Eu(){sh(this.a,this.c,this.b)};_.a=null;_.b=null;_.c=null;Nm(212,1,ZA,Gu);_.M=function Hu(){uh(this.a,this.c,this.b)};_.a=null;_.b=null;_.c=null;Nm(214,1,{},Lu);_.a=0;Nm(215,1,{},Nu);_.a=0;_.b=0;_.c=0;Nm(216,1,{},bv);_.a=null;_.b=null;_.c=null;_.d=null;_.e=null;_.f=0;_.g=0;_.i=0;_.j=null;_.k=null;_.n=null;_.o=0;_.p=0;_.q=null;_.r=null;_.s=null;_.t=0;Nm(217,1,{},mv);_.pb=function nv(a){var b,c;if(a==39){++this.d;this.d>this.a.length-1&&(this.d=this.a.length-1);b=iv(this,this.a,this.d);lv(this,b,this.d);this.b=b.b.b.length;b.b.f+1;dv(this)}if(a==37){--this.d;this.d<0&&(this.d=0);b=iv(this,this.a,this.d);lv(this,b,this.d);this.b=b.b.b.length;b.b.f+1;dv(this)}if(a==8||a==46){this.A=this.e;c=new Ox(this.a);Kx(c,this.d);this.a=rc(c.a);this.d>=0&&--this.d;b=iv(this,this.a,this.d);lv(this,b,this.d);this.e=Xu(b.b);this.b=b.b.b.length;dv(this)}};_.qb=function ov(a,b){var c,d;if(ox(a,pD)||ox(a,qD)||ox(a,rD)||ox(a,sD)){this.A=this.e;d=new Ox(this.a);Lx(d,this.d,a);this.a=rc(d.a);++this.d;c=iv(this,this.a,this.d);lv(this,c,this.d);this.e=Xu(c.b);this.b=c.b.b.length;c.b.f+1;dv(this)}if(ox(a,'a')||ox(a,tD)||ox(a,'c')||ox(a,'t')){this.A=this.e;d=new Ox(this.a);Mx(d,this.d,this.d+1,a.toUpperCase());this.a=rc(d.a);c=iv(this,this.a,this.d);lv(this,c,this.d);this.e=Xu(c.b);this.b=c.b.b.length;c.b.f+1;dv(this)}if(ox(a,uD)||ox(a,ZB)||ox(a,vD)||ox(a,PB)){if(ox(a,uD)||ox(a,vD)){++this.d;this.d>this.a.length-1&&(this.d=this.a.length-1)}else{--this.d;this.d<0&&(this.d=0)}c=iv(this,this.a,this.d);lv(this,c,this.d);this.b=c.b.b.length;c.b.f+1;dv(this)}if(b==39){++this.d;this.d>this.a.length-1&&(this.d=this.a.length-1);c=iv(this,this.a,this.d);lv(this,c,this.d);this.b=c.b.b.length;c.b.f+1;dv(this)}if(b==37){--this.d;this.d<0&&(this.d=0);c=iv(this,this.a,this.d);lv(this,c,this.d);this.b=c.b.b.length;c.b.f+1;dv(this)}};_.rb=function pv(a){var b;if(a>=0&&a<=this.b){b=iv(this,this.a,a);lv(this,b,a);this.b=b.b.b.length;this.d=a;dv(this)}};_.sb=function rv(a){var b;a!=null&&Lv(this.y,a);this.y.e=wD;this.y.g=xD;this.y.c=yD;this.y.b=zD;this.y.d=AD;this.f=this.y.a;this.a=this.y.a;this.b=this.a.length;this.C=this.y.e;this.D=this.y.f;this.G=this.y.g;this.u=this.y.c;this.t=this.y.b;this.z=this.y.d;(ox(this.u,sC)||ox(this.t,sC))&&(this.z=lB);b=iv(this,this.f,-1);this.g=b.b.e;this.i=b.b.q;this.b=b.b.b.length;this.e=Xu(b.b);Xr(this.r,b.a.b+'<\/pre><\/body><\/html>')};_.tb=function tv(a){var b,c,d,e,f;this.B=new aw;if(a==1){b=new yw;b.b=BD;$v(this.B,b);d=new vw;d.b='Your change does not make the mature mRNA shorter.';$v(this.B,d)}else if(a==2){b=new yw;b.b=BD;$v(this.B,b);d=new gw;d.b='Your change does not make the protein longer.';$v(this.B,d)}else if(a==3){b=new yw;b.b=BD;$v(this.B,b);d=new sw;d.b='Your change does not make the protein shorter.';$v(this.B,d)}else if(a==4){b=new yw;b.b=BD;$v(this.B,b);d=new mw;d.b='Your change does not prevent mRNA from being made.';$v(this.B,d);f=new jw;f.b='Your change does not prevent protein from being made';$v(this.B,f)}else if(a==5){c=new pw;c.a=15;c.b='Your protein does not have 5 amino acids.';$v(this.B,c);e=new dw;e.a=1;e.b='Your gene does not contain one intron.';$v(this.B,e)}};_.a=null;_.b=0;_.c=null;_.d=0;_.e=lB;_.f=null;_.g=lB;_.i=lB;_.j=null;_.k=null;_.n=false;_.o=null;_.p=null;_.q=null;_.r=null;_.s=null;_.t=null;_.u=null;_.v=null;_.w=null;_.x=null;_.z=null;_.A=lB;_.B=null;_.C=null;_.D=0;_.E=null;_.F=null;_.G=null;_.H=null;Nm(218,1,$A,wv);_.S=function xv(a){Ar(this.a.j);this.a.o.H[CD]=lB};_.a=null;Nm(219,1,{},zv);_.M=function Av(){fv(this.a);ev(this.a);gv(this.a);hv(this.a);typeof $wnd.genexIsReady===pB&&$wnd.genexIsReady()};_.a=null;Nm(220,1,$A,Cv);_.S=function Dv(a){var b,c;this.a.A=this.a.e;c=xc(this.a.o.H,CD);c=c.toUpperCase();c=sx(c,'[^AGCT]',lB);this.a.a=c;this.a.d=-1;b=iv(this.a,this.a.a,-1);lv(this.a,b,-1);this.a.e=Xu(b.b);this.a.b=b.b.b.length;Ar(this.a.j);dv(this.a)};_.a=null;Nm(221,1,$A,Fv);_.S=function Gv(a){var b;this.a.a=this.a.f;b=iv(this.a,this.a.a,-1);lv(this.a,b,-1);this.a.e=Xu(b.b);this.a.b=b.b.b.length;dv(this.a)};_.a=null;Nm(222,1,$A,Iv);_.S=function Jv(a){Yq(this.a.j)};_.a=null;Nm(223,1,{},Mv);_.a=null;_.b=null;_.c=null;_.d=null;_.e=null;_.f=0;_.g=null;Nm(224,1,{},Ov);_.a=null;_.b=null;Nm(225,1,{48:1},Sv);_.a=0;_.b=0;_.c=false;_.d=false;_.e=0;_.f=0;_.g=false;Nm(226,1,{},Uv);_.a=null;_.b=null;Nm(227,1,{},Xv);_.tS=function Yv(){return Wv(this)};_.a=null;_.b=0;_.c=null;_.d=null;_.e=0;_.f=null;_.g=null;_.i=null;Nm(228,1,{},aw);_.a=null;Nm(230,1,_A);_.b='unassigned';Nm(229,230,_A,dw);_.ub=function ew(a){return a.b==this.a+1};_.a=0;Nm(231,230,_A,gw);_.ub=function hw(a){return a.c.length>a.i.length};Nm(232,230,_A,jw);_.ub=function kw(a){return ox(a.c,lB)};Nm(233,230,_A,mw);_.ub=function nw(a){return ox(a.d,lB)};Nm(234,230,_A,pw);_.ub=function qw(a){return a.c.length==this.a};_.a=0;Nm(235,230,_A,sw);_.ub=function tw(a){return a.c.length<a.i.length};Nm(236,230,_A,vw);_.ub=function ww(a){return a.d.length<a.g.length};Nm(237,230,_A,yw);_.ub=function zw(a){var b,c,d,e;e=a.f;b=a.a;if(e.length!=b.length)return false;d=0;for(c=0;c<e.length;++c){e.charCodeAt(c)!=b.charCodeAt(c)&&++d}if(d==1)return true;return false};Nm(238,15,LA,Bw);Nm(239,1,{50:1,51:1,53:1},Gw);_.eQ=function Hw(a){return ji(a,51)&&hi(a,51).a==this.a};_.hC=function Iw(){return this.a?1231:1237};_.tS=function Jw(){return this.a?'true':'false'};_.a=false;var Dw,Ew;Nm(240,1,{},Lw);_.tS=function Sw(){return ((this.a&2)!=0?'interface ':(this.a&1)!=0?lB:'class ')+this.c};_.a=0;_.b=0;_.c=null;Nm(241,15,LA,Uw);Nm(242,15,LA,Ww);Nm(243,15,LA,Yw,Zw);Nm(244,15,LA,_w,ax);Nm(248,15,LA,fx,gx);var hx;Nm(250,1,{50:1,55:1},kx);_.tS=function lx(){return this.a+'.'+this.c+'(Unknown Source'+(this.b>=0?qB+this.b:lB)+MB};_.a=null;_.b=0;_.c=null;_=String.prototype;_.cM={1:1,50:1,52:1,53:1};_.eQ=function xx(a){return ox(this,a)};_.hC=function yx(){return Fx(this)};_.tS=_.toString;var Ax,Bx=0,Cx;Nm(252,1,aB,Nx,Ox);_.tS=function Px(){return rc(this.a)};Nm(253,1,aB,Sx);_.tS=function Tx(){return rc(this.a)};Nm(254,15,LA,Vx);Nm(255,1,{});_.vb=function Zx(a){throw new Vx('Add not supported on this collection')};_.wb=function $x(a){var b;b=Xx(this.ib(),a);return !!b};_.xb=function _x(){return this.zb()==0};_.yb=function ay(a){var b;b=Xx(this.ib(),a);if(b){b.ob();return true}else{return false}};_.tS=function by(){return Yx(this)};Nm(257,1,bB);_.eQ=function fy(a){var b,c,d,e,f;if(a===this){return true}if(!ji(a,58)){return false}e=hi(a,58);if(this.d!=e.d){return false}for(c=new Ny((new Fy(e)).a);pz(c.a);){b=c.b=hi(qz(c.a),59);d=b.Bb();f=b.Cb();if(!(d==null?this.c:ji(d,1)?qB+hi(d,1) in this.e:py(this,d,~~xb(d)))){return false}if(!FA(f,d==null?this.b:ji(d,1)?oy(this,hi(d,1)):ny(this,d,~~xb(d)))){return false}}return true};_.hC=function gy(){var a,b,c;c=0;for(b=new Ny((new Fy(this)).a);pz(b.a);){a=b.b=hi(qz(b.a),59);c+=a.hC();c=~~c}return c};_.tS=function hy(){var a,b,c,d;d='{';a=false;for(c=new Ny((new Fy(this)).a);pz(c.a);){b=c.b=hi(qz(c.a),59);a?(d+=DD):(a=true);d+=lB+b.Bb();d+=vD;d+=lB+b.Cb()}return d+'}'};Nm(256,257,bB);_.Ab=function zy(a,b){return mi(a)===mi(b)||a!=null&&wb(a,b)};_.a=null;_.b=null;_.c=false;_.d=0;_.e=null;Nm(259,255,cB);_.eQ=function Cy(a){var b,c,d;if(a===this){return true}if(!ji(a,60)){return false}c=hi(a,60);if(c.zb()!=this.zb()){return false}for(b=c.ib();b.mb();){d=b.nb();if(!this.wb(d)){return false}}return true};_.hC=function Dy(){var a,b,c;a=0;for(b=this.ib();b.mb();){c=b.nb();if(c!=null){a+=xb(c);a=~~a}}return a};Nm(258,259,cB,Fy);_.wb=function Gy(a){return Ey(this,a)};_.ib=function Hy(){return new Ny(this.a)};_.yb=function Iy(a){var b;if(Ey(this,a)){b=hi(a,59).Bb();vy(this.a,b);return true}return false};_.zb=function Jy(){return this.a.d};_.a=null;Nm(260,1,{},Ny);_.mb=function Oy(){return pz(this.a)};_.nb=function Py(){return Ly(this)};_.ob=function Qy(){My(this)};_.a=null;_.b=null;_.c=null;Nm(262,1,dB);_.eQ=function Ty(a){var b;if(ji(a,59)){b=hi(a,59);if(FA(this.Bb(),b.Bb())&&FA(this.Cb(),b.Cb())){return true}}return false};_.hC=function Uy(){var a,b;a=0;b=0;this.Bb()!=null&&(a=xb(this.Bb()));this.Cb()!=null&&(b=xb(this.Cb()));return a^b};_.tS=function Vy(){return this.Bb()+vD+this.Cb()};Nm(261,262,dB,Wy);_.Bb=function Xy(){return null};_.Cb=function Yy(){return this.a.b};_.Db=function Zy(a){return ty(this.a,a)};_.a=null;Nm(263,262,dB,_y);_.Bb=function az(){return this.a};_.Cb=function bz(){return oy(this.b,this.a)};_.Db=function cz(a){return uy(this.b,this.a,a)};_.a=null;_.b=null;Nm(264,255,{57:1});_.Eb=function ez(a,b){throw new Vx('Add not supported on this list')};_.vb=function fz(a){this.Eb(this.zb(),a);return true};_.eQ=function hz(a){var b,c,d,e,f;if(a===this){return true}if(!ji(a,57)){return false}f=hi(a,57);if(this.zb()!=f.zb()){return false}d=new sz(this);e=f.ib();while(d.b<d.d.zb()){b=qz(d);c=qz(e);if(!(b==null?c==null:wb(b,c))){return false}}return true};_.hC=function iz(){var a,b,c;b=1;a=new sz(this);while(a.b<a.d.zb()){c=qz(a);b=31*b+(c==null?0:xb(c));b=~~b}return b};_.ib=function kz(){return new sz(this)};_.Gb=function lz(){return new yz(this,0)};_.Hb=function mz(a){return new yz(this,a)};_.Ib=function nz(a){throw new Vx('Remove not supported on this list')};Nm(265,1,{},sz);_.mb=function tz(){return pz(this)};_.nb=function uz(){return qz(this)};_.ob=function vz(){rz(this)};_.b=0;_.c=-1;_.d=null;Nm(266,265,{},yz);_.a=null;Nm(267,259,cB,Bz);_.wb=function Cz(a){return ly(this.a,a)};_.ib=function Dz(){return Az(this)};_.zb=function Ez(){return this.b.a.d};_.a=null;_.b=null;Nm(268,1,{},Hz);_.mb=function Iz(){return pz(this.a.a)};_.nb=function Jz(){return Gz(this)};_.ob=function Kz(){My(this.a)};_.a=null;Nm(269,264,eB,Tz);_.Eb=function Uz(a,b){(a<0||a>this.b)&&jz(a,this.b);bA(this.a,a,0,b);++this.b};_.vb=function Vz(a){return Mz(this,a)};_.wb=function Wz(a){return Pz(this,a,0)!=-1};_.Fb=function Xz(a){return Oz(this,a)};_.xb=function Yz(){return this.b==0};_.Ib=function Zz(a){return Qz(this,a)};_.yb=function $z(a){return Rz(this,a)};_.zb=function _z(){return this.b};_.b=0;var cA;Nm(271,264,eB,fA);_.wb=function gA(a){return false};_.Fb=function hA(a){throw new _w};_.zb=function iA(){return 0};Nm(272,256,{50:1,58:1},lA);Nm(273,259,{50:1,60:1},qA);_.vb=function rA(a){return nA(this,a)};_.wb=function sA(a){return ly(this.a,a)};_.xb=function tA(){return this.a.d==0};_.ib=function uA(){return Az(ey(this.a))};_.yb=function vA(a){return pA(this,a)};_.zb=function wA(){return this.a.d};_.tS=function xA(){return Yx(ey(this.a))};_.a=null;Nm(274,262,dB,zA);_.Bb=function AA(){return this.a};_.Cb=function BA(){return this.b};_.Db=function CA(a){var b;b=this.b;this.b=a;return b};_.a=null;_.b=null;Nm(275,15,LA,EA);var fB=Fb;
 --></script>
 <script><!--
 var Wl=Nw(ED,'Object',1),zi=Nw(FD,'JavaScriptObject$',18),Gm=Mw(GD,'Object;',277),am=Nw(ED,'Throwable',17),Rl=Nw(ED,'Exception',16),Xl=Nw(ED,'RuntimeException',15),Yl=Nw(ED,'StackTraceElement',250),Hm=Mw(GD,'StackTraceElement;',278),Kj=Nw('com.google.gwt.lang.','SeedUtil',117),Ql=Nw(ED,'Enum',45),wl=Nw(HD,'GenexGWT',217),sl=Nw(HD,'GenexGWT$1',218),tl=Nw(HD,'GenexGWT$2',220),ul=Nw(HD,'GenexGWT$3',221),vl=Nw(HD,'GenexGWT$4',222),rl=Nw(HD,'GenexGWT$1DeferredCommand',219),Ai=Nw(FD,'Scheduler',21),Nl=Nw(ED,'Boolean',239),wm=Mw(lB,'[C',279),Pl=Nw(ED,'Class',240),_l=Nw(ED,nB,2),Im=Mw(GD,'String;',280),Ol=Nw(ED,'ClassCastException',241),$l=Nw(ED,'StringBuilder',253),Ml=Nw(ED,'ArrayStoreException',238),yi=Nw(FD,'JavaScriptException',14),Xk=Nw(ID,'UIObject',158),fl=Nw(ID,'Widget',157),Dk=Nw(ID,'LabelBase',175),Ek=Nw(ID,'Label',174),yk=Nw(ID,'HTML',173),zk=Nw(ID,'HasHorizontalAlignment$AutoHorizontalAlignmentConstant',178),Ak=Nw(ID,'HasHorizontalAlignment$HorizontalAlignmentConstant',179),Jj=Ow(JD,'HasDirection$Direction',110,Vh),Dm=Mw('[Lcom.google.gwt.i18n.client.','HasDirection$Direction;',281),Fk=Nw(ID,'Panel',156),Uk=Nw(ID,'SimplePanel',168),Sk=Nw(ID,'ScrollPanel',194),Tk=Nw(ID,'SimplePanel$1',195),pk=Nw(ID,'ComplexPanel',155),ik=Nw(ID,'AbsolutePanel',154),nl=Nw(KD,LD,107),Hj=Nw(MD,LD,106),lk=Nw(ID,'AttachDetachException',159),jk=Nw(ID,'AttachDetachException$1',160),kk=Nw(ID,'AttachDetachException$2',161),Pk=Nw(ID,'RootPanel',188),Ok=Nw(ID,'RootPanel$DefaultRootPanel',191),Mk=Nw(ID,'RootPanel$1',189),Nk=Nw(ID,'RootPanel$2',190),Lk=Nw(ID,'PopupPanel',167),qk=Nw(ID,'DecoratedPopupPanel',166),vk=Nw(ID,'DialogBox',170),tk=Nw(ID,'DialogBox$CaptionImpl',172),uk=Nw(ID,'DialogBox$MouseHandler',176),sk=Nw(ID,'DialogBox$1',171),wi=Nw(ND,'Animation',3),Kk=Nw(ID,'PopupPanel$ResizeAnimation',185),ck=Nw(OD,'Timer',10),Jk=Nw(ID,'PopupPanel$ResizeAnimation$1',186),Gk=Nw(ID,'PopupPanel$1',182),Hk=Nw(ID,'PopupPanel$3',183),Ik=Nw(ID,'PopupPanel$4',184),pi=Nw(ND,'Animation$1',4),vi=Nw(ND,'AnimationScheduler',5),qi=Nw(ND,'AnimationScheduler$AnimationHandle',6),bk=Nw(OD,'Timer$1',143),il=Nw(KD,'Event',80),Dj=Nw(MD,'GwtEvent',79),ak=Nw(OD,'Event$NativePreviewEvent',141),gl=Nw(KD,'Event$Type',83),Cj=Nw(MD,'GwtEvent$Type',82),ok=Nw(ID,'CellPanel',165),cl=Nw(ID,'VerticalPanel',204),Bk=Nw(ID,'HasVerticalAlignment$VerticalAlignmentConstant',180),xk=Nw(ID,'FocusWidget',164),bl=Nw(ID,'ValueBoxBase',198),Vk=Nw(ID,'TextBoxBase',197),Wk=Nw(ID,'TextBox',196),al=Ow(ID,'ValueBoxBase$TextAlignment',199,Yt),Em=Mw(PD,'ValueBoxBase$TextAlignment;',282),Yk=Ow(ID,'ValueBoxBase$TextAlignment$1',200,null),Zk=Ow(ID,'ValueBoxBase$TextAlignment$2',201,null),$k=Ow(ID,'ValueBoxBase$TextAlignment$3',202,null),_k=Ow(ID,'ValueBoxBase$TextAlignment$4',203,null),Ij=Nw(JD,'AutoDirectionHandler',108),mk=Nw(ID,'ButtonBase',163),nk=Nw(ID,'Button',162),Ck=Nw(ID,'HorizontalPanel',181),xl=Nw(HD,'GenexParams',223),om=Nw(QD,'AbstractMap',257),hm=Nw(QD,'AbstractHashMap',256),sm=Nw(QD,'HashMap',272),cm=Nw(QD,'AbstractCollection',255),pm=Nw(QD,'AbstractSet',259),em=Nw(QD,'AbstractHashMap$EntrySet',258),dm=Nw(QD,'AbstractHashMap$EntrySetIterator',260),nm=Nw(QD,'AbstractMapEntry',262),fm=Nw(QD,'AbstractHashMap$MapEntryNull',261),gm=Nw(QD,'AbstractHashMap$MapEntryString',263),mm=Nw(QD,'AbstractMap$1',267),lm=Nw(QD,'AbstractMap$1$1',268),tm=Nw(QD,'HashSet',273),jj=Nw(RD,'DomEvent',78),kj=Nw(RD,'HumanInputEvent',77),mj=Nw(RD,'MouseEvent',76),hj=Nw(RD,'ClickEvent',75),ij=Nw(RD,'DomEvent$Type',81),rk=Nw(ID,'DecoratorPanel',169),Di=Nw(SD,'SchedulerImpl',23),Bi=Nw(SD,'SchedulerImpl$Flusher',24),Ci=Nw(SD,'SchedulerImpl$Rescuer',25),Ei=Nw(SD,'StackTraceCreator$Collector',28),xi=Nw(FD,'Duration',12),gj=Ow(TD,'Style$Unit',65,Ae),Cm=Mw(UD,'Style$Unit;',283),Ji=Ow(TD,'Style$Display',44,ld),ym=Mw(UD,'Style$Display;',284),Oi=Ow(TD,'Style$Overflow',50,Bd),zm=Mw(UD,'Style$Overflow;',285),Ti=Ow(TD,'Style$Position',55,Rd),Am=Mw(UD,'Style$Position;',286),Yi=Ow(TD,'Style$TextAlign',60,fe),Bm=Mw(UD,'Style$TextAlign;',287),Zi=Ow(TD,'Style$Unit$1',66,null),$i=Ow(TD,'Style$Unit$2',67,null),_i=Ow(TD,'Style$Unit$3',68,null),aj=Ow(TD,'Style$Unit$4',69,null),bj=Ow(TD,'Style$Unit$5',70,null),cj=Ow(TD,'Style$Unit$6',71,null),dj=Ow(TD,'Style$Unit$7',72,null),ej=Ow(TD,'Style$Unit$8',73,null),fj=Ow(TD,'Style$Unit$9',74,null),Fi=Ow(TD,'Style$Display$1',46,null),Gi=Ow(TD,'Style$Display$2',47,null),Hi=Ow(TD,'Style$Display$3',48,null),Ii=Ow(TD,'Style$Display$4',49,null),Ki=Ow(TD,'Style$Overflow$1',51,null),Li=Ow(TD,'Style$Overflow$2',52,null),Mi=Ow(TD,'Style$Overflow$3',53,null),Ni=Ow(TD,'Style$Overflow$4',54,null),Pi=Ow(TD,'Style$Position$1',56,null),Qi=Ow(TD,'Style$Position$2',57,null),Ri=Ow(TD,'Style$Position$3',58,null),Si=Ow(TD,'Style$Position$4',59,null),Ui=Ow(TD,'Style$TextAlign$1',61,null),Vi=Ow(TD,'Style$TextAlign$2',62,null),Wi=Ow(TD,'Style$TextAlign$3',63,null),Xi=Ow(TD,'Style$TextAlign$4',64,null),wk=Nw(ID,'DirectionalTextHelper',177),bm=Nw(ED,'UnsupportedOperationException',254),Tl=Nw(ED,'IllegalStateException',243),dk=Nw(OD,'Window$ClosingEvent',145),Fj=Nw(MD,'HandlerManager',101),ek=Nw(OD,'Window$WindowHandlers',146),hl=Nw(KD,'EventBus',104),ml=Nw(KD,'SimpleEventBus',103),Ej=Nw(MD,'HandlerManager$Bus',102),jl=Nw(KD,'SimpleEventBus$1',210),kl=Nw(KD,'SimpleEventBus$2',211),ll=Nw(KD,'SimpleEventBus$3',212),el=Nw(ID,'WidgetCollection',205),Fm=Mw(PD,'Widget;',288),dl=Nw(ID,'WidgetCollection$WidgetIterator',206),Vl=Nw(ED,'NullPointerException',248),Sl=Nw(ED,'IllegalArgumentException',242),Rk=Nw(ID,'ScrollImpl',192),Qk=Nw(ID,'ScrollImpl$ScrollImplTrident',193),Zl=Nw(ED,'StringBuffer',252),gk=Nw(VD,'WindowImplIE$1',152),hk=Nw(VD,'WindowImplIE$2',153),zj=Nw(WD,'CloseEvent',98),yj=Nw(WD,'AttachEvent',97),lj=Nw(RD,'MouseDownEvent',84),qj=Nw(RD,'MouseUpEvent',88),nj=Nw(RD,'MouseMoveEvent',85),pj=Nw(RD,'MouseOverEvent',87),oj=Nw(RD,'MouseOutEvent',86),Lj=Nw('com.google.gwt.text.shared.','AbstractRenderer',120),Nj=Nw(XD,'PassthroughRenderer',122),Mj=Nw(XD,'PassthroughParser',121),rj=Nw(RD,'PrivateMap',89),Gj=Nw(MD,'LegacyHandlerWrapper',105),_j=Nw(YD,'TouchScroller',126),$j=Nw(YD,'TouchScroller$TemporalPoint',136),Yj=Nw(YD,'TouchScroller$MomentumCommand',133),Zj=Nw(YD,'TouchScroller$MomentumTouchRemovalCommand',135),Xj=Nw(YD,'TouchScroller$MomentumCommand$1',134),Rj=Nw(YD,'TouchScroller$1',127),Sj=Nw(YD,'TouchScroller$2',128),Tj=Nw(YD,'TouchScroller$3',129),Uj=Nw(YD,'TouchScroller$4',130),Vj=Nw(YD,'TouchScroller$5',131),Wj=Nw(YD,'TouchScroller$6',132),vm=Nw(QD,'NoSuchElementException',275),um=Nw(QD,'MapEntryImpl',274),Ul=Nw(ED,'IndexOutOfBoundsException',244),vj=Nw(RD,'TouchEvent',92),xj=Nw(RD,'TouchStartEvent',96),uj=Nw(RD,'TouchEvent$TouchSupportDetector',94),wj=Nw(RD,'TouchMoveEvent',95),tj=Nw(RD,'TouchEndEvent',93),sj=Nw(RD,'TouchCancelEvent',91),Oj=Nw(YD,'DefaultMomentum',123),Pj=Nw(YD,'Momentum$State',124),km=Nw(QD,'AbstractList',264),qm=Nw(QD,'ArrayList',269),im=Nw(QD,'AbstractList$IteratorImpl',265),jm=Nw(QD,'AbstractList$ListIteratorImpl',266),Al=Nw(HD,'VisibleGene',226),ql=Nw(HD,'Gene',216),Il=Nw(ZD,'Requirement',230),Hl=Nw(ZD,'ProteinLengthRequirement',234),Dl=Nw(ZD,'IntronNumberRequirement',229),Cl=Nw($D,'Problem',228),Ll=Nw(ZD,'SingleMutationRequirement',237),Kl=Nw(ZD,'ShortermRNARequirement',236),El=Nw(ZD,'LongerProteinRequirement',231),Jl=Nw(ZD,'ShorterProteinRequirement',235),Gl=Nw(ZD,'NomRNARequirement',233),Fl=Nw(ZD,'NoProteinRequirement',232),Aj=Nw(WD,'ResizeEvent',99),yl=Nw(HD,'HTMLContainer',224),fk=Nw(VD,'HistoryImpl',149),zl=Nw(HD,'Nucleotide',225),pl=Nw(HD,'Exon',215),Bl=Nw($D,'GenexState',227),Bj=Nw(WD,'ValueChangeEvent',100),rm=Nw(QD,'Collections$EmptyList',271),ol=Nw(HD,'ColorSequencer',214),ui=Nw(ND,'AnimationSchedulerImpl',7),ti=Nw(ND,'AnimationSchedulerImplTimer',8),si=Nw(ND,'AnimationSchedulerImplTimer$AnimationHandleImpl',11),xm=Mw('[Lcom.google.gwt.animation.client.','AnimationSchedulerImplTimer$AnimationHandleImpl;',289),ri=Nw(ND,'AnimationSchedulerImplTimer$1',9),Qj=Nw(YD,'Point',125);$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalEnd'});if ($wnd.genex) $wnd.genex.onScriptLoad();
diff --git a/common/static/js/capa/genex/1F433010E1134C95BF6CB43F552F3019.cache.html b/common/static/js/capa/genex/C7B18436BA03373FB13ED589C2CCF417.cache.html
similarity index 91%
rename from common/static/js/capa/genex/1F433010E1134C95BF6CB43F552F3019.cache.html
rename to common/static/js/capa/genex/C7B18436BA03373FB13ED589C2CCF417.cache.html
index 1e99fe0f19..13d25ddf09 100644
--- a/common/static/js/capa/genex/1F433010E1134C95BF6CB43F552F3019.cache.html
+++ b/common/static/js/capa/genex/C7B18436BA03373FB13ED589C2CCF417.cache.html
@@ -1,4 +1,4 @@
-<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.5.0";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '1F433010E1134C95BF6CB43F552F3019';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script><!--
+<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.5.0";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = 'C7B18436BA03373FB13ED589C2CCF417';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script><!--
 function L(){}
 function P(){}
 function _A(){}
@@ -642,7 +642,7 @@ function Bp(a,b){var c=(a.__eventBits||0)^b;a.__eventBits=b;if(!c)return;c&1&&(a
 function av(a){if(Ix(a,'UUU'))return $C;if(Ix(a,'UUC'))return $C;if(Ix(a,'UUA'))return _C;if(Ix(a,'UUG'))return _C;if(Ix(a,'CUU'))return _C;if(Ix(a,'CUC'))return _C;if(Ix(a,'CUA'))return _C;if(Ix(a,'CUG'))return _C;if(Ix(a,'AUU'))return aD;if(Ix(a,'AUC'))return aD;if(Ix(a,'AUA'))return aD;if(Ix(a,bD))return 'Met';if(Ix(a,'GUU'))return cD;if(Ix(a,'GUC'))return cD;if(Ix(a,'GUA'))return cD;if(Ix(a,'GUG'))return cD;if(Ix(a,'UCU'))return dD;if(Ix(a,'UCC'))return dD;if(Ix(a,'UCA'))return dD;if(Ix(a,'UCG'))return dD;if(Ix(a,'CCU'))return eD;if(Ix(a,'CCC'))return eD;if(Ix(a,'CCA'))return eD;if(Ix(a,'CCG'))return eD;if(Ix(a,'ACU'))return fD;if(Ix(a,'ACC'))return fD;if(Ix(a,'ACA'))return fD;if(Ix(a,'ACG'))return fD;if(Ix(a,'GCU'))return gD;if(Ix(a,'GCC'))return gD;if(Ix(a,'GCA'))return gD;if(Ix(a,'GCG'))return gD;if(Ix(a,'UAU'))return hD;if(Ix(a,'UAC'))return hD;if(Ix(a,'UAA'))return HB;if(Ix(a,'UAG'))return HB;if(Ix(a,'CAU'))return iD;if(Ix(a,'CAC'))return iD;if(Ix(a,'CAA'))return jD;if(Ix(a,'CAG'))return jD;if(Ix(a,'AAU'))return kD;if(Ix(a,'AAC'))return kD;if(Ix(a,'AAA'))return lD;if(Ix(a,'AAG'))return lD;if(Ix(a,'GAU'))return mD;if(Ix(a,'GAC'))return mD;if(Ix(a,'GAA'))return nD;if(Ix(a,'GAG'))return nD;if(Ix(a,'UGU'))return oD;if(Ix(a,'UGC'))return oD;if(Ix(a,'UGA'))return HB;if(Ix(a,'UGG'))return 'Trp';if(Ix(a,'CGU'))return pD;if(Ix(a,'CGC'))return pD;if(Ix(a,'CGA'))return pD;if(Ix(a,'CGG'))return pD;if(Ix(a,'AGU'))return dD;if(Ix(a,'AGC'))return dD;if(Ix(a,'AGA'))return pD;if(Ix(a,'AGG'))return pD;if(Ix(a,'GGU'))return qD;if(Ix(a,'GGC'))return qD;if(Ix(a,'GGA'))return qD;if(Ix(a,'GGG'))return qD;return HB}
 --></script>
 <script><!--
-var HB='',LB='\n',MB=' ',sD='    ',tD='    .    |',xD=' N-',JB='(',fC=')',RD='+',_D=', ',wC='-',HD="-3'\n",CD='-C',PC='0',EC='0px',XC='1',rD="5'-",$D=':',GB=': ',yD='<\/EM>',DD='<\/pre><h3>',zD='<\/u>',FD='<EM class=',BD='<EM class=selected>',vD='<font color=red>none<\/font>\n',AD='<u>',SD='=',GD='>',MD='A',XD='AAAAAAAAAAAAA',bD='AUG',gD='Ala',pD='Arg',kD='Asn',mD='Asp',OD='C',WD='CAAAG',PB='CENTER',OB='CSS1Compat',oD='Cys',kC='DOMMouseScroll',ND='G',UD='GGGGG',VD='GUGCG',jD='Gln',nD='Glu',qD='Gly',iD='His',ID='INCORRECT',aD='Ile',QB='JUSTIFY',RB='LEFT',_C='Leu',lD='Lys',uC='Null widget handle. If you are creating a composite, ensure that initWidget() has been called.',JD='OK',$C='Phe',eD='Pro',SB='RIGHT',MC='Selected Base = ',dD='Ser',IB='String',vC='Style names cannot be empty',PD='T',TD='TATAA',fD='Thr',hD='Tyr',hE='UmbrellaException',cD='Val',YD='You did not make a single base substitution.',qE='[Lcom.google.gwt.dom.client.',lE='[Lcom.google.gwt.user.client.ui.',cE='[Ljava.lang.',SC='absolute',NC='align',UC='auto',IC='cellPadding',HC='cellSpacing',tC='className',TB='click',jE='com.google.gwt.animation.client.',bE='com.google.gwt.core.client.',mE='com.google.gwt.core.client.impl.',pE='com.google.gwt.dom.client.',oE='com.google.gwt.event.dom.client.',rE='com.google.gwt.event.logical.shared.',iE='com.google.gwt.event.shared.',fE='com.google.gwt.i18n.client.',sE='com.google.gwt.text.shared.testing.',tE='com.google.gwt.touch.client.',kE='com.google.gwt.user.client.',wE='com.google.gwt.user.client.impl.',eE='com.google.gwt.user.client.ui.',gE='com.google.web.bindery.event.shared.',gC='dblclick',cC='dir',QC='display',_B='div',qC='dragexit',pC='dragleave',KB='function',QD='g',eC='gecko1_8',LD='genex-button',dE='genex.client.gx.',vE='genex.client.problems.',uE='genex.client.requirements.',KD='genex_container',nC='gesturechange',oC='gestureend',mC='gesturestart',sC='height',FB='hidden',aE='java.lang.',nE='java.util.',hC='keydown',iC='keypress',jC='keyup',xC='left',dC='ltr',ED='mature-',UB='mousedown',VB='mousemove',WB='mouseout',XB='mouseover',YB='mouseup',lC='mousewheel',ZC='msie',RC='none',wD='none\n',CB='offsetHeight',DB='offsetWidth',YC='opera',EB='overflow',LC='popupContent',zC='position',DC='px',TC='px, ',FC='rect(0px, 0px, 0px, 0px)',VC='relative',NB='rtl',AC='table',BC='tbody',KC='td',yC='top',ZB='touchcancel',$B='touchend',aC='touchmove',bC='touchstart',JC='tr',ZD='value',OC='verticalAlign',CC='visibility',GC='visible',rC='width',WC='zoom',uD='|';var _,Xm={},oB={25:1,27:1},yB={60:1},jB={6:1,9:1,50:1,53:1,54:1},eB={50:1},aB={},tB={46:1},wB={52:1},AB={50:1,57:1},bB={2:1},qB={24:1,29:1,37:1,40:1,41:1,43:1,45:1},xB={58:1},uB={11:1,27:1},lB={29:1},fB={50:1,56:1},mB={47:1,50:1,56:1},iB={6:1,8:1,50:1,53:1,54:1},zB={59:1},hB={6:1,7:1,50:1,53:1,54:1},gB={5:1,6:1,50:1,53:1,54:1},pB={23:1,27:1},sB={44:1,50:1,53:1,54:1},cB={4:1,50:1},nB={27:1,36:1},dB={38:1},rB={24:1,29:1,37:1,40:1,41:1,42:1,43:1,45:1},vB={49:1},kB={10:1,50:1,53:1,54:1};Ym(1,-1,aB);_.eQ=function s(a){return this===a};_.gC=function t(){return this.cZ};_.hC=function u(){return Sb(this)};_.tS=function v(){return this.cZ.d+'@'+vx(this.hC())};_.toString=function(){return this.tS()};_.tM=_A;Ym(3,1,{});_.n=-1;_.o=null;_.p=false;_.q=false;_.r=null;_.s=-1;_.t=null;_.u=-1;_.v=false;Ym(4,1,{},C);_.J=function D(a){B(this,a)};_.b=null;Ym(5,1,{});Ym(6,1,bB);Ym(7,5,{});var H=null;Ym(8,7,{},L);_.M=function M(){return !!$wnd.mozRequestAnimationFrame};_.K=function N(a,b){var c;c=new P;K(a,c);return c};Ym(9,6,bB,P);_.L=function Q(){this.b=true};_.b=false;Ym(10,7,{},U);_.M=function V(){return true};_.K=function W(a,b){var c;c=new jb(this,a);fA(this.b,c);this.b.c==1&&bb(this.c,16);return c};Ym(12,1,dB);_.N=function fb(){this.c||kA(Z,this);this.O()};_.c=false;_.d=0;var Z;Ym(11,12,dB,gb);_.O=function hb(){T(this.b)};_.b=null;Ym(13,6,{2:1,3:1},jb);_.L=function kb(){S(this.c,this)};_.b=null;_.c=null;Ym(14,1,{},nb);Ym(19,1,fB);_.P=function ub(){return this.f};_.tS=function vb(){var a,b;a=this.cZ.d;b=this.P();return b!=null?a+GB+b:a};_.f=null;Ym(18,19,fB);Ym(17,18,fB,wb);Ym(16,17,fB,yb);_.P=function Eb(){this.d==null&&(this.e=Bb(this.c),this.b=this.b+GB+zb(this.c),this.d=JB+this.e+') '+Db(this.c)+this.b,undefined);return this.d};_.b=HB;_.c=null;_.d=null;_.e=null;Ym(23,1,{});var Jb=0,Kb=0,Lb=0,Mb=-1;Ym(25,23,{},cc);_.b=null;_.c=null;_.d=null;_.e=false;_.f=null;_.g=null;_.i=null;_.j=false;var Wb;Ym(26,1,{},jc);_.Q=function kc(){this.b.e=true;$b(this.b);this.b.e=false;return this.b.j=_b(this.b)};_.b=null;Ym(27,1,{},mc);_.Q=function nc(){this.b.e&&hc(this.b.f,1);return this.b.j};_.b=null;Ym(32,1,{});Ym(33,32,{},zc);_.b=HB;Ym(47,1,{50:1,53:1,54:1});_.eQ=function kd(a){return this===a};_.hC=function ld(){return Sb(this)};_.tS=function md(){return this.b};_.b=null;_.c=0;Ym(46,47,gB);var nd,od,pd,qd,rd;Ym(48,46,gB,vd);Ym(49,46,gB,xd);Ym(50,46,gB,zd);Ym(51,46,gB,Bd);Ym(52,47,hB);var Dd,Ed,Fd,Gd,Hd;Ym(53,52,hB,Ld);Ym(54,52,hB,Nd);Ym(55,52,hB,Pd);Ym(56,52,hB,Rd);Ym(57,47,iB);var Td,Ud,Vd,Wd,Xd;Ym(58,57,iB,_d);Ym(59,57,iB,be);Ym(60,57,iB,de);Ym(61,57,iB,fe);Ym(62,47,jB);var he,ie,je,ke,le;Ym(63,62,jB,pe);Ym(64,62,jB,re);Ym(65,62,jB,te);Ym(66,62,jB,ve);Ym(67,47,kB);var xe,ye,ze,Ae,Be,Ce,De,Ee,Fe,Ge;Ym(68,67,kB,Ke);Ym(69,67,kB,Me);Ym(70,67,kB,Oe);Ym(71,67,kB,Qe);Ym(72,67,kB,Se);Ym(73,67,kB,Ue);Ym(74,67,kB,We);Ym(75,67,kB,Ye);Ym(76,67,kB,$e);Ym(82,1,{});_.tS=function ff(){return 'An event type'};_.g=null;Ym(81,82,{});_.U=function hf(){this.f=false;this.g=null};_.f=false;Ym(80,81,{});_.T=function nf(){return this.V()};_.b=null;_.c=null;var jf=null;Ym(79,80,{});Ym(78,79,{});Ym(77,78,{},sf);_.S=function tf(a){pi(a,11).W(this)};_.V=function uf(){return qf};var qf;Ym(85,1,{});_.hC=function zf(){return this.d};_.tS=function Af(){return 'Event type'};_.d=0;var yf=0;Ym(84,85,{},Bf);Ym(83,84,{12:1},Cf);_.b=null;_.c=null;Ym(86,78,{},Hf);_.S=function If(a){Gf(this,pi(a,13))};_.V=function Jf(){return Ef};var Ef;Ym(87,78,{},Of);_.S=function Pf(a){Nf(this,pi(a,14))};_.V=function Qf(){return Lf};var Lf;Ym(88,78,{},Uf);_.S=function Vf(a){pi(pi(a,15),39)};_.V=function Wf(){return Sf};var Sf;Ym(89,78,{},$f);_.S=function _f(a){pi(pi(a,16),39)};_.V=function ag(){return Yf};var Yf;Ym(90,78,{},fg);_.S=function gg(a){eg(this,pi(a,17))};_.V=function hg(){return cg};var cg;Ym(91,1,{},lg);_.b=null;Ym(94,79,{});var og=null;Ym(93,94,{},rg);_.S=function sg(a){Jn(pi(pi(a,18),34).b)};_.V=function tg(){return pg};var pg;Ym(95,94,{},xg);_.S=function yg(a){Jn(pi(pi(a,19),33).b)};_.V=function zg(){return vg};var vg;Ym(96,1,{},Bg);Ym(97,94,{},Gg);_.S=function Hg(a){Fg(this,pi(a,20))};_.V=function Ig(){return Dg};var Dg;Ym(98,94,{},Ng);_.S=function Og(a){Mg(this,pi(a,21))};_.V=function Pg(){return Kg};var Kg;Ym(99,81,{},Tg);_.S=function Ug(a){Sg(this,pi(a,22))};_.T=function Wg(){return Rg};_.b=false;var Rg=null;Ym(100,81,{},Zg);_.S=function $g(a){pi(a,23).X(this)};_.T=function ah(){return Yg};var Yg=null;Ym(101,81,{},dh);_.S=function eh(a){pi(a,25).Y(this)};_.T=function gh(){return ch};_.b=0;var ch=null;Ym(102,81,{},kh);_.S=function lh(a){jh(pi(a,26))};_.T=function nh(){return ih};var ih=null;Ym(103,1,lB,sh,th);_.Z=function uh(a){qh(this,a)};_.b=null;_.c=null;Ym(106,1,{});Ym(105,106,{});_.b=null;_.c=0;_.d=false;Ym(104,105,{},Jh);Ym(107,1,{28:1},Lh);_.b=null;Ym(109,17,mB,Oh);_.b=null;Ym(108,109,mB,Rh);Ym(110,1,{27:1},Th);Ym(112,47,{30:1,50:1,53:1,54:1},ai);var Xh,Yh,Zh,$h;Ym(113,1,{},ci);_.qI=0;var ii,ji;Ym(122,1,{});Ym(123,1,{},cn);var bn=null;Ym(124,122,{},fn);var en=null;Ym(125,1,{},kn);Ym(126,1,{},pn);_.b=0;_.c=0;_.d=null;_.e=null;_.f=null;Ym(127,1,{32:1},un,vn);_.eQ=function wn(a){var b;if(!ri(a,32)){return false}b=pi(a,32);return this.b==b.b&&this.c==b.c};_.hC=function xn(){return vi(this.b)^vi(this.c)};_.tS=function yn(){return 'Point('+this.b+','+this.c+fC};_.b=0;_.c=0;Ym(128,1,{},Sn);_.b=null;_.c=null;_.d=false;_.g=null;_.i=null;_.o=null;_.p=null;_.q=null;_.s=false;_.t=null;var An=null;Ym(129,1,{22:1,27:1},Un);_.b=null;Ym(130,1,{21:1,27:1},Wn);_.b=null;Ym(131,1,{20:1,27:1},Yn);_.b=null;Ym(132,1,{19:1,27:1,33:1},$n);_.b=null;Ym(133,1,{18:1,27:1,34:1},ao);_.b=null;Ym(134,1,nB,co);_.$=function eo(a){var b;if(1==np(a.e.type)){b=new un(a.e.clientX||0,a.e.clientY||0);if(Gn(this.b,b)||Hn(this.b,b)){a.b=true;a.e.stopPropagation();a.e.preventDefault()}}};_.b=null;Ym(135,1,{},ho);_.Q=function io(){var a,b,c,d,e,f,g;if(this!=this.f.i){go(this);return false}a=mb(this.b);nn(this.e,a-this.d);this.d=a;mn(this.e,a);e=jn(this.e);e||go(this);Qn(this.f,this.e.e);d=vi(this.e.e.b);c=Dt(this.f.t);b=Bt(this.f.t);f=Ct(this.f.t);g=vi(this.e.e.c);if((f<=g||0>=g)&&(b<=d||c>=d)){go(this);return false}return e};_.d=0;_.e=null;_.f=null;_.g=null;Ym(136,1,oB,ko);_.Y=function lo(a){go(this.b)};_.b=null;Ym(137,1,{},no);_.Q=function oo(){var a,b,c;a=ob();b=new Nz(this.b.r);while(b.c<b.e.Db()){c=pi(Lz(b),35);a-c.c>=2500&&Mz(b)}return this.b.r.c!=0};_.b=null;Ym(138,1,{35:1},ro,so);_.b=null;_.c=0;var to=null,uo=null;var Co=null;Ym(143,81,{},Jo);_.S=function Ko(a){pi(a,36).$(this);Go.d=false};_.T=function Mo(){return Fo};_.U=function No(){Ho(this)};_.b=false;_.c=false;_.d=false;_.e=null;var Fo=null,Go=null;var Oo=null;Ym(145,1,pB,So);_.X=function To(a){while(($(),Z).c>0){ab(pi(hA(Z,0),38))}};var Uo=false,Vo=null,Wo=0,Xo=0,Yo=false;Ym(147,81,{},hp);_.S=function ip(a){wi(a);null.Nb()};_.T=function jp(){return fp};var fp;Ym(148,103,lB,lp);var mp=false;var rp=null,sp=null,tp=null,up=null,vp=null,wp=null;Ym(152,1,lB);_.ab=function Hp(a){return decodeURI(a.replace('%23','#'))};_.Z=function Ip(a){qh(this.b,a)};_.bb=function Jp(a){a=a==null?HB:a;if(!Ix(a,Fp==null?HB:Fp)){Fp=a;mh(this)}};var Fp=HB;Ym(154,152,lB);Ym(153,154,lB,Op);_.ab=function Pp(a){return a};Ym(160,1,{40:1,43:1});_.cb=function aq(){return this.I};_.db=function bq(a){Ao(this.I,sC,a)};_.eb=function eq(a){Ao(this.I,rC,a)};_.tS=function fq(){if(!this.I){return '(null handle)'}return Zc(this.I)};_.I=null;Ym(159,160,qB);_.fb=function pq(){};_.gb=function qq(){};_.Z=function rq(a){jq(this,a)};_.hb=function sq(){kq(this)};_._=function tq(a){lq(this,a)};_.ib=function uq(){mq(this)};_.jb=function vq(){};_.kb=function wq(){};_.E=false;_.F=0;_.G=null;_.H=null;Ym(158,159,qB);_.fb=function yq(){Oq(this,(Mq(),Kq))};_.gb=function zq(){Oq(this,(Mq(),Lq))};Ym(157,158,qB);_.mb=function Dq(){return new Eu(this.g)};_.lb=function Eq(a){return Bq(this,a)};Ym(156,157,qB);_.lb=function Iq(a){return Gq(this,a)};Ym(161,108,mB,Nq);var Kq,Lq;Ym(162,1,{},Qq);_.nb=function Rq(a){a.hb()};Ym(163,1,{},Tq);_.nb=function Uq(a){a.ib()};Ym(166,159,qB);_.hb=function Yq(){var a;kq(this);a=this.I.tabIndex;-1==a&&(this.I.tabIndex=0,undefined)};Ym(165,166,qB);Ym(164,165,qB,$q);Ym(167,157,qB);_.e=null;_.f=null;Ym(170,158,qB);_.ob=function ir(){return this.I};_.mb=function jr(){return new Pt(this)};_.lb=function kr(a){return er(this,a)};_.D=null;Ym(169,170,qB);_.ob=function vr(){return Lu(Mc(this.I))};_.cb=function wr(){return Mu(Mc(this.I))};_.pb=function xr(){or(this)};_.$=function yr(a){a.d&&(a.e,false)&&(a.b=true)};_.kb=function zr(){this.B&&Xs(this.A,false,true)};_.db=function Ar(a){this.p=a;pr(this);a.length==0&&(this.p=null)};_.eb=function Br(a){this.q=a;pr(this);a.length==0&&(this.q=null)};_.n=false;_.o=false;_.p=null;_.q=null;_.r=null;_.t=null;_.u=false;_.v=false;_.w=-1;_.x=false;_.y=null;_.z=false;_.B=false;_.C=-1;Ym(168,169,qB);_.fb=function Dr(){kq(this.k)};_.gb=function Er(){mq(this.k)};_.mb=function Fr(){return new Pt(this.k)};_.lb=function Gr(a){return er(this.k,a)};_.k=null;Ym(171,170,qB,Jr);_.ob=function Lr(){return this.b};_.b=null;_.c=null;Ym(172,168,qB,Vr);_.fb=function Xr(){try{kq(this.k)}finally{kq(this.b)}};_.gb=function Yr(){try{mq(this.k)}finally{mq(this.b)}};_.pb=function Zr(){Qr(this)};_._=function $r(a){switch(np(a.type)){case 4:case 8:case 64:case 16:case 32:if(!this.g&&!Rr(this,a)){return}}lq(this,a)};_.$=function _r(a){var b;b=a.e;!a.b&&np(a.e.type)==4&&Rr(this,b)&&(b.preventDefault(),undefined);a.d&&(a.e,false)&&(a.b=true)};_.b=null;_.c=0;_.d=0;_.e=0;_.f=0;_.g=false;_.i=null;_.j=0;Ym(173,1,oB,bs);_.Y=function cs(a){this.b.j=a.b};_.b=null;Ym(177,159,qB);_.b=null;Ym(176,177,qB,ks);Ym(175,176,qB,ms,ns);Ym(174,175,qB,os);Ym(178,1,{13:1,14:1,15:1,16:1,17:1,27:1,39:1},qs);_.b=null;Ym(179,1,{},ts);_.b=null;_.c=null;_.d=null;var us,vs,ws;Ym(180,1,{});Ym(181,180,{},As);_.b=null;var Bs;Ym(182,1,{},Es);_.b=null;Ym(183,167,qB,Hs);_.lb=function Is(a){var b,c;c=Nc(a.I);b=Bq(this,a);b&&Bc(this.c,c);return b};_.c=null;Ym(184,1,oB,Ls);_.Y=function Ms(a){Ks()};Ym(185,1,nB,Os);_.$=function Ps(a){qr(this.b,a)};_.b=null;Ym(186,1,{26:1,27:1},Rs);_.b=null;Ym(187,3,{},Ys);_.b=null;_.c=false;_.d=false;_.e=0;_.f=-1;_.g=null;_.i=null;_.j=false;Ym(188,12,dB,$s);_.O=function _s(){this.b.i=null;x(this.b,ob())};_.b=null;Ym(190,156,rB,it);var et,ft,gt;Ym(191,1,{},nt);_.nb=function ot(a){a.E&&a.ib()};Ym(192,1,pB,qt);_.X=function rt(a){kt()};Ym(193,190,rB,tt);Ym(194,1,{},zt);var vt=null;Ym(195,170,qB,Ht);_.ob=function It(){return this.b};_.hb=function Jt(){kq(this);this.c.__listener=this};_.ib=function Kt(){this.c.__listener=null;mq(this)};_.db=function Lt(a){Ao(this.I,sC,a)};_.eb=function Mt(a){Ao(this.I,rC,a)};_.b=null;_.c=null;_.d=null;Ym(196,1,{},Pt);_.qb=function Qt(){return this.b};_.rb=function Rt(){return Ot(this)};_.sb=function St(){!!this.c&&this.d.lb(this.c)};_.c=null;_.d=null;Ym(199,166,qB);_._=function Xt(a){var b;b=np(a.type);(b&896)!=0?lq(this,a):lq(this,a)};_.jb=function Yt(){};Ym(198,199,qB);Ym(197,198,qB,$t);Ym(200,47,sB);var bu,cu,du,eu,fu;Ym(201,200,sB,ju);Ym(202,200,sB,lu);Ym(203,200,sB,nu);Ym(204,200,sB,pu);Ym(205,167,qB,su);_.lb=function tu(a){var b,c;c=Nc(a.I);b=Bq(this,a);b&&Bc(this.e,Nc(c));return b};Ym(206,1,{},Au);_.mb=function Bu(){return new Eu(this)};_.b=null;_.c=null;_.d=0;Ym(207,1,{},Eu);_.qb=function Fu(){return this.b<this.c.d-1};_.rb=function Gu(){return Du(this)};_.sb=function Hu(){if(this.b<0||this.b>=this.c.d){throw new qx}this.c.c.lb(this.c.b[this.b--])};_.b=-1;_.c=null;var Iu;Ym(210,1,{},Qu);_.R=function Ru(){this.b.style[EB]=(Id(),UC)};_.b=null;Ym(213,1,{},Vu);_.b=null;_.c=null;_.d=null;Ym(214,1,tB,Xu);_.R=function Yu(){Ah(this.b,this.d,this.c)};_.b=null;_.c=null;_.d=null;Ym(215,1,tB,$u);_.R=function _u(){Ch(this.b,this.d,this.c)};_.b=null;_.c=null;_.d=null;Ym(217,1,{},dv);_.b=0;Ym(218,1,{},fv);_.b=0;_.c=0;_.d=0;Ym(219,1,{},vv);_.b=null;_.c=null;_.d=null;_.e=null;_.f=null;_.g=0;_.i=0;_.j=0;_.k=null;_.n=null;_.o=null;_.p=0;_.q=0;_.r=null;_.s=null;_.t=null;_.u=0;Ym(220,1,{},Gv);_.tb=function Hv(a){var b,c;if(a==39){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1);b=Cv(this,this.b,this.e);Fv(this,b,this.e);this.c=b.c.c.length;b.c.g+1;xv(this)}if(a==37){--this.e;this.e<0&&(this.e=0);b=Cv(this,this.b,this.e);Fv(this,b,this.e);this.c=b.c.c.length;b.c.g+1;xv(this)}if(a==8||a==46){this.B=this.f;c=new hy(this.b);dy(c,this.e);this.b=c.b.b;this.e>=0&&--this.e;b=Cv(this,this.b,this.e);Fv(this,b,this.e);this.f=pv(b.c);this.c=b.c.c.length;xv(this)}};_.ub=function Iv(a,b){var c,d;if(Ix(a,MD)||Ix(a,ND)||Ix(a,OD)||Ix(a,PD)){this.B=this.f;d=new hy(this.b);ey(d,this.e,a);this.b=d.b.b;++this.e;c=Cv(this,this.b,this.e);Fv(this,c,this.e);this.f=pv(c.c);this.c=c.c.c.length;c.c.g+1;xv(this)}if(Ix(a,'a')||Ix(a,QD)||Ix(a,'c')||Ix(a,'t')){this.B=this.f;d=new hy(this.b);fy(d,this.e,this.e+1,a.toUpperCase());this.b=d.b.b;c=Cv(this,this.b,this.e);Fv(this,c,this.e);this.f=pv(c.c);this.c=c.c.c.length;c.c.g+1;xv(this)}if(Ix(a,RD)||Ix(a,wC)||Ix(a,SD)||Ix(a,'_')){if(Ix(a,RD)||Ix(a,SD)){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1)}else{--this.e;this.e<0&&(this.e=0)}c=Cv(this,this.b,this.e);Fv(this,c,this.e);this.c=c.c.c.length;c.c.g+1;xv(this)}if(b==39){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1);c=Cv(this,this.b,this.e);Fv(this,c,this.e);this.c=c.c.c.length;c.c.g+1;xv(this)}if(b==37){--this.e;this.e<0&&(this.e=0);c=Cv(this,this.b,this.e);Fv(this,c,this.e);this.c=c.c.c.length;c.c.g+1;xv(this)}};_.vb=function Jv(a){var b;if(a>=0&&a<=this.c){b=Cv(this,this.b,a);Fv(this,b,a);this.c=b.c.c.length;this.e=a;xv(this)}};_.wb=function Lv(a){var b;a!=null&&dw(this.z,a);this.z.f=TD;this.z.i=UD;this.z.d=VD;this.z.c=WD;this.z.e=XD;this.g=this.z.b;this.b=this.z.b;this.c=this.b.length;this.D=this.z.f;this.E=this.z.g;this.H=this.z.i;this.v=this.z.d;this.u=this.z.c;this.A=this.z.e;(Ix(this.v,RC)||Ix(this.u,RC))&&(this.A=HB);b=Cv(this,this.g,-1);this.i=b.c.f;this.j=b.c.r;this.c=b.c.c.length;this.f=pv(b.c);ls(this.s,b.b.c+'<\/pre><\/body><\/html>')};_.xb=function Nv(a){var b,c,d,e,f;this.C=new uw;if(a==1){b=new Sw;b.c=YD;sw(this.C,b);d=new Pw;d.c='Your change does not make the mature mRNA shorter.';sw(this.C,d)}else if(a==2){b=new Sw;b.c=YD;sw(this.C,b);d=new Aw;d.c='Your change does not make the protein longer.';sw(this.C,d)}else if(a==3){b=new Sw;b.c=YD;sw(this.C,b);d=new Mw;d.c='Your change does not make the protein shorter.';sw(this.C,d)}else if(a==4){b=new Sw;b.c=YD;sw(this.C,b);d=new Gw;d.c='Your change does not prevent mRNA from being made.';sw(this.C,d);f=new Dw;f.c='Your change does not prevent protein from being made';sw(this.C,f)}else if(a==5){c=new Jw;c.b=c.b;c.c='Your protein does not have 5 amino acids.';sw(this.C,c);e=new xw;e.b=1;e.c='Your gene does not contain one intron.';sw(this.C,e)}};_.b=null;_.c=0;_.d=null;_.e=0;_.f=HB;_.g=null;_.i=HB;_.j=HB;_.k=null;_.n=null;_.o=false;_.p=null;_.q=null;_.r=null;_.s=null;_.t=null;_.u=null;_.v=null;_.w=null;_.x=null;_.y=null;_.A=null;_.B=HB;_.C=null;_.D=null;_.E=0;_.F=null;_.G=null;_.H=null;_.I=null;Ym(221,1,uB,Qv);_.W=function Rv(a){Qr(this.b.k);this.b.p.I[ZD]=HB};_.b=null;Ym(222,1,{},Tv);_.R=function Uv(){zv(this.b);yv(this.b);Av(this.b);Bv(this.b);typeof $wnd.genexIsReady===KB&&$wnd.genexIsReady()};_.b=null;Ym(223,1,uB,Wv);_.W=function Xv(a){var b,c;this.b.B=this.b.f;c=Hc(this.b.p.I,ZD);c=c.toUpperCase();c=Mx(c,'[^AGCT]',HB);this.b.b=c;this.b.e=-1;b=Cv(this.b,this.b.b,-1);Fv(this.b,b,-1);this.b.f=pv(b.c);this.b.c=b.c.c.length;Qr(this.b.k);xv(this.b)};_.b=null;Ym(224,1,uB,Zv);_.W=function $v(a){var b;this.b.b=this.b.g;b=Cv(this.b,this.b.b,-1);Fv(this.b,b,-1);this.b.f=pv(b.c);this.b.c=b.c.c.length;xv(this.b)};_.b=null;Ym(225,1,uB,aw);_.W=function bw(a){mr(this.b.k)};_.b=null;Ym(226,1,{},ew);_.b=null;_.c=null;_.d=null;_.e=null;_.f=null;_.g=0;_.i=null;Ym(227,1,{},gw);_.b=null;_.c=null;Ym(228,1,{48:1},kw);_.b=0;_.c=0;_.d=false;_.e=false;_.f=0;_.g=0;_.i=false;Ym(229,1,{},mw);_.b=null;_.c=null;Ym(230,1,{},pw);_.tS=function qw(){return ow(this)};_.b=null;_.c=0;_.d=null;_.e=null;_.f=0;_.g=null;_.i=null;_.j=null;Ym(231,1,{},uw);_.b=null;Ym(233,1,vB);_.c='unassigned';Ym(232,233,vB,xw);_.yb=function yw(a){return a.c==this.b+1};_.b=0;Ym(234,233,vB,Aw);_.yb=function Bw(a){return a.d.length>a.j.length};Ym(235,233,vB,Dw);_.yb=function Ew(a){return Ix(a.d,HB)};Ym(236,233,vB,Gw);_.yb=function Hw(a){return Ix(a.e,HB)};Ym(237,233,vB,Jw);_.yb=function Kw(a){return a.d.length==this.b};_.b=0;Ym(238,233,vB,Mw);_.yb=function Nw(a){return a.d.length<a.j.length};Ym(239,233,vB,Pw);_.yb=function Qw(a){return a.e.length<a.i.length};Ym(240,233,vB,Sw);_.yb=function Tw(a){var b,c,d,e;e=a.g;b=a.b;if(e.length!=b.length)return false;d=0;for(c=0;c<e.length;++c){e.charCodeAt(c)!=b.charCodeAt(c)&&++d}if(d==1)return true;return false};Ym(241,17,fB,Vw);Ym(242,1,{50:1,51:1,53:1},$w);_.eQ=function _w(a){return ri(a,51)&&pi(a,51).b==this.b};_.hC=function ax(){return this.b?1231:1237};_.tS=function bx(){return this.b?'true':'false'};_.b=false;var Xw,Yw;Ym(243,1,{},dx);_.tS=function kx(){return ((this.b&2)!=0?'interface ':(this.b&1)!=0?HB:'class ')+this.d};_.b=0;_.c=0;_.d=null;Ym(244,17,fB,mx);Ym(245,17,fB,ox);Ym(246,17,fB,qx,rx);Ym(247,17,fB,tx,ux);Ym(251,17,fB,zx,Ax);var Bx;Ym(253,1,{50:1,55:1},Ex);_.tS=function Fx(){return this.b+'.'+this.d+'(Unknown Source'+(this.c>=0?$D+this.c:HB)+fC};_.b=null;_.c=0;_.d=null;_=String.prototype;_.cM={1:1,50:1,52:1,53:1};_.eQ=function Sx(a){return Ix(this,a)};_.hC=function Tx(){return $x(this)};_.tS=_.toString;var Vx,Wx=0,Xx;Ym(255,1,wB,gy,hy);_.tS=function iy(){return this.b.b};Ym(256,1,wB,ly);_.tS=function my(){return this.b.b};Ym(257,17,fB,oy);Ym(258,1,{});_.zb=function sy(a){throw new oy('Add not supported on this collection')};_.Ab=function ty(a){var b;b=qy(this.mb(),a);return !!b};_.Bb=function uy(){return this.Db()==0};_.Cb=function vy(a){var b;b=qy(this.mb(),a);if(b){b.sb();return true}else{return false}};_.tS=function wy(){return ry(this)};Ym(260,1,xB);_.eQ=function Ay(a){var b,c,d,e,f;if(a===this){return true}if(!ri(a,58)){return false}e=pi(a,58);if(this.e!=e.e){return false}for(c=new gz((new $y(e)).b);Kz(c.b);){b=c.c=pi(Lz(c.b),59);d=b.Fb();f=b.Gb();if(!(d==null?this.d:ri(d,1)?$D+pi(d,1) in this.f:Ky(this,d,~~Hb(d)))){return false}if(!$A(f,d==null?this.c:ri(d,1)?Jy(this,pi(d,1)):Iy(this,d,~~Hb(d)))){return false}}return true};_.hC=function By(){var a,b,c;c=0;for(b=new gz((new $y(this)).b);Kz(b.b);){a=b.c=pi(Lz(b.b),59);c+=a.hC();c=~~c}return c};_.tS=function Cy(){var a,b,c,d;d='{';a=false;for(c=new gz((new $y(this)).b);Kz(c.b);){b=c.c=pi(Lz(c.b),59);a?(d+=_D):(a=true);d+=HB+b.Fb();d+=SD;d+=HB+b.Gb()}return d+'}'};Ym(259,260,xB);_.Eb=function Uy(a,b){return ui(a)===ui(b)||a!=null&&Gb(a,b)};_.b=null;_.c=null;_.d=false;_.e=0;_.f=null;Ym(262,258,yB);_.eQ=function Xy(a){var b,c,d;if(a===this){return true}if(!ri(a,60)){return false}c=pi(a,60);if(c.Db()!=this.Db()){return false}for(b=c.mb();b.qb();){d=b.rb();if(!this.Ab(d)){return false}}return true};_.hC=function Yy(){var a,b,c;a=0;for(b=this.mb();b.qb();){c=b.rb();if(c!=null){a+=Hb(c);a=~~a}}return a};Ym(261,262,yB,$y);_.Ab=function _y(a){return Zy(this,a)};_.mb=function az(){return new gz(this.b)};_.Cb=function bz(a){var b;if(Zy(this,a)){b=pi(a,59).Fb();Qy(this.b,b);return true}return false};_.Db=function cz(){return this.b.e};_.b=null;Ym(263,1,{},gz);_.qb=function hz(){return Kz(this.b)};_.rb=function iz(){return ez(this)};_.sb=function jz(){fz(this)};_.b=null;_.c=null;_.d=null;Ym(265,1,zB);_.eQ=function mz(a){var b;if(ri(a,59)){b=pi(a,59);if($A(this.Fb(),b.Fb())&&$A(this.Gb(),b.Gb())){return true}}return false};_.hC=function nz(){var a,b;a=0;b=0;this.Fb()!=null&&(a=Hb(this.Fb()));this.Gb()!=null&&(b=Hb(this.Gb()));return a^b};_.tS=function oz(){return this.Fb()+SD+this.Gb()};Ym(264,265,zB,pz);_.Fb=function qz(){return null};_.Gb=function rz(){return this.b.c};_.Hb=function sz(a){return Oy(this.b,a)};_.b=null;Ym(266,265,zB,uz);_.Fb=function vz(){return this.b};_.Gb=function wz(){return Jy(this.c,this.b)};_.Hb=function xz(a){return Py(this.c,this.b,a)};_.b=null;_.c=null;Ym(267,258,{57:1});_.Ib=function zz(a,b){throw new oy('Add not supported on this list')};_.zb=function Az(a){this.Ib(this.Db(),a);return true};_.eQ=function Cz(a){var b,c,d,e,f;if(a===this){return true}if(!ri(a,57)){return false}f=pi(a,57);if(this.Db()!=f.Db()){return false}d=new Nz(this);e=f.mb();while(d.c<d.e.Db()){b=Lz(d);c=Lz(e);if(!(b==null?c==null:Gb(b,c))){return false}}return true};_.hC=function Dz(){var a,b,c;b=1;a=new Nz(this);while(a.c<a.e.Db()){c=Lz(a);b=31*b+(c==null?0:Hb(c));b=~~b}return b};_.mb=function Fz(){return new Nz(this)};_.Kb=function Gz(){return new Tz(this,0)};_.Lb=function Hz(a){return new Tz(this,a)};_.Mb=function Iz(a){throw new oy('Remove not supported on this list')};Ym(268,1,{},Nz);_.qb=function Oz(){return Kz(this)};_.rb=function Pz(){return Lz(this)};_.sb=function Qz(){Mz(this)};_.c=0;_.d=-1;_.e=null;Ym(269,268,{},Tz);_.b=null;Ym(270,262,yB,Wz);_.Ab=function Xz(a){return Gy(this.b,a)};_.mb=function Yz(){return Vz(this)};_.Db=function Zz(){return this.c.b.e};_.b=null;_.c=null;Ym(271,1,{},aA);_.qb=function bA(){return Kz(this.b.b)};_.rb=function cA(){return _z(this)};_.sb=function dA(){fz(this.b)};_.b=null;Ym(272,267,AB,mA);_.Ib=function nA(a,b){(a<0||a>this.c)&&Ez(a,this.c);wA(this.b,a,0,b);++this.c};_.zb=function oA(a){return fA(this,a)};_.Ab=function pA(a){return iA(this,a,0)!=-1};_.Jb=function qA(a){return hA(this,a)};_.Bb=function rA(){return this.c==0};_.Mb=function sA(a){return jA(this,a)};_.Cb=function tA(a){return kA(this,a)};_.Db=function uA(){return this.c};_.c=0;var xA;Ym(274,267,AB,AA);_.Ab=function BA(a){return false};_.Jb=function CA(a){throw new tx};_.Db=function DA(){return 0};Ym(275,259,{50:1,58:1},GA);Ym(276,262,{50:1,60:1},LA);_.zb=function MA(a){return IA(this,a)};_.Ab=function NA(a){return Gy(this.b,a)};_.Bb=function OA(){return this.b.e==0};_.mb=function PA(){return Vz(zy(this.b))};_.Cb=function QA(a){return KA(this,a)};_.Db=function RA(){return this.b.e};_.tS=function SA(){return ry(zy(this.b))};_.b=null;Ym(277,265,zB,UA);_.Fb=function VA(){return this.b};_.Gb=function WA(){return this.c};_.Hb=function XA(a){var b;b=this.c;this.c=a;return b};_.b=null;_.c=null;Ym(278,17,fB,ZA);var BB=Pb;
+var HB='',LB='\n',MB=' ',sD='    ',tD='    .    |',xD=' N-',JB='(',fC=')',RD='+',_D=', ',wC='-',HD="-3'\n",CD='-C',PC='0',EC='0px',XC='1',rD="5'-",$D=':',GB=': ',yD='<\/EM>',DD='<\/pre><h3>',zD='<\/u>',FD='<EM class=',BD='<EM class=selected>',vD='<font color=red>none<\/font>\n',AD='<u>',SD='=',GD='>',MD='A',XD='AAAAAAAAAAAAA',bD='AUG',gD='Ala',pD='Arg',kD='Asn',mD='Asp',OD='C',WD='CAAAG',PB='CENTER',OB='CSS1Compat',oD='Cys',kC='DOMMouseScroll',ND='G',UD='GGGGG',VD='GUGCG',jD='Gln',nD='Glu',qD='Gly',iD='His',ID='INCORRECT',aD='Ile',QB='JUSTIFY',RB='LEFT',_C='Leu',lD='Lys',uC='Null widget handle. If you are creating a composite, ensure that initWidget() has been called.',JD='OK',$C='Phe',eD='Pro',SB='RIGHT',MC='Selected Base = ',dD='Ser',IB='String',vC='Style names cannot be empty',PD='T',TD='TATAA',fD='Thr',hD='Tyr',hE='UmbrellaException',cD='Val',YD='You did not make a single base substitution.',qE='[Lcom.google.gwt.dom.client.',lE='[Lcom.google.gwt.user.client.ui.',cE='[Ljava.lang.',SC='absolute',NC='align',UC='auto',IC='cellPadding',HC='cellSpacing',tC='className',TB='click',jE='com.google.gwt.animation.client.',bE='com.google.gwt.core.client.',mE='com.google.gwt.core.client.impl.',pE='com.google.gwt.dom.client.',oE='com.google.gwt.event.dom.client.',rE='com.google.gwt.event.logical.shared.',iE='com.google.gwt.event.shared.',fE='com.google.gwt.i18n.client.',sE='com.google.gwt.text.shared.testing.',tE='com.google.gwt.touch.client.',kE='com.google.gwt.user.client.',wE='com.google.gwt.user.client.impl.',eE='com.google.gwt.user.client.ui.',gE='com.google.web.bindery.event.shared.',gC='dblclick',cC='dir',QC='display',_B='div',qC='dragexit',pC='dragleave',KB='function',QD='g',eC='gecko1_8',LD='genex-button',dE='genex.client.gx.',vE='genex.client.problems.',uE='genex.client.requirements.',KD='genex_container',nC='gesturechange',oC='gestureend',mC='gesturestart',sC='height',FB='hidden',aE='java.lang.',nE='java.util.',hC='keydown',iC='keypress',jC='keyup',xC='left',dC='ltr',ED='mature-',UB='mousedown',VB='mousemove',WB='mouseout',XB='mouseover',YB='mouseup',lC='mousewheel',ZC='msie',RC='none',wD='none\n',CB='offsetHeight',DB='offsetWidth',YC='opera',EB='overflow',LC='popupContent',zC='position',DC='px',TC='px, ',FC='rect(0px, 0px, 0px, 0px)',VC='relative',NB='rtl',AC='table',BC='tbody',KC='td',yC='top',ZB='touchcancel',$B='touchend',aC='touchmove',bC='touchstart',JC='tr',ZD='value',OC='verticalAlign',CC='visibility',GC='visible',rC='width',WC='zoom',uD='|';var _,Xm={},oB={25:1,27:1},yB={60:1},jB={6:1,9:1,50:1,53:1,54:1},eB={50:1},aB={},tB={46:1},wB={52:1},AB={50:1,57:1},bB={2:1},qB={24:1,29:1,37:1,40:1,41:1,43:1,45:1},xB={58:1},uB={11:1,27:1},lB={29:1},fB={50:1,56:1},mB={47:1,50:1,56:1},iB={6:1,8:1,50:1,53:1,54:1},zB={59:1},hB={6:1,7:1,50:1,53:1,54:1},gB={5:1,6:1,50:1,53:1,54:1},pB={23:1,27:1},sB={44:1,50:1,53:1,54:1},cB={4:1,50:1},nB={27:1,36:1},dB={38:1},rB={24:1,29:1,37:1,40:1,41:1,42:1,43:1,45:1},vB={49:1},kB={10:1,50:1,53:1,54:1};Ym(1,-1,aB);_.eQ=function s(a){return this===a};_.gC=function t(){return this.cZ};_.hC=function u(){return Sb(this)};_.tS=function v(){return this.cZ.d+'@'+vx(this.hC())};_.toString=function(){return this.tS()};_.tM=_A;Ym(3,1,{});_.n=-1;_.o=null;_.p=false;_.q=false;_.r=null;_.s=-1;_.t=null;_.u=-1;_.v=false;Ym(4,1,{},C);_.J=function D(a){B(this,a)};_.b=null;Ym(5,1,{});Ym(6,1,bB);Ym(7,5,{});var H=null;Ym(8,7,{},L);_.M=function M(){return !!$wnd.mozRequestAnimationFrame};_.K=function N(a,b){var c;c=new P;K(a,c);return c};Ym(9,6,bB,P);_.L=function Q(){this.b=true};_.b=false;Ym(10,7,{},U);_.M=function V(){return true};_.K=function W(a,b){var c;c=new jb(this,a);fA(this.b,c);this.b.c==1&&bb(this.c,16);return c};Ym(12,1,dB);_.N=function fb(){this.c||kA(Z,this);this.O()};_.c=false;_.d=0;var Z;Ym(11,12,dB,gb);_.O=function hb(){T(this.b)};_.b=null;Ym(13,6,{2:1,3:1},jb);_.L=function kb(){S(this.c,this)};_.b=null;_.c=null;Ym(14,1,{},nb);Ym(19,1,fB);_.P=function ub(){return this.f};_.tS=function vb(){var a,b;a=this.cZ.d;b=this.P();return b!=null?a+GB+b:a};_.f=null;Ym(18,19,fB);Ym(17,18,fB,wb);Ym(16,17,fB,yb);_.P=function Eb(){this.d==null&&(this.e=Bb(this.c),this.b=this.b+GB+zb(this.c),this.d=JB+this.e+') '+Db(this.c)+this.b,undefined);return this.d};_.b=HB;_.c=null;_.d=null;_.e=null;Ym(23,1,{});var Jb=0,Kb=0,Lb=0,Mb=-1;Ym(25,23,{},cc);_.b=null;_.c=null;_.d=null;_.e=false;_.f=null;_.g=null;_.i=null;_.j=false;var Wb;Ym(26,1,{},jc);_.Q=function kc(){this.b.e=true;$b(this.b);this.b.e=false;return this.b.j=_b(this.b)};_.b=null;Ym(27,1,{},mc);_.Q=function nc(){this.b.e&&hc(this.b.f,1);return this.b.j};_.b=null;Ym(32,1,{});Ym(33,32,{},zc);_.b=HB;Ym(47,1,{50:1,53:1,54:1});_.eQ=function kd(a){return this===a};_.hC=function ld(){return Sb(this)};_.tS=function md(){return this.b};_.b=null;_.c=0;Ym(46,47,gB);var nd,od,pd,qd,rd;Ym(48,46,gB,vd);Ym(49,46,gB,xd);Ym(50,46,gB,zd);Ym(51,46,gB,Bd);Ym(52,47,hB);var Dd,Ed,Fd,Gd,Hd;Ym(53,52,hB,Ld);Ym(54,52,hB,Nd);Ym(55,52,hB,Pd);Ym(56,52,hB,Rd);Ym(57,47,iB);var Td,Ud,Vd,Wd,Xd;Ym(58,57,iB,_d);Ym(59,57,iB,be);Ym(60,57,iB,de);Ym(61,57,iB,fe);Ym(62,47,jB);var he,ie,je,ke,le;Ym(63,62,jB,pe);Ym(64,62,jB,re);Ym(65,62,jB,te);Ym(66,62,jB,ve);Ym(67,47,kB);var xe,ye,ze,Ae,Be,Ce,De,Ee,Fe,Ge;Ym(68,67,kB,Ke);Ym(69,67,kB,Me);Ym(70,67,kB,Oe);Ym(71,67,kB,Qe);Ym(72,67,kB,Se);Ym(73,67,kB,Ue);Ym(74,67,kB,We);Ym(75,67,kB,Ye);Ym(76,67,kB,$e);Ym(82,1,{});_.tS=function ff(){return 'An event type'};_.g=null;Ym(81,82,{});_.U=function hf(){this.f=false;this.g=null};_.f=false;Ym(80,81,{});_.T=function nf(){return this.V()};_.b=null;_.c=null;var jf=null;Ym(79,80,{});Ym(78,79,{});Ym(77,78,{},sf);_.S=function tf(a){pi(a,11).W(this)};_.V=function uf(){return qf};var qf;Ym(85,1,{});_.hC=function zf(){return this.d};_.tS=function Af(){return 'Event type'};_.d=0;var yf=0;Ym(84,85,{},Bf);Ym(83,84,{12:1},Cf);_.b=null;_.c=null;Ym(86,78,{},Hf);_.S=function If(a){Gf(this,pi(a,13))};_.V=function Jf(){return Ef};var Ef;Ym(87,78,{},Of);_.S=function Pf(a){Nf(this,pi(a,14))};_.V=function Qf(){return Lf};var Lf;Ym(88,78,{},Uf);_.S=function Vf(a){pi(pi(a,15),39)};_.V=function Wf(){return Sf};var Sf;Ym(89,78,{},$f);_.S=function _f(a){pi(pi(a,16),39)};_.V=function ag(){return Yf};var Yf;Ym(90,78,{},fg);_.S=function gg(a){eg(this,pi(a,17))};_.V=function hg(){return cg};var cg;Ym(91,1,{},lg);_.b=null;Ym(94,79,{});var og=null;Ym(93,94,{},rg);_.S=function sg(a){Jn(pi(pi(a,18),34).b)};_.V=function tg(){return pg};var pg;Ym(95,94,{},xg);_.S=function yg(a){Jn(pi(pi(a,19),33).b)};_.V=function zg(){return vg};var vg;Ym(96,1,{},Bg);Ym(97,94,{},Gg);_.S=function Hg(a){Fg(this,pi(a,20))};_.V=function Ig(){return Dg};var Dg;Ym(98,94,{},Ng);_.S=function Og(a){Mg(this,pi(a,21))};_.V=function Pg(){return Kg};var Kg;Ym(99,81,{},Tg);_.S=function Ug(a){Sg(this,pi(a,22))};_.T=function Wg(){return Rg};_.b=false;var Rg=null;Ym(100,81,{},Zg);_.S=function $g(a){pi(a,23).X(this)};_.T=function ah(){return Yg};var Yg=null;Ym(101,81,{},dh);_.S=function eh(a){pi(a,25).Y(this)};_.T=function gh(){return ch};_.b=0;var ch=null;Ym(102,81,{},kh);_.S=function lh(a){jh(pi(a,26))};_.T=function nh(){return ih};var ih=null;Ym(103,1,lB,sh,th);_.Z=function uh(a){qh(this,a)};_.b=null;_.c=null;Ym(106,1,{});Ym(105,106,{});_.b=null;_.c=0;_.d=false;Ym(104,105,{},Jh);Ym(107,1,{28:1},Lh);_.b=null;Ym(109,17,mB,Oh);_.b=null;Ym(108,109,mB,Rh);Ym(110,1,{27:1},Th);Ym(112,47,{30:1,50:1,53:1,54:1},ai);var Xh,Yh,Zh,$h;Ym(113,1,{},ci);_.qI=0;var ii,ji;Ym(122,1,{});Ym(123,1,{},cn);var bn=null;Ym(124,122,{},fn);var en=null;Ym(125,1,{},kn);Ym(126,1,{},pn);_.b=0;_.c=0;_.d=null;_.e=null;_.f=null;Ym(127,1,{32:1},un,vn);_.eQ=function wn(a){var b;if(!ri(a,32)){return false}b=pi(a,32);return this.b==b.b&&this.c==b.c};_.hC=function xn(){return vi(this.b)^vi(this.c)};_.tS=function yn(){return 'Point('+this.b+','+this.c+fC};_.b=0;_.c=0;Ym(128,1,{},Sn);_.b=null;_.c=null;_.d=false;_.g=null;_.i=null;_.o=null;_.p=null;_.q=null;_.s=false;_.t=null;var An=null;Ym(129,1,{22:1,27:1},Un);_.b=null;Ym(130,1,{21:1,27:1},Wn);_.b=null;Ym(131,1,{20:1,27:1},Yn);_.b=null;Ym(132,1,{19:1,27:1,33:1},$n);_.b=null;Ym(133,1,{18:1,27:1,34:1},ao);_.b=null;Ym(134,1,nB,co);_.$=function eo(a){var b;if(1==np(a.e.type)){b=new un(a.e.clientX||0,a.e.clientY||0);if(Gn(this.b,b)||Hn(this.b,b)){a.b=true;a.e.stopPropagation();a.e.preventDefault()}}};_.b=null;Ym(135,1,{},ho);_.Q=function io(){var a,b,c,d,e,f,g;if(this!=this.f.i){go(this);return false}a=mb(this.b);nn(this.e,a-this.d);this.d=a;mn(this.e,a);e=jn(this.e);e||go(this);Qn(this.f,this.e.e);d=vi(this.e.e.b);c=Dt(this.f.t);b=Bt(this.f.t);f=Ct(this.f.t);g=vi(this.e.e.c);if((f<=g||0>=g)&&(b<=d||c>=d)){go(this);return false}return e};_.d=0;_.e=null;_.f=null;_.g=null;Ym(136,1,oB,ko);_.Y=function lo(a){go(this.b)};_.b=null;Ym(137,1,{},no);_.Q=function oo(){var a,b,c;a=ob();b=new Nz(this.b.r);while(b.c<b.e.Db()){c=pi(Lz(b),35);a-c.c>=2500&&Mz(b)}return this.b.r.c!=0};_.b=null;Ym(138,1,{35:1},ro,so);_.b=null;_.c=0;var to=null,uo=null;var Co=null;Ym(143,81,{},Jo);_.S=function Ko(a){pi(a,36).$(this);Go.d=false};_.T=function Mo(){return Fo};_.U=function No(){Ho(this)};_.b=false;_.c=false;_.d=false;_.e=null;var Fo=null,Go=null;var Oo=null;Ym(145,1,pB,So);_.X=function To(a){while(($(),Z).c>0){ab(pi(hA(Z,0),38))}};var Uo=false,Vo=null,Wo=0,Xo=0,Yo=false;Ym(147,81,{},hp);_.S=function ip(a){wi(a);null.Nb()};_.T=function jp(){return fp};var fp;Ym(148,103,lB,lp);var mp=false;var rp=null,sp=null,tp=null,up=null,vp=null,wp=null;Ym(152,1,lB);_.ab=function Hp(a){return decodeURI(a.replace('%23','#'))};_.Z=function Ip(a){qh(this.b,a)};_.bb=function Jp(a){a=a==null?HB:a;if(!Ix(a,Fp==null?HB:Fp)){Fp=a;mh(this)}};var Fp=HB;Ym(154,152,lB);Ym(153,154,lB,Op);_.ab=function Pp(a){return a};Ym(160,1,{40:1,43:1});_.cb=function aq(){return this.I};_.db=function bq(a){Ao(this.I,sC,a)};_.eb=function eq(a){Ao(this.I,rC,a)};_.tS=function fq(){if(!this.I){return '(null handle)'}return Zc(this.I)};_.I=null;Ym(159,160,qB);_.fb=function pq(){};_.gb=function qq(){};_.Z=function rq(a){jq(this,a)};_.hb=function sq(){kq(this)};_._=function tq(a){lq(this,a)};_.ib=function uq(){mq(this)};_.jb=function vq(){};_.kb=function wq(){};_.E=false;_.F=0;_.G=null;_.H=null;Ym(158,159,qB);_.fb=function yq(){Oq(this,(Mq(),Kq))};_.gb=function zq(){Oq(this,(Mq(),Lq))};Ym(157,158,qB);_.mb=function Dq(){return new Eu(this.g)};_.lb=function Eq(a){return Bq(this,a)};Ym(156,157,qB);_.lb=function Iq(a){return Gq(this,a)};Ym(161,108,mB,Nq);var Kq,Lq;Ym(162,1,{},Qq);_.nb=function Rq(a){a.hb()};Ym(163,1,{},Tq);_.nb=function Uq(a){a.ib()};Ym(166,159,qB);_.hb=function Yq(){var a;kq(this);a=this.I.tabIndex;-1==a&&(this.I.tabIndex=0,undefined)};Ym(165,166,qB);Ym(164,165,qB,$q);Ym(167,157,qB);_.e=null;_.f=null;Ym(170,158,qB);_.ob=function ir(){return this.I};_.mb=function jr(){return new Pt(this)};_.lb=function kr(a){return er(this,a)};_.D=null;Ym(169,170,qB);_.ob=function vr(){return Lu(Mc(this.I))};_.cb=function wr(){return Mu(Mc(this.I))};_.pb=function xr(){or(this)};_.$=function yr(a){a.d&&(a.e,false)&&(a.b=true)};_.kb=function zr(){this.B&&Xs(this.A,false,true)};_.db=function Ar(a){this.p=a;pr(this);a.length==0&&(this.p=null)};_.eb=function Br(a){this.q=a;pr(this);a.length==0&&(this.q=null)};_.n=false;_.o=false;_.p=null;_.q=null;_.r=null;_.t=null;_.u=false;_.v=false;_.w=-1;_.x=false;_.y=null;_.z=false;_.B=false;_.C=-1;Ym(168,169,qB);_.fb=function Dr(){kq(this.k)};_.gb=function Er(){mq(this.k)};_.mb=function Fr(){return new Pt(this.k)};_.lb=function Gr(a){return er(this.k,a)};_.k=null;Ym(171,170,qB,Jr);_.ob=function Lr(){return this.b};_.b=null;_.c=null;Ym(172,168,qB,Vr);_.fb=function Xr(){try{kq(this.k)}finally{kq(this.b)}};_.gb=function Yr(){try{mq(this.k)}finally{mq(this.b)}};_.pb=function Zr(){Qr(this)};_._=function $r(a){switch(np(a.type)){case 4:case 8:case 64:case 16:case 32:if(!this.g&&!Rr(this,a)){return}}lq(this,a)};_.$=function _r(a){var b;b=a.e;!a.b&&np(a.e.type)==4&&Rr(this,b)&&(b.preventDefault(),undefined);a.d&&(a.e,false)&&(a.b=true)};_.b=null;_.c=0;_.d=0;_.e=0;_.f=0;_.g=false;_.i=null;_.j=0;Ym(173,1,oB,bs);_.Y=function cs(a){this.b.j=a.b};_.b=null;Ym(177,159,qB);_.b=null;Ym(176,177,qB,ks);Ym(175,176,qB,ms,ns);Ym(174,175,qB,os);Ym(178,1,{13:1,14:1,15:1,16:1,17:1,27:1,39:1},qs);_.b=null;Ym(179,1,{},ts);_.b=null;_.c=null;_.d=null;var us,vs,ws;Ym(180,1,{});Ym(181,180,{},As);_.b=null;var Bs;Ym(182,1,{},Es);_.b=null;Ym(183,167,qB,Hs);_.lb=function Is(a){var b,c;c=Nc(a.I);b=Bq(this,a);b&&Bc(this.c,c);return b};_.c=null;Ym(184,1,oB,Ls);_.Y=function Ms(a){Ks()};Ym(185,1,nB,Os);_.$=function Ps(a){qr(this.b,a)};_.b=null;Ym(186,1,{26:1,27:1},Rs);_.b=null;Ym(187,3,{},Ys);_.b=null;_.c=false;_.d=false;_.e=0;_.f=-1;_.g=null;_.i=null;_.j=false;Ym(188,12,dB,$s);_.O=function _s(){this.b.i=null;x(this.b,ob())};_.b=null;Ym(190,156,rB,it);var et,ft,gt;Ym(191,1,{},nt);_.nb=function ot(a){a.E&&a.ib()};Ym(192,1,pB,qt);_.X=function rt(a){kt()};Ym(193,190,rB,tt);Ym(194,1,{},zt);var vt=null;Ym(195,170,qB,Ht);_.ob=function It(){return this.b};_.hb=function Jt(){kq(this);this.c.__listener=this};_.ib=function Kt(){this.c.__listener=null;mq(this)};_.db=function Lt(a){Ao(this.I,sC,a)};_.eb=function Mt(a){Ao(this.I,rC,a)};_.b=null;_.c=null;_.d=null;Ym(196,1,{},Pt);_.qb=function Qt(){return this.b};_.rb=function Rt(){return Ot(this)};_.sb=function St(){!!this.c&&this.d.lb(this.c)};_.c=null;_.d=null;Ym(199,166,qB);_._=function Xt(a){var b;b=np(a.type);(b&896)!=0?lq(this,a):lq(this,a)};_.jb=function Yt(){};Ym(198,199,qB);Ym(197,198,qB,$t);Ym(200,47,sB);var bu,cu,du,eu,fu;Ym(201,200,sB,ju);Ym(202,200,sB,lu);Ym(203,200,sB,nu);Ym(204,200,sB,pu);Ym(205,167,qB,su);_.lb=function tu(a){var b,c;c=Nc(a.I);b=Bq(this,a);b&&Bc(this.e,Nc(c));return b};Ym(206,1,{},Au);_.mb=function Bu(){return new Eu(this)};_.b=null;_.c=null;_.d=0;Ym(207,1,{},Eu);_.qb=function Fu(){return this.b<this.c.d-1};_.rb=function Gu(){return Du(this)};_.sb=function Hu(){if(this.b<0||this.b>=this.c.d){throw new qx}this.c.c.lb(this.c.b[this.b--])};_.b=-1;_.c=null;var Iu;Ym(210,1,{},Qu);_.R=function Ru(){this.b.style[EB]=(Id(),UC)};_.b=null;Ym(213,1,{},Vu);_.b=null;_.c=null;_.d=null;Ym(214,1,tB,Xu);_.R=function Yu(){Ah(this.b,this.d,this.c)};_.b=null;_.c=null;_.d=null;Ym(215,1,tB,$u);_.R=function _u(){Ch(this.b,this.d,this.c)};_.b=null;_.c=null;_.d=null;Ym(217,1,{},dv);_.b=0;Ym(218,1,{},fv);_.b=0;_.c=0;_.d=0;Ym(219,1,{},vv);_.b=null;_.c=null;_.d=null;_.e=null;_.f=null;_.g=0;_.i=0;_.j=0;_.k=null;_.n=null;_.o=null;_.p=0;_.q=0;_.r=null;_.s=null;_.t=null;_.u=0;Ym(220,1,{},Gv);_.tb=function Hv(a){var b,c;if(a==39){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1);b=Cv(this,this.b,this.e);Fv(this,b,this.e);this.c=b.c.c.length;b.c.g+1;xv(this)}if(a==37){--this.e;this.e<0&&(this.e=0);b=Cv(this,this.b,this.e);Fv(this,b,this.e);this.c=b.c.c.length;b.c.g+1;xv(this)}if(a==8||a==46){this.B=this.f;c=new hy(this.b);dy(c,this.e);this.b=c.b.b;this.e>=0&&--this.e;b=Cv(this,this.b,this.e);Fv(this,b,this.e);this.f=pv(b.c);this.c=b.c.c.length;xv(this)}};_.ub=function Iv(a,b){var c,d;if(Ix(a,MD)||Ix(a,ND)||Ix(a,OD)||Ix(a,PD)){this.B=this.f;d=new hy(this.b);ey(d,this.e,a);this.b=d.b.b;++this.e;c=Cv(this,this.b,this.e);Fv(this,c,this.e);this.f=pv(c.c);this.c=c.c.c.length;c.c.g+1;xv(this)}if(Ix(a,'a')||Ix(a,QD)||Ix(a,'c')||Ix(a,'t')){this.B=this.f;d=new hy(this.b);fy(d,this.e,this.e+1,a.toUpperCase());this.b=d.b.b;c=Cv(this,this.b,this.e);Fv(this,c,this.e);this.f=pv(c.c);this.c=c.c.c.length;c.c.g+1;xv(this)}if(Ix(a,RD)||Ix(a,wC)||Ix(a,SD)||Ix(a,'_')){if(Ix(a,RD)||Ix(a,SD)){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1)}else{--this.e;this.e<0&&(this.e=0)}c=Cv(this,this.b,this.e);Fv(this,c,this.e);this.c=c.c.c.length;c.c.g+1;xv(this)}if(b==39){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1);c=Cv(this,this.b,this.e);Fv(this,c,this.e);this.c=c.c.c.length;c.c.g+1;xv(this)}if(b==37){--this.e;this.e<0&&(this.e=0);c=Cv(this,this.b,this.e);Fv(this,c,this.e);this.c=c.c.c.length;c.c.g+1;xv(this)}};_.vb=function Jv(a){var b;if(a>=0&&a<=this.c){b=Cv(this,this.b,a);Fv(this,b,a);this.c=b.c.c.length;this.e=a;xv(this)}};_.wb=function Lv(a){var b;a!=null&&dw(this.z,a);this.z.f=TD;this.z.i=UD;this.z.d=VD;this.z.c=WD;this.z.e=XD;this.g=this.z.b;this.b=this.z.b;this.c=this.b.length;this.D=this.z.f;this.E=this.z.g;this.H=this.z.i;this.v=this.z.d;this.u=this.z.c;this.A=this.z.e;(Ix(this.v,RC)||Ix(this.u,RC))&&(this.A=HB);b=Cv(this,this.g,-1);this.i=b.c.f;this.j=b.c.r;this.c=b.c.c.length;this.f=pv(b.c);ls(this.s,b.b.c+'<\/pre><\/body><\/html>')};_.xb=function Nv(a){var b,c,d,e,f;this.C=new uw;if(a==1){b=new Sw;b.c=YD;sw(this.C,b);d=new Pw;d.c='Your change does not make the mature mRNA shorter.';sw(this.C,d)}else if(a==2){b=new Sw;b.c=YD;sw(this.C,b);d=new Aw;d.c='Your change does not make the protein longer.';sw(this.C,d)}else if(a==3){b=new Sw;b.c=YD;sw(this.C,b);d=new Mw;d.c='Your change does not make the protein shorter.';sw(this.C,d)}else if(a==4){b=new Sw;b.c=YD;sw(this.C,b);d=new Gw;d.c='Your change does not prevent mRNA from being made.';sw(this.C,d);f=new Dw;f.c='Your change does not prevent protein from being made';sw(this.C,f)}else if(a==5){c=new Jw;c.b=15;c.c='Your protein does not have 5 amino acids.';sw(this.C,c);e=new xw;e.b=1;e.c='Your gene does not contain one intron.';sw(this.C,e)}};_.b=null;_.c=0;_.d=null;_.e=0;_.f=HB;_.g=null;_.i=HB;_.j=HB;_.k=null;_.n=null;_.o=false;_.p=null;_.q=null;_.r=null;_.s=null;_.t=null;_.u=null;_.v=null;_.w=null;_.x=null;_.y=null;_.A=null;_.B=HB;_.C=null;_.D=null;_.E=0;_.F=null;_.G=null;_.H=null;_.I=null;Ym(221,1,uB,Qv);_.W=function Rv(a){Qr(this.b.k);this.b.p.I[ZD]=HB};_.b=null;Ym(222,1,{},Tv);_.R=function Uv(){zv(this.b);yv(this.b);Av(this.b);Bv(this.b);typeof $wnd.genexIsReady===KB&&$wnd.genexIsReady()};_.b=null;Ym(223,1,uB,Wv);_.W=function Xv(a){var b,c;this.b.B=this.b.f;c=Hc(this.b.p.I,ZD);c=c.toUpperCase();c=Mx(c,'[^AGCT]',HB);this.b.b=c;this.b.e=-1;b=Cv(this.b,this.b.b,-1);Fv(this.b,b,-1);this.b.f=pv(b.c);this.b.c=b.c.c.length;Qr(this.b.k);xv(this.b)};_.b=null;Ym(224,1,uB,Zv);_.W=function $v(a){var b;this.b.b=this.b.g;b=Cv(this.b,this.b.b,-1);Fv(this.b,b,-1);this.b.f=pv(b.c);this.b.c=b.c.c.length;xv(this.b)};_.b=null;Ym(225,1,uB,aw);_.W=function bw(a){mr(this.b.k)};_.b=null;Ym(226,1,{},ew);_.b=null;_.c=null;_.d=null;_.e=null;_.f=null;_.g=0;_.i=null;Ym(227,1,{},gw);_.b=null;_.c=null;Ym(228,1,{48:1},kw);_.b=0;_.c=0;_.d=false;_.e=false;_.f=0;_.g=0;_.i=false;Ym(229,1,{},mw);_.b=null;_.c=null;Ym(230,1,{},pw);_.tS=function qw(){return ow(this)};_.b=null;_.c=0;_.d=null;_.e=null;_.f=0;_.g=null;_.i=null;_.j=null;Ym(231,1,{},uw);_.b=null;Ym(233,1,vB);_.c='unassigned';Ym(232,233,vB,xw);_.yb=function yw(a){return a.c==this.b+1};_.b=0;Ym(234,233,vB,Aw);_.yb=function Bw(a){return a.d.length>a.j.length};Ym(235,233,vB,Dw);_.yb=function Ew(a){return Ix(a.d,HB)};Ym(236,233,vB,Gw);_.yb=function Hw(a){return Ix(a.e,HB)};Ym(237,233,vB,Jw);_.yb=function Kw(a){return a.d.length==this.b};_.b=0;Ym(238,233,vB,Mw);_.yb=function Nw(a){return a.d.length<a.j.length};Ym(239,233,vB,Pw);_.yb=function Qw(a){return a.e.length<a.i.length};Ym(240,233,vB,Sw);_.yb=function Tw(a){var b,c,d,e;e=a.g;b=a.b;if(e.length!=b.length)return false;d=0;for(c=0;c<e.length;++c){e.charCodeAt(c)!=b.charCodeAt(c)&&++d}if(d==1)return true;return false};Ym(241,17,fB,Vw);Ym(242,1,{50:1,51:1,53:1},$w);_.eQ=function _w(a){return ri(a,51)&&pi(a,51).b==this.b};_.hC=function ax(){return this.b?1231:1237};_.tS=function bx(){return this.b?'true':'false'};_.b=false;var Xw,Yw;Ym(243,1,{},dx);_.tS=function kx(){return ((this.b&2)!=0?'interface ':(this.b&1)!=0?HB:'class ')+this.d};_.b=0;_.c=0;_.d=null;Ym(244,17,fB,mx);Ym(245,17,fB,ox);Ym(246,17,fB,qx,rx);Ym(247,17,fB,tx,ux);Ym(251,17,fB,zx,Ax);var Bx;Ym(253,1,{50:1,55:1},Ex);_.tS=function Fx(){return this.b+'.'+this.d+'(Unknown Source'+(this.c>=0?$D+this.c:HB)+fC};_.b=null;_.c=0;_.d=null;_=String.prototype;_.cM={1:1,50:1,52:1,53:1};_.eQ=function Sx(a){return Ix(this,a)};_.hC=function Tx(){return $x(this)};_.tS=_.toString;var Vx,Wx=0,Xx;Ym(255,1,wB,gy,hy);_.tS=function iy(){return this.b.b};Ym(256,1,wB,ly);_.tS=function my(){return this.b.b};Ym(257,17,fB,oy);Ym(258,1,{});_.zb=function sy(a){throw new oy('Add not supported on this collection')};_.Ab=function ty(a){var b;b=qy(this.mb(),a);return !!b};_.Bb=function uy(){return this.Db()==0};_.Cb=function vy(a){var b;b=qy(this.mb(),a);if(b){b.sb();return true}else{return false}};_.tS=function wy(){return ry(this)};Ym(260,1,xB);_.eQ=function Ay(a){var b,c,d,e,f;if(a===this){return true}if(!ri(a,58)){return false}e=pi(a,58);if(this.e!=e.e){return false}for(c=new gz((new $y(e)).b);Kz(c.b);){b=c.c=pi(Lz(c.b),59);d=b.Fb();f=b.Gb();if(!(d==null?this.d:ri(d,1)?$D+pi(d,1) in this.f:Ky(this,d,~~Hb(d)))){return false}if(!$A(f,d==null?this.c:ri(d,1)?Jy(this,pi(d,1)):Iy(this,d,~~Hb(d)))){return false}}return true};_.hC=function By(){var a,b,c;c=0;for(b=new gz((new $y(this)).b);Kz(b.b);){a=b.c=pi(Lz(b.b),59);c+=a.hC();c=~~c}return c};_.tS=function Cy(){var a,b,c,d;d='{';a=false;for(c=new gz((new $y(this)).b);Kz(c.b);){b=c.c=pi(Lz(c.b),59);a?(d+=_D):(a=true);d+=HB+b.Fb();d+=SD;d+=HB+b.Gb()}return d+'}'};Ym(259,260,xB);_.Eb=function Uy(a,b){return ui(a)===ui(b)||a!=null&&Gb(a,b)};_.b=null;_.c=null;_.d=false;_.e=0;_.f=null;Ym(262,258,yB);_.eQ=function Xy(a){var b,c,d;if(a===this){return true}if(!ri(a,60)){return false}c=pi(a,60);if(c.Db()!=this.Db()){return false}for(b=c.mb();b.qb();){d=b.rb();if(!this.Ab(d)){return false}}return true};_.hC=function Yy(){var a,b,c;a=0;for(b=this.mb();b.qb();){c=b.rb();if(c!=null){a+=Hb(c);a=~~a}}return a};Ym(261,262,yB,$y);_.Ab=function _y(a){return Zy(this,a)};_.mb=function az(){return new gz(this.b)};_.Cb=function bz(a){var b;if(Zy(this,a)){b=pi(a,59).Fb();Qy(this.b,b);return true}return false};_.Db=function cz(){return this.b.e};_.b=null;Ym(263,1,{},gz);_.qb=function hz(){return Kz(this.b)};_.rb=function iz(){return ez(this)};_.sb=function jz(){fz(this)};_.b=null;_.c=null;_.d=null;Ym(265,1,zB);_.eQ=function mz(a){var b;if(ri(a,59)){b=pi(a,59);if($A(this.Fb(),b.Fb())&&$A(this.Gb(),b.Gb())){return true}}return false};_.hC=function nz(){var a,b;a=0;b=0;this.Fb()!=null&&(a=Hb(this.Fb()));this.Gb()!=null&&(b=Hb(this.Gb()));return a^b};_.tS=function oz(){return this.Fb()+SD+this.Gb()};Ym(264,265,zB,pz);_.Fb=function qz(){return null};_.Gb=function rz(){return this.b.c};_.Hb=function sz(a){return Oy(this.b,a)};_.b=null;Ym(266,265,zB,uz);_.Fb=function vz(){return this.b};_.Gb=function wz(){return Jy(this.c,this.b)};_.Hb=function xz(a){return Py(this.c,this.b,a)};_.b=null;_.c=null;Ym(267,258,{57:1});_.Ib=function zz(a,b){throw new oy('Add not supported on this list')};_.zb=function Az(a){this.Ib(this.Db(),a);return true};_.eQ=function Cz(a){var b,c,d,e,f;if(a===this){return true}if(!ri(a,57)){return false}f=pi(a,57);if(this.Db()!=f.Db()){return false}d=new Nz(this);e=f.mb();while(d.c<d.e.Db()){b=Lz(d);c=Lz(e);if(!(b==null?c==null:Gb(b,c))){return false}}return true};_.hC=function Dz(){var a,b,c;b=1;a=new Nz(this);while(a.c<a.e.Db()){c=Lz(a);b=31*b+(c==null?0:Hb(c));b=~~b}return b};_.mb=function Fz(){return new Nz(this)};_.Kb=function Gz(){return new Tz(this,0)};_.Lb=function Hz(a){return new Tz(this,a)};_.Mb=function Iz(a){throw new oy('Remove not supported on this list')};Ym(268,1,{},Nz);_.qb=function Oz(){return Kz(this)};_.rb=function Pz(){return Lz(this)};_.sb=function Qz(){Mz(this)};_.c=0;_.d=-1;_.e=null;Ym(269,268,{},Tz);_.b=null;Ym(270,262,yB,Wz);_.Ab=function Xz(a){return Gy(this.b,a)};_.mb=function Yz(){return Vz(this)};_.Db=function Zz(){return this.c.b.e};_.b=null;_.c=null;Ym(271,1,{},aA);_.qb=function bA(){return Kz(this.b.b)};_.rb=function cA(){return _z(this)};_.sb=function dA(){fz(this.b)};_.b=null;Ym(272,267,AB,mA);_.Ib=function nA(a,b){(a<0||a>this.c)&&Ez(a,this.c);wA(this.b,a,0,b);++this.c};_.zb=function oA(a){return fA(this,a)};_.Ab=function pA(a){return iA(this,a,0)!=-1};_.Jb=function qA(a){return hA(this,a)};_.Bb=function rA(){return this.c==0};_.Mb=function sA(a){return jA(this,a)};_.Cb=function tA(a){return kA(this,a)};_.Db=function uA(){return this.c};_.c=0;var xA;Ym(274,267,AB,AA);_.Ab=function BA(a){return false};_.Jb=function CA(a){throw new tx};_.Db=function DA(){return 0};Ym(275,259,{50:1,58:1},GA);Ym(276,262,{50:1,60:1},LA);_.zb=function MA(a){return IA(this,a)};_.Ab=function NA(a){return Gy(this.b,a)};_.Bb=function OA(){return this.b.e==0};_.mb=function PA(){return Vz(zy(this.b))};_.Cb=function QA(a){return KA(this,a)};_.Db=function RA(){return this.b.e};_.tS=function SA(){return ry(zy(this.b))};_.b=null;Ym(277,265,zB,UA);_.Fb=function VA(){return this.b};_.Gb=function WA(){return this.c};_.Hb=function XA(a){var b;b=this.c;this.c=a;return b};_.b=null;_.c=null;Ym(278,17,fB,ZA);var BB=Pb;
 --></script>
 <script><!--
 var fm=fx(aE,'Object',1),Ji=fx(bE,'JavaScriptObject$',20),Rm=ex(cE,'Object;',280),lm=fx(aE,'Throwable',19),am=fx(aE,'Exception',18),gm=fx(aE,'RuntimeException',17),hm=fx(aE,'StackTraceElement',253),Sm=ex(cE,'StackTraceElement;',281),Vj=fx('com.google.gwt.lang.','SeedUtil',119),_l=fx(aE,'Enum',47),Hl=fx(dE,'GenexGWT',220),Dl=fx(dE,'GenexGWT$1',221),El=fx(dE,'GenexGWT$2',223),Fl=fx(dE,'GenexGWT$3',224),Gl=fx(dE,'GenexGWT$4',225),Cl=fx(dE,'GenexGWT$1DeferredCommand',222),Ki=fx(bE,'Scheduler',23),Yl=fx(aE,'Boolean',242),Hm=ex(HB,'[C',282),$l=fx(aE,'Class',243),km=fx(aE,IB,2),Tm=ex(cE,'String;',283),Zl=fx(aE,'ClassCastException',244),jm=fx(aE,'StringBuilder',256),Xl=fx(aE,'ArrayStoreException',241),Ii=fx(bE,'JavaScriptException',16),fl=fx(eE,'UIObject',160),pl=fx(eE,'Widget',159),Ok=fx(eE,'LabelBase',177),Pk=fx(eE,'Label',176),Jk=fx(eE,'HTML',175),Kk=fx(eE,'HasHorizontalAlignment$AutoHorizontalAlignmentConstant',180),Lk=fx(eE,'HasHorizontalAlignment$HorizontalAlignmentConstant',181),Uj=gx(fE,'HasDirection$Direction',112,bi),Om=ex('[Lcom.google.gwt.i18n.client.','HasDirection$Direction;',284),Qk=fx(eE,'Panel',158),cl=fx(eE,'SimplePanel',170),al=fx(eE,'ScrollPanel',195),bl=fx(eE,'SimplePanel$1',196),Ak=fx(eE,'ComplexPanel',157),tk=fx(eE,'AbsolutePanel',156),yl=fx(gE,hE,109),Sj=fx(iE,hE,108),wk=fx(eE,'AttachDetachException',161),uk=fx(eE,'AttachDetachException$1',162),vk=fx(eE,'AttachDetachException$2',163),$k=fx(eE,'RootPanel',190),Zk=fx(eE,'RootPanel$DefaultRootPanel',193),Xk=fx(eE,'RootPanel$1',191),Yk=fx(eE,'RootPanel$2',192),Wk=fx(eE,'PopupPanel',169),Bk=fx(eE,'DecoratedPopupPanel',168),Gk=fx(eE,'DialogBox',172),Ek=fx(eE,'DialogBox$CaptionImpl',174),Fk=fx(eE,'DialogBox$MouseHandler',178),Dk=fx(eE,'DialogBox$1',173),Gi=fx(jE,'Animation',3),Vk=fx(eE,'PopupPanel$ResizeAnimation',187),nk=fx(kE,'Timer',12),Uk=fx(eE,'PopupPanel$ResizeAnimation$1',188),Rk=fx(eE,'PopupPanel$1',184),Sk=fx(eE,'PopupPanel$3',185),Tk=fx(eE,'PopupPanel$4',186),xi=fx(jE,'Animation$1',4),Fi=fx(jE,'AnimationScheduler',5),yi=fx(jE,'AnimationScheduler$AnimationHandle',6),mk=fx(kE,'Timer$1',145),tl=fx(gE,'Event',82),Oj=fx(iE,'GwtEvent',81),lk=fx(kE,'Event$NativePreviewEvent',143),rl=fx(gE,'Event$Type',85),Nj=fx(iE,'GwtEvent$Type',84),zk=fx(eE,'CellPanel',167),ml=fx(eE,'VerticalPanel',205),Mk=fx(eE,'HasVerticalAlignment$VerticalAlignmentConstant',182),Ik=fx(eE,'FocusWidget',166),ll=fx(eE,'ValueBoxBase',199),dl=fx(eE,'TextBoxBase',198),el=fx(eE,'TextBox',197),kl=gx(eE,'ValueBoxBase$TextAlignment',200,hu),Pm=ex(lE,'ValueBoxBase$TextAlignment;',285),gl=gx(eE,'ValueBoxBase$TextAlignment$1',201,null),hl=gx(eE,'ValueBoxBase$TextAlignment$2',202,null),il=gx(eE,'ValueBoxBase$TextAlignment$3',203,null),jl=gx(eE,'ValueBoxBase$TextAlignment$4',204,null),Tj=fx(fE,'AutoDirectionHandler',110),xk=fx(eE,'ButtonBase',165),yk=fx(eE,'Button',164),Nk=fx(eE,'HorizontalPanel',183),Pi=fx(mE,'StringBufferImpl',32),Il=fx(dE,'GenexParams',226),zm=fx(nE,'AbstractMap',260),sm=fx(nE,'AbstractHashMap',259),Dm=fx(nE,'HashMap',275),nm=fx(nE,'AbstractCollection',258),Am=fx(nE,'AbstractSet',262),pm=fx(nE,'AbstractHashMap$EntrySet',261),om=fx(nE,'AbstractHashMap$EntrySetIterator',263),ym=fx(nE,'AbstractMapEntry',265),qm=fx(nE,'AbstractHashMap$MapEntryNull',264),rm=fx(nE,'AbstractHashMap$MapEntryString',266),xm=fx(nE,'AbstractMap$1',270),wm=fx(nE,'AbstractMap$1$1',271),Em=fx(nE,'HashSet',276),uj=fx(oE,'DomEvent',80),vj=fx(oE,'HumanInputEvent',79),xj=fx(oE,'MouseEvent',78),sj=fx(oE,'ClickEvent',77),tj=fx(oE,'DomEvent$Type',83),Ck=fx(eE,'DecoratorPanel',171),Ni=fx(mE,'SchedulerImpl',25),Li=fx(mE,'SchedulerImpl$Flusher',26),Mi=fx(mE,'SchedulerImpl$Rescuer',27),Oi=fx(mE,'StringBufferImplAppend',33),Hi=fx(bE,'Duration',14),rj=gx(pE,'Style$Unit',67,Ie),Nm=ex(qE,'Style$Unit;',286),Ui=gx(pE,'Style$Display',46,td),Jm=ex(qE,'Style$Display;',287),Zi=gx(pE,'Style$Overflow',52,Jd),Km=ex(qE,'Style$Overflow;',288),cj=gx(pE,'Style$Position',57,Zd),Lm=ex(qE,'Style$Position;',289),hj=gx(pE,'Style$TextAlign',62,ne),Mm=ex(qE,'Style$TextAlign;',290),ij=gx(pE,'Style$Unit$1',68,null),jj=gx(pE,'Style$Unit$2',69,null),kj=gx(pE,'Style$Unit$3',70,null),lj=gx(pE,'Style$Unit$4',71,null),mj=gx(pE,'Style$Unit$5',72,null),nj=gx(pE,'Style$Unit$6',73,null),oj=gx(pE,'Style$Unit$7',74,null),pj=gx(pE,'Style$Unit$8',75,null),qj=gx(pE,'Style$Unit$9',76,null),Qi=gx(pE,'Style$Display$1',48,null),Ri=gx(pE,'Style$Display$2',49,null),Si=gx(pE,'Style$Display$3',50,null),Ti=gx(pE,'Style$Display$4',51,null),Vi=gx(pE,'Style$Overflow$1',53,null),Wi=gx(pE,'Style$Overflow$2',54,null),Xi=gx(pE,'Style$Overflow$3',55,null),Yi=gx(pE,'Style$Overflow$4',56,null),$i=gx(pE,'Style$Position$1',58,null),_i=gx(pE,'Style$Position$2',59,null),aj=gx(pE,'Style$Position$3',60,null),bj=gx(pE,'Style$Position$4',61,null),dj=gx(pE,'Style$TextAlign$1',63,null),ej=gx(pE,'Style$TextAlign$2',64,null),fj=gx(pE,'Style$TextAlign$3',65,null),gj=gx(pE,'Style$TextAlign$4',66,null),Hk=fx(eE,'DirectionalTextHelper',179),mm=fx(aE,'UnsupportedOperationException',257),cm=fx(aE,'IllegalStateException',246),ok=fx(kE,'Window$ClosingEvent',147),Qj=fx(iE,'HandlerManager',103),pk=fx(kE,'Window$WindowHandlers',148),sl=fx(gE,'EventBus',106),xl=fx(gE,'SimpleEventBus',105),Pj=fx(iE,'HandlerManager$Bus',104),ul=fx(gE,'SimpleEventBus$1',213),vl=fx(gE,'SimpleEventBus$2',214),wl=fx(gE,'SimpleEventBus$3',215),ol=fx(eE,'WidgetCollection',206),Qm=ex(lE,'Widget;',291),nl=fx(eE,'WidgetCollection$WidgetIterator',207),ql=fx('com.google.gwt.user.client.ui.impl.','PopupImplMozilla$1',210),em=fx(aE,'NullPointerException',251),bm=fx(aE,'IllegalArgumentException',245),_k=fx(eE,'ScrollImpl',194),im=fx(aE,'StringBuffer',255),Kj=fx(rE,'CloseEvent',100),Jj=fx(rE,'AttachEvent',99),wj=fx(oE,'MouseDownEvent',86),Bj=fx(oE,'MouseUpEvent',90),yj=fx(oE,'MouseMoveEvent',87),Aj=fx(oE,'MouseOverEvent',89),zj=fx(oE,'MouseOutEvent',88),Wj=fx('com.google.gwt.text.shared.','AbstractRenderer',122),Yj=fx(sE,'PassthroughRenderer',124),Xj=fx(sE,'PassthroughParser',123),Cj=fx(oE,'PrivateMap',91),Rj=fx(iE,'LegacyHandlerWrapper',107),kk=fx(tE,'TouchScroller',128),jk=fx(tE,'TouchScroller$TemporalPoint',138),hk=fx(tE,'TouchScroller$MomentumCommand',135),ik=fx(tE,'TouchScroller$MomentumTouchRemovalCommand',137),gk=fx(tE,'TouchScroller$MomentumCommand$1',136),ak=fx(tE,'TouchScroller$1',129),bk=fx(tE,'TouchScroller$2',130),ck=fx(tE,'TouchScroller$3',131),dk=fx(tE,'TouchScroller$4',132),ek=fx(tE,'TouchScroller$5',133),fk=fx(tE,'TouchScroller$6',134),Gm=fx(nE,'NoSuchElementException',278),Fm=fx(nE,'MapEntryImpl',277),dm=fx(aE,'IndexOutOfBoundsException',247),Gj=fx(oE,'TouchEvent',94),Ij=fx(oE,'TouchStartEvent',98),Fj=fx(oE,'TouchEvent$TouchSupportDetector',96),Hj=fx(oE,'TouchMoveEvent',97),Ej=fx(oE,'TouchEndEvent',95),Dj=fx(oE,'TouchCancelEvent',93),Zj=fx(tE,'DefaultMomentum',125),$j=fx(tE,'Momentum$State',126),vm=fx(nE,'AbstractList',267),Bm=fx(nE,'ArrayList',272),tm=fx(nE,'AbstractList$IteratorImpl',268),um=fx(nE,'AbstractList$ListIteratorImpl',269),Ll=fx(dE,'VisibleGene',229),Bl=fx(dE,'Gene',219),Tl=fx(uE,'Requirement',233),Sl=fx(uE,'ProteinLengthRequirement',237),Ol=fx(uE,'IntronNumberRequirement',232),Nl=fx(vE,'Problem',231),Wl=fx(uE,'SingleMutationRequirement',240),Vl=fx(uE,'ShortermRNARequirement',239),Pl=fx(uE,'LongerProteinRequirement',234),Ul=fx(uE,'ShorterProteinRequirement',238),Rl=fx(uE,'NomRNARequirement',236),Ql=fx(uE,'NoProteinRequirement',235),Lj=fx(rE,'ResizeEvent',101),Jl=fx(dE,'HTMLContainer',227),sk=fx(wE,'HistoryImpl',152),rk=fx(wE,'HistoryImplTimer',154),qk=fx(wE,'HistoryImplMozilla',153),Kl=fx(dE,'Nucleotide',228),Al=fx(dE,'Exon',218),Ml=fx(vE,'GenexState',230),Mj=fx(rE,'ValueChangeEvent',102),Cm=fx(nE,'Collections$EmptyList',274),zl=fx(dE,'ColorSequencer',217),Ei=fx(jE,'AnimationSchedulerImpl',7),Di=fx(jE,'AnimationSchedulerImplTimer',10),Ci=fx(jE,'AnimationSchedulerImplTimer$AnimationHandleImpl',13),Im=ex('[Lcom.google.gwt.animation.client.','AnimationSchedulerImplTimer$AnimationHandleImpl;',292),Bi=fx(jE,'AnimationSchedulerImplTimer$1',11),Ai=fx(jE,'AnimationSchedulerImplMozilla',8),zi=fx(jE,'AnimationSchedulerImplMozilla$AnimationHandleImpl',9),_j=fx(tE,'Point',127);$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalEnd'});if ($wnd.genex) $wnd.genex.onScriptLoad();
diff --git a/common/static/js/capa/genex/5033ABB047340FB9346B622E2CC7107D.cache.html b/common/static/js/capa/genex/E1A9A95677AFC620CAD5759B7ACC3E67.cache.html
similarity index 82%
rename from common/static/js/capa/genex/5033ABB047340FB9346B622E2CC7107D.cache.html
rename to common/static/js/capa/genex/E1A9A95677AFC620CAD5759B7ACC3E67.cache.html
index 167a193adb..7078dee4f8 100644
--- a/common/static/js/capa/genex/5033ABB047340FB9346B622E2CC7107D.cache.html
+++ b/common/static/js/capa/genex/E1A9A95677AFC620CAD5759B7ACC3E67.cache.html
@@ -1,4 +1,4 @@
-<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.5.0";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '5033ABB047340FB9346B622E2CC7107D';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script><!--
+<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.5.0";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = 'E1A9A95677AFC620CAD5759B7ACC3E67';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script><!--
 function nA(){}
 function Ub(){}
 function pc(){}
@@ -621,5 +621,5 @@ function pu(a){if(Ww(a,'UUU'))return iC;if(Ww(a,'UUC'))return iC;if(Ww(a,'UUA'))
 var UA='',XA='\n',YA=' ',CC='    ',DC='    .    |',HC=' N-',tB=')',_C='+',jD=', ',HB='-',RC="-3'\n",MC='-C',$B='0',PB='0px',gC='1',BC="5'-",iD=':',TA=': ',IC='<\/EM>',NC='<\/pre><h3>',JC='<\/u>',PC='<EM class=',LC='<EM class=selected>',FC='<font color=red>none<\/font>\n',KC='<u>',aD='=',QC='>',WC='A',fD='AAAAAAAAAAAAA',lC='AUG',qC='Ala',zC='Arg',uC='Asn',wC='Asp',YC='C',eD='CAAAG',aB='CENTER',_A='CSS1Compat',yC='Cys',XC='G',cD='GGGGG',dD='GUGCG',tC='Gln',xC='Glu',AC='Gly',sC='His',SC='INCORRECT',kC='Ile',bB='JUSTIFY',cB='LEFT',jC='Leu',vC='Lys',FB='Null widget handle. If you are creating a composite, ensure that initWidget() has been called.',TC='OK',iC='Phe',oC='Pro',dB='RIGHT',XB='Selected Base = ',nC='Ser',VA='String',GB='Style names cannot be empty',ZC='T',bD='TATAA',$A='TBODY',ZA='TR',pC='Thr',rC='Tyr',rD='UmbrellaException',mC='Val',gD='You did not make a single base substitution.',AD='[Lcom.google.gwt.dom.client.',vD='[Lcom.google.gwt.user.client.ui.',mD='[Ljava.lang.',cC='absolute',YB='align',TB='cellPadding',SB='cellSpacing',EB='className',eB='click',bC='clip',tD='com.google.gwt.animation.client.',lD='com.google.gwt.core.client.',wD='com.google.gwt.core.client.impl.',zD='com.google.gwt.dom.client.',yD='com.google.gwt.event.dom.client.',BD='com.google.gwt.event.logical.shared.',sD='com.google.gwt.event.shared.',pD='com.google.gwt.i18n.client.',CD='com.google.gwt.text.shared.testing.',DD='com.google.gwt.touch.client.',uD='com.google.gwt.user.client.',GD='com.google.gwt.user.client.impl.',oD='com.google.gwt.user.client.ui.',qD='com.google.web.bindery.event.shared.',uB='dblclick',pB='dir',_B='display',mB='div',WA='function',$C='g',VC='genex-button',nD='genex.client.gx.',FD='genex.client.problems.',ED='genex.client.requirements.',UC='genex_container',AB='gesturechange',BB='gestureend',zB='gesturestart',DB='height',SA='hidden',kD='java.lang.',xD='java.util.',vB='keydown',wB='keypress',xB='keyup',IB='left',rB='ltr',OC='mature-',fB='mousedown',gB='mousemove',hB='mouseout',iB='mouseover',jB='mouseup',yB='mousewheel',hC='msie',aC='none',GC='none\n',PA='offsetHeight',QA='offsetWidth',sB='opera',RA='overflow',WB='popupContent',KB='position',OB='px',dC='px, ',QB='rect(0px, 0px, 0px, 0px)',eC='relative',qB='rtl',LB='table',MB='tbody',VB='td',JB='top',kB='touchcancel',lB='touchend',nB='touchmove',oB='touchstart',UB='tr',hD='value',ZB='verticalAlign',NB='visibility',RB='visible',CB='width',fC='zoom',EC='|';var _,ym={},BA={25:1,27:1},LA={60:1},wA={6:1,9:1,50:1,53:1,54:1},rA={50:1},oA={},GA={46:1},JA={52:1},NA={50:1,57:1},DA={24:1,29:1,37:1,40:1,41:1,43:1,45:1},KA={58:1},HA={11:1,27:1},yA={29:1},zA={47:1,50:1,56:1},sA={50:1,56:1},vA={6:1,8:1,50:1,53:1,54:1},MA={59:1},uA={6:1,7:1,50:1,53:1,54:1},tA={5:1,6:1,50:1,53:1,54:1},CA={23:1,27:1},FA={44:1,50:1,53:1,54:1},pA={4:1,50:1},AA={27:1,36:1},qA={38:1},EA={24:1,29:1,37:1,40:1,41:1,42:1,43:1,45:1},IA={49:1},xA={10:1,50:1,53:1,54:1};zm(1,-1,oA);_.eQ=function s(a){return this===a};_.gC=function t(){return this.cZ};_.hC=function u(){return Ib(this)};_.tS=function v(){return this.cZ.d+'@'+Jw(this.hC())};_.toString=function(){return this.tS()};_.tM=nA;zm(3,1,{});_.n=-1;_.o=false;_.p=false;_.q=null;_.r=-1;_.s=null;_.t=-1;_.u=false;zm(4,1,{},C);_.b=null;zm(5,1,{});zm(6,1,{2:1});zm(7,5,{});var G=null;zm(8,7,{},M);zm(10,1,qA);_.J=function W(){this.c||yz(P,this);this.K()};_.c=false;_.d=0;var P;zm(9,10,qA,X);_.K=function Y(){L(this.b)};_.b=null;zm(11,6,{2:1,3:1},ab);_.b=null;_.c=null;zm(12,1,{},db);zm(17,1,sA);_.L=function kb(){return this.f};_.tS=function lb(){var a,b;a=this.cZ.d;b=this.L();return b!=null?a+TA+b:a};_.f=null;zm(16,17,sA);zm(15,16,sA,mb);zm(14,15,sA,ob);_.L=function ub(){this.d==null&&(this.e=rb(this.c),this.b=this.b+TA+pb(this.c),this.d='('+this.e+') '+tb(this.c)+this.b,undefined);return this.d};_.b=UA;_.c=null;_.d=null;_.e=null;zm(21,1,{});var zb=0,Ab=0,Bb=0,Cb=-1;zm(23,21,{},Ub);
 --></script>
 <script><!--
-_.b=null;_.c=null;_.d=null;_.e=false;_.f=null;_.g=null;_.i=null;_.j=false;var Mb;zm(24,1,{},_b);_.M=function ac(){this.b.e=true;Qb(this.b);this.b.e=false;return this.b.j=Rb(this.b)};_.b=null;zm(25,1,{},cc);_.M=function dc(){this.b.e&&Zb(this.b.f,1);return this.b.j};_.b=null;zm(31,1,{});zm(32,31,{},pc);_.b=UA;zm(46,1,{50:1,53:1,54:1});_.eQ=function Rc(a){return this===a};_.hC=function Sc(){return Ib(this)};_.tS=function Tc(){return this.b};_.b=null;_.c=0;zm(45,46,tA);var Uc,Vc,Wc,Xc,Yc;zm(47,45,tA,ad);zm(48,45,tA,cd);zm(49,45,tA,ed);zm(50,45,tA,gd);zm(51,46,uA);var id,jd,kd,ld,md;zm(52,51,uA,qd);zm(53,51,uA,sd);zm(54,51,uA,ud);zm(55,51,uA,wd);zm(56,46,vA);var yd,zd,Ad,Bd,Cd;zm(57,56,vA,Gd);zm(58,56,vA,Id);zm(59,56,vA,Kd);zm(60,56,vA,Md);zm(61,46,wA);var Od,Pd,Qd,Rd,Sd;zm(62,61,wA,Wd);zm(63,61,wA,Yd);zm(64,61,wA,$d);zm(65,61,wA,ae);zm(66,46,xA);var ce,de,ee,fe,ge,he,ie,je,ke,le;zm(67,66,xA,pe);zm(68,66,xA,re);zm(69,66,xA,te);zm(70,66,xA,ve);zm(71,66,xA,xe);zm(72,66,xA,ze);zm(73,66,xA,Be);zm(74,66,xA,De);zm(75,66,xA,Fe);zm(81,1,{});_.tS=function Me(){return 'An event type'};_.g=null;zm(80,81,{});_.P=function Oe(){this.f=false;this.g=null};_.f=false;zm(79,80,{});_.O=function Te(){return this.Q()};_.b=null;_.c=null;var Pe=null;zm(78,79,{});zm(77,78,{});zm(76,77,{},Ye);_.N=function Ze(a){Wh(a,11).R(this)};_.Q=function $e(){return We};var We;zm(84,1,{});_.hC=function df(){return this.d};_.tS=function ef(){return 'Event type'};_.d=0;var cf=0;zm(83,84,{},ff);zm(82,83,{12:1},gf);_.b=null;_.c=null;zm(85,77,{},mf);_.N=function nf(a){lf(this,Wh(a,13))};_.Q=function of(){return jf};var jf;zm(86,77,{},tf);_.N=function uf(a){sf(this,Wh(a,14))};_.Q=function vf(){return qf};var qf;zm(87,77,{},zf);_.N=function Af(a){Wh(Wh(a,15),39)};_.Q=function Bf(){return xf};var xf;zm(88,77,{},Ff);_.N=function Gf(a){Wh(Wh(a,16),39)};_.Q=function Hf(){return Df};var Df;zm(89,77,{},Mf);_.N=function Nf(a){Lf(this,Wh(a,17))};_.Q=function Of(){return Jf};var Jf;zm(90,1,{},Sf);_.b=null;zm(93,78,{});var Vf=null;zm(92,93,{},Yf);_.N=function Zf(a){kn(Wh(Wh(a,18),34).b)};_.Q=function $f(){return Wf};var Wf;zm(94,93,{},cg);_.N=function dg(a){kn(Wh(Wh(a,19),33).b)};_.Q=function eg(){return ag};var ag;zm(95,1,{},gg);zm(96,93,{},lg);_.N=function mg(a){kg(this,Wh(a,20))};_.Q=function ng(){return ig};var ig;zm(97,93,{},sg);_.N=function tg(a){rg(this,Wh(a,21))};_.Q=function ug(){return pg};var pg;zm(98,80,{},yg);_.N=function zg(a){xg(this,Wh(a,22))};_.O=function Bg(){return wg};_.b=false;var wg=null;zm(99,80,{},Eg);_.N=function Fg(a){Wh(a,23).S(this)};_.O=function Hg(){return Dg};var Dg=null;zm(100,80,{},Kg);_.N=function Lg(a){Wh(a,25).T(this)};_.O=function Ng(){return Jg};_.b=0;var Jg=null;zm(101,80,{},Rg);_.N=function Sg(a){Qg(Wh(a,26))};_.O=function Ug(){return Pg};var Pg=null;zm(102,1,yA,Zg,$g);_.U=function _g(a){Xg(this,a)};_.b=null;_.c=null;zm(105,1,{});zm(104,105,{});_.b=null;_.c=0;_.d=false;zm(103,104,{},oh);zm(106,1,{28:1},qh);_.b=null;zm(108,15,zA,th);_.b=null;zm(107,108,zA,wh);zm(109,1,{27:1},yh);zm(111,46,{30:1,50:1,53:1,54:1},Hh);var Ch,Dh,Eh,Fh;zm(112,1,{},Jh);_.qI=0;var Ph,Qh;zm(121,1,{});zm(122,1,{},Fm);var Em=null;zm(123,121,{},Im);var Hm=null;zm(124,1,{},Mm);zm(125,1,{},Rm);_.b=0;_.c=0;_.d=null;_.e=null;_.f=null;zm(126,1,{32:1},Wm,Xm);_.eQ=function Ym(a){var b;if(!Yh(a,32)){return false}b=Wh(a,32);return this.b==b.b&&this.c==b.c};_.hC=function Zm(){return ai(this.b)^ai(this.c)};_.tS=function $m(){return 'Point('+this.b+','+this.c+tB};_.b=0;_.c=0;zm(127,1,{},tn);_.b=null;_.c=null;_.d=false;_.g=null;_.i=null;_.o=null;_.p=null;_.q=null;_.s=false;_.t=null;var an=null;zm(128,1,{22:1,27:1},vn);_.b=null;zm(129,1,{21:1,27:1},xn);_.b=null;zm(130,1,{20:1,27:1},zn);_.b=null;zm(131,1,{19:1,27:1,33:1},Bn);_.b=null;zm(132,1,{18:1,27:1,34:1},Dn);_.b=null;zm(133,1,AA,Fn);_.V=function Gn(a){var b;if(1==Qo(a.e.type)){b=new Wm(a.e.clientX||0,a.e.clientY||0);if(gn(this.b,b)||hn(this.b,b)){a.b=true;a.e.stopPropagation();a.e.preventDefault()}}};_.b=null;zm(134,1,{},Jn);_.M=function Kn(){var a,b,c,d,e,f,g;if(this!=this.f.i){In(this);return false}a=cb(this.b);Pm(this.e,a-this.d);this.d=a;Om(this.e,a);e=Lm(this.e);e||In(this);rn(this.f,this.e.e);d=ai(this.e.e.b);c=_s(this.f.t);b=Zs(this.f.t);f=$s(this.f.t);g=ai(this.e.e.c);if((f<=g||0>=g)&&(b<=d||c>=d)){In(this);return false}return e};_.d=0;_.e=null;_.f=null;_.g=null;zm(135,1,BA,Mn);_.T=function Nn(a){In(this.b)};_.b=null;zm(136,1,{},Pn);_.M=function Qn(){var a,b,c;a=eb();b=new _y(this.b.r);while(b.c<b.e.zb()){c=Wh(Zy(b),35);a-c.c>=2500&&$y(b)}return this.b.r.c!=0};_.b=null;zm(137,1,{35:1},Tn,Un);_.b=null;_.c=0;var Vn=null,Wn=null;var co=null;zm(142,80,{},ko);_.N=function lo(a){Wh(a,36).V(this);ho.d=false};_.O=function no(){return go};_.P=function oo(){io(this)};_.b=false;_.c=false;_.d=false;_.e=null;var go=null,ho=null;var po=null;zm(144,1,CA,to);_.S=function uo(a){while((Q(),P).c>0){R(Wh(vz(P,0),38))}};var vo=false,wo=null,xo=0,yo=0,zo=false;zm(146,80,{},Ko);_.N=function Lo(a){bi(a);null.Jb()};_.O=function Mo(){return Io};var Io;zm(147,102,yA,Oo);var Po=false;var Uo=null,Vo=null,Wo=null,Xo=null,Yo=null,Zo=null;zm(151,1,yA);_.X=function gp(a){return decodeURI(a.replace('%23','#'))};_.U=function hp(a){Xg(this.b,a)};_.Y=function ip(a){a=a==null?UA:a;if(!Ww(a,ep==null?UA:ep)){ep=a;Tg(this)}};var ep=UA;zm(152,151,yA,mp);zm(158,1,{40:1,43:1});_.Z=function zp(){return this.I};_.$=function Ap(a){ao(this.I,DB,a)};_._=function Dp(a){ao(this.I,CB,a)};_.tS=function Ep(){if(!this.I){return '(null handle)'}return this.I.outerHTML};_.I=null;zm(157,158,DA);_.ab=function Op(){};_.bb=function Pp(){};_.U=function Qp(a){Ip(this,a)};_.cb=function Rp(){Jp(this)};_.W=function Sp(a){Kp(this,a)};_.db=function Tp(){Lp(this)};_.eb=function Up(){};_.fb=function Vp(){};_.E=false;_.F=0;_.G=null;_.H=null;zm(156,157,DA);_.ab=function Xp(){lq(this,(jq(),hq))};_.bb=function Yp(){lq(this,(jq(),iq))};zm(155,156,DA);_.hb=function aq(){return new au(this.g)};_.gb=function bq(a){return $p(this,a)};zm(154,155,DA);_.gb=function fq(a){return dq(this,a)};zm(159,107,zA,kq);var hq,iq;zm(160,1,{},nq);_.ib=function oq(a){a.cb()};zm(161,1,{},qq);_.ib=function rq(a){a.db()};zm(164,157,DA);_.cb=function vq(){var a;Jp(this);a=this.I.tabIndex;-1==a&&(this.I.tabIndex=0,undefined)};zm(163,164,DA);zm(162,163,DA,xq);zm(165,155,DA);_.e=null;_.f=null;zm(168,156,DA);_.jb=function Hq(){return this.I};_.hb=function Iq(){return new lt(this)};_.gb=function Jq(a){return Dq(this,a)};_.D=null;zm(167,168,DA);_.jb=function Tq(){return Ac(this.I)};_.Z=function Uq(){return Bc(Ac(this.I))};_.kb=function Vq(){Mq(this)};_.V=function Wq(a){a.d&&(a.e,false)&&(a.b=true)};_.fb=function Xq(){this.B&&ts(this.A,false,true)};_.$=function Yq(a){this.p=a;Nq(this);a.length==0&&(this.p=null)};_._=function Zq(a){this.q=a;Nq(this);a.length==0&&(this.q=null)};_.n=false;_.o=false;_.p=null;_.q=null;_.r=null;_.t=null;_.u=false;_.v=false;_.w=-1;_.x=false;_.y=null;_.z=false;_.B=false;_.C=-1;zm(166,167,DA);_.ab=function _q(){Jp(this.k)};_.bb=function ar(){Lp(this.k)};_.hb=function br(){return new lt(this.k)};_.gb=function cr(a){return Dq(this.k,a)};_.k=null;zm(169,168,DA,fr);_.jb=function hr(){return this.b};_.b=null;_.c=null;zm(170,166,DA,rr);_.ab=function tr(){try{Jp(this.k)}finally{Jp(this.b)}};_.bb=function ur(){try{Lp(this.k)}finally{Lp(this.b)}};_.kb=function vr(){mr(this)};_.W=function wr(a){switch(Qo(a.type)){case 4:case 8:case 64:case 16:case 32:if(!this.g&&!nr(this,a)){return}}Kp(this,a)};_.V=function xr(a){var b;b=a.e;!a.b&&Qo(a.e.type)==4&&nr(this,b)&&(b.preventDefault(),undefined);a.d&&(a.e,false)&&(a.b=true)};_.b=null;_.c=0;_.d=0;_.e=0;_.f=0;_.g=false;_.i=null;_.j=0;zm(171,1,BA,zr);_.T=function Ar(a){this.b.j=a.b};_.b=null;zm(175,157,DA);_.b=null;zm(174,175,DA,Ir);zm(173,174,DA,Kr,Lr);zm(172,173,DA,Mr);zm(176,1,{13:1,14:1,15:1,16:1,17:1,27:1,39:1},Or);_.b=null;zm(177,1,{},Rr);_.b=null;_.c=null;_.d=null;var Sr,Tr,Ur;zm(178,1,{});zm(179,178,{},Yr);_.b=null;var Zr;zm(180,1,{},as);_.b=null;zm(181,165,DA,ds);_.gb=function es(a){var b,c;c=Bc(a.I);b=$p(this,a);b&&rc(this.c,c);return b};_.c=null;zm(182,1,BA,hs);_.T=function is(a){gs()};zm(183,1,AA,ks);_.V=function ls(a){Oq(this.b,a)};_.b=null;zm(184,1,{26:1,27:1},ns);_.b=null;zm(185,3,{},us);_.b=null;_.c=false;_.d=false;_.e=0;_.f=-1;_.g=null;_.i=null;_.j=false;zm(186,10,qA,ws);_.K=function xs(){this.b.i=null;x(this.b,eb())};_.b=null;zm(188,154,EA,Gs);var Cs,Ds,Es;zm(189,1,{},Ls);_.ib=function Ms(a){a.E&&a.db()};zm(190,1,CA,Os);_.S=function Ps(a){Is()};zm(191,188,EA,Rs);zm(192,1,{},Xs);var Ts=null;zm(193,168,DA,dt);_.jb=function et(){return this.b};_.cb=function ft(){Jp(this);this.c.__listener=this};_.db=function gt(){this.c.__listener=null;Lp(this)};_.$=function ht(a){ao(this.I,DB,a)};_._=function it(a){ao(this.I,CB,a)};_.b=null;_.c=null;_.d=null;zm(194,1,{},lt);_.lb=function mt(){return this.b};_.mb=function nt(){return kt(this)};_.nb=function ot(){!!this.c&&this.d.gb(this.c)};_.c=null;_.d=null;zm(197,164,DA);_.W=function tt(a){var b;b=Qo(a.type);(b&896)!=0?Kp(this,a):Kp(this,a)};_.eb=function ut(){};zm(196,197,DA);zm(195,196,DA,wt);zm(198,46,FA);var zt,At,Bt,Ct,Dt;zm(199,198,FA,Ht);zm(200,198,FA,Jt);zm(201,198,FA,Lt);zm(202,198,FA,Nt);zm(203,165,DA,Qt);_.gb=function Rt(a){var b,c;c=Bc(a.I);b=$p(this,a);b&&rc(this.e,Bc(c));return b};zm(204,1,{},Yt);_.hb=function Zt(){return new au(this)};_.b=null;_.c=null;_.d=0;zm(205,1,{},au);_.lb=function bu(){return this.b<this.c.d-1};_.mb=function cu(){return _t(this)};_.nb=function du(){if(this.b<0||this.b>=this.c.d){throw new Ew}this.c.c.gb(this.c.b[this.b--])};_.b=-1;_.c=null;zm(209,1,{},iu);_.b=null;_.c=null;_.d=null;zm(210,1,GA,ku);_.ob=function lu(){fh(this.b,this.d,this.c)};_.b=null;_.c=null;_.d=null;zm(211,1,GA,nu);_.ob=function ou(){hh(this.b,this.d,this.c)};_.b=null;_.c=null;_.d=null;zm(213,1,{},su);_.b=0;zm(214,1,{},uu);_.b=0;_.c=0;_.d=0;zm(215,1,{},Ku);_.b=null;_.c=null;_.d=null;_.e=null;_.f=null;_.g=0;_.i=0;_.j=0;_.k=null;_.n=null;_.o=null;_.p=0;_.q=0;_.r=null;_.s=null;_.t=null;_.u=0;zm(216,1,{},Vu);_.pb=function Wu(a){var b,c;if(a==39){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1);b=Ru(this,this.b,this.e);Uu(this,b,this.e);this.c=b.c.c.length;b.c.g+1;Mu(this)}if(a==37){--this.e;this.e<0&&(this.e=0);b=Ru(this,this.b,this.e);Uu(this,b,this.e);this.c=b.c.c.length;b.c.g+1;Mu(this)}if(a==8||a==46){this.B=this.f;c=new vx(this.b);rx(c,this.e);this.b=c.b.b;this.e>=0&&--this.e;b=Ru(this,this.b,this.e);Uu(this,b,this.e);this.f=Eu(b.c);this.c=b.c.c.length;Mu(this)}};_.qb=function Xu(a,b){var c,d;if(Ww(a,WC)||Ww(a,XC)||Ww(a,YC)||Ww(a,ZC)){this.B=this.f;d=new vx(this.b);sx(d,this.e,a);this.b=d.b.b;++this.e;c=Ru(this,this.b,this.e);Uu(this,c,this.e);this.f=Eu(c.c);this.c=c.c.c.length;c.c.g+1;Mu(this)}if(Ww(a,'a')||Ww(a,$C)||Ww(a,'c')||Ww(a,'t')){this.B=this.f;d=new vx(this.b);tx(d,this.e,this.e+1,a.toUpperCase());this.b=d.b.b;c=Ru(this,this.b,this.e);Uu(this,c,this.e);this.f=Eu(c.c);this.c=c.c.c.length;c.c.g+1;Mu(this)}if(Ww(a,_C)||Ww(a,HB)||Ww(a,aD)||Ww(a,'_')){if(Ww(a,_C)||Ww(a,aD)){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1)}else{--this.e;this.e<0&&(this.e=0)}c=Ru(this,this.b,this.e);Uu(this,c,this.e);this.c=c.c.c.length;c.c.g+1;Mu(this)}if(b==39){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1);c=Ru(this,this.b,this.e);Uu(this,c,this.e);this.c=c.c.c.length;c.c.g+1;Mu(this)}if(b==37){--this.e;this.e<0&&(this.e=0);c=Ru(this,this.b,this.e);Uu(this,c,this.e);this.c=c.c.c.length;c.c.g+1;Mu(this)}};_.rb=function Yu(a){var b;if(a>=0&&a<=this.c){b=Ru(this,this.b,a);Uu(this,b,a);this.c=b.c.c.length;this.e=a;Mu(this)}};_.sb=function $u(a){var b;a!=null&&rv(this.z,a);this.z.f=bD;this.z.i=cD;this.z.d=dD;this.z.c=eD;this.z.e=fD;this.g=this.z.b;this.b=this.z.b;this.c=this.b.length;this.D=this.z.f;this.E=this.z.g;this.H=this.z.i;this.v=this.z.d;this.u=this.z.c;this.A=this.z.e;(Ww(this.v,aC)||Ww(this.u,aC))&&(this.A=UA);b=Ru(this,this.g,-1);this.i=b.c.f;this.j=b.c.r;this.c=b.c.c.length;this.f=Eu(b.c);Jr(this.s,b.b.c+'<\/pre><\/body><\/html>')};_.tb=function av(a){var b,c,d,e,f;this.C=new Iv;if(a==1){b=new ew;b.c=gD;Gv(this.C,b);d=new bw;d.c='Your change does not make the mature mRNA shorter.';Gv(this.C,d)}else if(a==2){b=new ew;b.c=gD;Gv(this.C,b);d=new Ov;d.c='Your change does not make the protein longer.';Gv(this.C,d)}else if(a==3){b=new ew;b.c=gD;Gv(this.C,b);d=new $v;d.c='Your change does not make the protein shorter.';Gv(this.C,d)}else if(a==4){b=new ew;b.c=gD;Gv(this.C,b);d=new Uv;d.c='Your change does not prevent mRNA from being made.';Gv(this.C,d);f=new Rv;f.c='Your change does not prevent protein from being made';Gv(this.C,f)}else if(a==5){c=new Xv;c.b=c.b;c.c='Your protein does not have 5 amino acids.';Gv(this.C,c);e=new Lv;e.b=1;e.c='Your gene does not contain one intron.';Gv(this.C,e)}};_.b=null;_.c=0;_.d=null;_.e=0;_.f=UA;_.g=null;_.i=UA;_.j=UA;_.k=null;_.n=null;_.o=false;_.p=null;_.q=null;_.r=null;_.s=null;_.t=null;_.u=null;_.v=null;_.w=null;_.x=null;_.y=null;_.A=null;_.B=UA;_.C=null;_.D=null;_.E=0;_.F=null;_.G=null;_.H=null;_.I=null;zm(217,1,HA,dv);_.R=function ev(a){mr(this.b.k);this.b.p.I[hD]=UA};_.b=null;zm(218,1,{},gv);_.b=null;zm(219,1,HA,iv);_.R=function jv(a){var b,c;this.b.B=this.b.f;c=vc(this.b.p.I,hD);c=c.toUpperCase();c=$w(c,'[^AGCT]',UA);this.b.b=c;this.b.e=-1;b=Ru(this.b,this.b.b,-1);Uu(this.b,b,-1);this.b.f=Eu(b.c);this.b.c=b.c.c.length;mr(this.b.k);Mu(this.b)};_.b=null;zm(220,1,HA,lv);_.R=function mv(a){var b;this.b.b=this.b.g;b=Ru(this.b,this.b.b,-1);Uu(this.b,b,-1);this.b.f=Eu(b.c);this.b.c=b.c.c.length;Mu(this.b)};_.b=null;zm(221,1,HA,ov);_.R=function pv(a){Kq(this.b.k)};_.b=null;zm(222,1,{},sv);_.b=null;_.c=null;_.d=null;_.e=null;_.f=null;_.g=0;_.i=null;zm(223,1,{},uv);_.b=null;_.c=null;zm(224,1,{48:1},yv);_.b=0;_.c=0;_.d=false;_.e=false;_.f=0;_.g=0;_.i=false;zm(225,1,{},Av);_.b=null;_.c=null;zm(226,1,{},Dv);_.tS=function Ev(){return Cv(this)};_.b=null;_.c=0;_.d=null;_.e=null;_.f=0;_.g=null;_.i=null;_.j=null;zm(227,1,{},Iv);_.b=null;zm(229,1,IA);_.c='unassigned';zm(228,229,IA,Lv);_.ub=function Mv(a){return a.c==this.b+1};_.b=0;zm(230,229,IA,Ov);_.ub=function Pv(a){return a.d.length>a.j.length};zm(231,229,IA,Rv);_.ub=function Sv(a){return Ww(a.d,UA)};zm(232,229,IA,Uv);_.ub=function Vv(a){return Ww(a.e,UA)};zm(233,229,IA,Xv);_.ub=function Yv(a){return a.d.length==this.b};_.b=0;zm(234,229,IA,$v);_.ub=function _v(a){return a.d.length<a.j.length};zm(235,229,IA,bw);_.ub=function cw(a){return a.e.length<a.i.length};zm(236,229,IA,ew);_.ub=function fw(a){var b,c,d,e;e=a.g;b=a.b;if(e.length!=b.length)return false;d=0;for(c=0;c<e.length;++c){e.charCodeAt(c)!=b.charCodeAt(c)&&++d}if(d==1)return true;return false};zm(237,15,sA,hw);zm(238,1,{50:1,51:1,53:1},mw);_.eQ=function nw(a){return Yh(a,51)&&Wh(a,51).b==this.b};_.hC=function ow(){return this.b?1231:1237};_.tS=function pw(){return this.b?'true':'false'};_.b=false;var jw,kw;zm(239,1,{},rw);_.tS=function yw(){return ((this.b&2)!=0?'interface ':(this.b&1)!=0?UA:'class ')+this.d};_.b=0;_.c=0;_.d=null;zm(240,15,sA,Aw);zm(241,15,sA,Cw);zm(242,15,sA,Ew,Fw);zm(243,15,sA,Hw,Iw);zm(247,15,sA,Nw,Ow);var Pw;zm(249,1,{50:1,55:1},Sw);_.tS=function Tw(){return this.b+'.'+this.d+'(Unknown Source'+(this.c>=0?iD+this.c:UA)+tB};_.b=null;_.c=0;_.d=null;_=String.prototype;_.cM={1:1,50:1,52:1,53:1};_.eQ=function ex(a){return Ww(this,a)};_.hC=function fx(){return mx(this)};_.tS=_.toString;var hx,ix=0,jx;zm(251,1,JA,ux,vx);_.tS=function wx(){return this.b.b};zm(252,1,JA,zx);_.tS=function Ax(){return this.b.b};zm(253,15,sA,Cx);zm(254,1,{});_.vb=function Gx(a){throw new Cx('Add not supported on this collection')};_.wb=function Hx(a){var b;b=Ex(this.hb(),a);return !!b};_.xb=function Ix(){return this.zb()==0};_.yb=function Jx(a){var b;b=Ex(this.hb(),a);if(b){b.nb();return true}else{return false}};_.tS=function Kx(){return Fx(this)};zm(256,1,KA);_.eQ=function Ox(a){var b,c,d,e,f;if(a===this){return true}if(!Yh(a,58)){return false}e=Wh(a,58);if(this.e!=e.e){return false}for(c=new uy((new my(e)).b);Yy(c.b);){b=c.c=Wh(Zy(c.b),59);d=b.Bb();f=b.Cb();if(!(d==null?this.d:Yh(d,1)?iD+Wh(d,1) in this.f:Yx(this,d,~~xb(d)))){return false}if(!mA(f,d==null?this.c:Yh(d,1)?Xx(this,Wh(d,1)):Wx(this,d,~~xb(d)))){return false}}return true};_.hC=function Px(){var a,b,c;c=0;for(b=new uy((new my(this)).b);Yy(b.b);){a=b.c=Wh(Zy(b.b),59);c+=a.hC();c=~~c}return c};_.tS=function Qx(){var a,b,c,d;d='{';a=false;for(c=new uy((new my(this)).b);Yy(c.b);){b=c.c=Wh(Zy(c.b),59);a?(d+=jD):(a=true);d+=UA+b.Bb();d+=aD;d+=UA+b.Cb()}return d+'}'};zm(255,256,KA);_.Ab=function gy(a,b){return _h(a)===_h(b)||a!=null&&wb(a,b)};_.b=null;_.c=null;_.d=false;_.e=0;_.f=null;zm(258,254,LA);_.eQ=function jy(a){var b,c,d;if(a===this){return true}if(!Yh(a,60)){return false}c=Wh(a,60);if(c.zb()!=this.zb()){return false}for(b=c.hb();b.lb();){d=b.mb();if(!this.wb(d)){return false}}return true};_.hC=function ky(){var a,b,c;a=0;for(b=this.hb();b.lb();){c=b.mb();if(c!=null){a+=xb(c);a=~~a}}return a};zm(257,258,LA,my);_.wb=function ny(a){return ly(this,a)};_.hb=function oy(){return new uy(this.b)};_.yb=function py(a){var b;if(ly(this,a)){b=Wh(a,59).Bb();cy(this.b,b);return true}return false};_.zb=function qy(){return this.b.e};_.b=null;zm(259,1,{},uy);_.lb=function vy(){return Yy(this.b)};_.mb=function wy(){return sy(this)};_.nb=function xy(){ty(this)};_.b=null;_.c=null;_.d=null;zm(261,1,MA);_.eQ=function Ay(a){var b;if(Yh(a,59)){b=Wh(a,59);if(mA(this.Bb(),b.Bb())&&mA(this.Cb(),b.Cb())){return true}}return false};_.hC=function By(){var a,b;a=0;b=0;this.Bb()!=null&&(a=xb(this.Bb()));this.Cb()!=null&&(b=xb(this.Cb()));return a^b};_.tS=function Cy(){return this.Bb()+aD+this.Cb()};zm(260,261,MA,Dy);_.Bb=function Ey(){return null};_.Cb=function Fy(){return this.b.c};_.Db=function Gy(a){return ay(this.b,a)};_.b=null;zm(262,261,MA,Iy);_.Bb=function Jy(){return this.b};_.Cb=function Ky(){return Xx(this.c,this.b)};_.Db=function Ly(a){return by(this.c,this.b,a)};_.b=null;_.c=null;zm(263,254,{57:1});_.Eb=function Ny(a,b){throw new Cx('Add not supported on this list')};_.vb=function Oy(a){this.Eb(this.zb(),a);return true};_.eQ=function Qy(a){var b,c,d,e,f;if(a===this){return true}if(!Yh(a,57)){return false}f=Wh(a,57);if(this.zb()!=f.zb()){return false}d=new _y(this);e=f.hb();while(d.c<d.e.zb()){b=Zy(d);c=Zy(e);if(!(b==null?c==null:wb(b,c))){return false}}return true};_.hC=function Ry(){var a,b,c;b=1;a=new _y(this);while(a.c<a.e.zb()){c=Zy(a);b=31*b+(c==null?0:xb(c));b=~~b}return b};_.hb=function Ty(){return new _y(this)};_.Gb=function Uy(){return new fz(this,0)};_.Hb=function Vy(a){return new fz(this,a)};_.Ib=function Wy(a){throw new Cx('Remove not supported on this list')};zm(264,1,{},_y);_.lb=function az(){return Yy(this)};_.mb=function bz(){return Zy(this)};_.nb=function cz(){$y(this)};_.c=0;_.d=-1;_.e=null;zm(265,264,{},fz);_.b=null;zm(266,258,LA,iz);_.wb=function jz(a){return Ux(this.b,a)};_.hb=function kz(){return hz(this)};_.zb=function lz(){return this.c.b.e};_.b=null;_.c=null;zm(267,1,{},oz);_.lb=function pz(){return Yy(this.b.b)};_.mb=function qz(){return nz(this)};_.nb=function rz(){ty(this.b)};_.b=null;zm(268,263,NA,Az);_.Eb=function Bz(a,b){(a<0||a>this.c)&&Sy(a,this.c);Kz(this.b,a,0,b);++this.c};_.vb=function Cz(a){return tz(this,a)};_.wb=function Dz(a){return wz(this,a,0)!=-1};_.Fb=function Ez(a){return vz(this,a)};_.xb=function Fz(){return this.c==0};_.Ib=function Gz(a){return xz(this,a)};_.yb=function Hz(a){return yz(this,a)};_.zb=function Iz(){return this.c};_.c=0;var Lz;zm(270,263,NA,Oz);_.wb=function Pz(a){return false};_.Fb=function Qz(a){throw new Hw};_.zb=function Rz(){return 0};zm(271,255,{50:1,58:1},Uz);zm(272,258,{50:1,60:1},Zz);_.vb=function $z(a){return Wz(this,a)};_.wb=function _z(a){return Ux(this.b,a)};_.xb=function aA(){return this.b.e==0};_.hb=function bA(){return hz(Nx(this.b))};_.yb=function cA(a){return Yz(this,a)};_.zb=function dA(){return this.b.e};_.tS=function eA(){return Fx(Nx(this.b))};_.b=null;zm(273,261,MA,gA);_.Bb=function hA(){return this.b};_.Cb=function iA(){return this.c};_.Db=function jA(a){var b;b=this.c;this.c=a;return b};_.b=null;_.c=null;zm(274,15,sA,lA);var OA=Fb;var Il=tw(kD,'Object',1),mi=tw(lD,'JavaScriptObject$',18),sm=sw(mD,'Object;',276),Ol=tw(kD,'Throwable',17),Dl=tw(kD,'Exception',16),Jl=tw(kD,'RuntimeException',15),Kl=tw(kD,'StackTraceElement',249),tm=sw(mD,'StackTraceElement;',277),yj=tw('com.google.gwt.lang.','SeedUtil',118),Cl=tw(kD,'Enum',46),il=tw(nD,'GenexGWT',216),el=tw(nD,'GenexGWT$1',217),fl=tw(nD,'GenexGWT$2',219),gl=tw(nD,'GenexGWT$3',220),hl=tw(nD,'GenexGWT$4',221),dl=tw(nD,'GenexGWT$1DeferredCommand',218),ni=tw(lD,'Scheduler',21),zl=tw(kD,'Boolean',238),im=sw(UA,'[C',278),Bl=tw(kD,'Class',239),Nl=tw(kD,VA,2),um=sw(mD,'String;',279),Al=tw(kD,'ClassCastException',240),Ml=tw(kD,'StringBuilder',252),yl=tw(kD,'ArrayStoreException',237),li=tw(lD,'JavaScriptException',14),Jk=tw(oD,'UIObject',158),Tk=tw(oD,'Widget',157),qk=tw(oD,'LabelBase',175),rk=tw(oD,'Label',174),lk=tw(oD,'HTML',173),mk=tw(oD,'HasHorizontalAlignment$AutoHorizontalAlignmentConstant',178),nk=tw(oD,'HasHorizontalAlignment$HorizontalAlignmentConstant',179),xj=uw(pD,'HasDirection$Direction',111,Ih),pm=sw('[Lcom.google.gwt.i18n.client.','HasDirection$Direction;',280),sk=tw(oD,'Panel',156),Gk=tw(oD,'SimplePanel',168),Ek=tw(oD,'ScrollPanel',193),Fk=tw(oD,'SimplePanel$1',194),ck=tw(oD,'ComplexPanel',155),Xj=tw(oD,'AbsolutePanel',154),_k=tw(qD,rD,108),vj=tw(sD,rD,107),$j=tw(oD,'AttachDetachException',159),Yj=tw(oD,'AttachDetachException$1',160),Zj=tw(oD,'AttachDetachException$2',161),Ck=tw(oD,'RootPanel',188),Bk=tw(oD,'RootPanel$DefaultRootPanel',191),zk=tw(oD,'RootPanel$1',189),Ak=tw(oD,'RootPanel$2',190),yk=tw(oD,'PopupPanel',167),dk=tw(oD,'DecoratedPopupPanel',166),ik=tw(oD,'DialogBox',170),gk=tw(oD,'DialogBox$CaptionImpl',172),hk=tw(oD,'DialogBox$MouseHandler',176),fk=tw(oD,'DialogBox$1',171),ji=tw(tD,'Animation',3),xk=tw(oD,'PopupPanel$ResizeAnimation',185),Sj=tw(uD,'Timer',10),wk=tw(oD,'PopupPanel$ResizeAnimation$1',186),tk=tw(oD,'PopupPanel$1',182),uk=tw(oD,'PopupPanel$3',183),vk=tw(oD,'PopupPanel$4',184),ci=tw(tD,'Animation$1',4),ii=tw(tD,'AnimationScheduler',5),di=tw(tD,'AnimationScheduler$AnimationHandle',6),Rj=tw(uD,'Timer$1',144),Wk=tw(qD,'Event',81),rj=tw(sD,'GwtEvent',80),Qj=tw(uD,'Event$NativePreviewEvent',142),Uk=tw(qD,'Event$Type',84),qj=tw(sD,'GwtEvent$Type',83),bk=tw(oD,'CellPanel',165),Qk=tw(oD,'VerticalPanel',203),ok=tw(oD,'HasVerticalAlignment$VerticalAlignmentConstant',180),kk=tw(oD,'FocusWidget',164),Pk=tw(oD,'ValueBoxBase',197),Hk=tw(oD,'TextBoxBase',196),Ik=tw(oD,'TextBox',195),Ok=uw(oD,'ValueBoxBase$TextAlignment',198,Ft),qm=sw(vD,'ValueBoxBase$TextAlignment;',281),Kk=uw(oD,'ValueBoxBase$TextAlignment$1',199,null),Lk=uw(oD,'ValueBoxBase$TextAlignment$2',200,null),Mk=uw(oD,'ValueBoxBase$TextAlignment$3',201,null),Nk=uw(oD,'ValueBoxBase$TextAlignment$4',202,null),wj=tw(pD,'AutoDirectionHandler',109),_j=tw(oD,'ButtonBase',163),ak=tw(oD,'Button',162),pk=tw(oD,'HorizontalPanel',181),si=tw(wD,'StringBufferImpl',31),jl=tw(nD,'GenexParams',222),am=tw(xD,'AbstractMap',256),Vl=tw(xD,'AbstractHashMap',255),em=tw(xD,'HashMap',271),Ql=tw(xD,'AbstractCollection',254),bm=tw(xD,'AbstractSet',258),Sl=tw(xD,'AbstractHashMap$EntrySet',257),Rl=tw(xD,'AbstractHashMap$EntrySetIterator',259),_l=tw(xD,'AbstractMapEntry',261),Tl=tw(xD,'AbstractHashMap$MapEntryNull',260),Ul=tw(xD,'AbstractHashMap$MapEntryString',262),$l=tw(xD,'AbstractMap$1',266),Zl=tw(xD,'AbstractMap$1$1',267),fm=tw(xD,'HashSet',272),Zi=tw(yD,'DomEvent',79),$i=tw(yD,'HumanInputEvent',78),aj=tw(yD,'MouseEvent',77),Xi=tw(yD,'ClickEvent',76),Yi=tw(yD,'DomEvent$Type',82),ek=tw(oD,'DecoratorPanel',169),qi=tw(wD,'SchedulerImpl',23),oi=tw(wD,'SchedulerImpl$Flusher',24),pi=tw(wD,'SchedulerImpl$Rescuer',25),ri=tw(wD,'StringBufferImplAppend',32),ki=tw(lD,'Duration',12),Wi=uw(zD,'Style$Unit',66,ne),om=sw(AD,'Style$Unit;',282),xi=uw(zD,'Style$Display',45,$c),km=sw(AD,'Style$Display;',283),Ci=uw(zD,'Style$Overflow',51,od),lm=sw(AD,'Style$Overflow;',284),Hi=uw(zD,'Style$Position',56,Ed),mm=sw(AD,'Style$Position;',285),Mi=uw(zD,'Style$TextAlign',61,Ud),nm=sw(AD,'Style$TextAlign;',286),Ni=uw(zD,'Style$Unit$1',67,null),Oi=uw(zD,'Style$Unit$2',68,null),Pi=uw(zD,'Style$Unit$3',69,null),Qi=uw(zD,'Style$Unit$4',70,null),Ri=uw(zD,'Style$Unit$5',71,null),Si=uw(zD,'Style$Unit$6',72,null),Ti=uw(zD,'Style$Unit$7',73,null),Ui=uw(zD,'Style$Unit$8',74,null),Vi=uw(zD,'Style$Unit$9',75,null),ti=uw(zD,'Style$Display$1',47,null),ui=uw(zD,'Style$Display$2',48,null),vi=uw(zD,'Style$Display$3',49,null),wi=uw(zD,'Style$Display$4',50,null),yi=uw(zD,'Style$Overflow$1',52,null),zi=uw(zD,'Style$Overflow$2',53,null),Ai=uw(zD,'Style$Overflow$3',54,null),Bi=uw(zD,'Style$Overflow$4',55,null),Di=uw(zD,'Style$Position$1',57,null),Ei=uw(zD,'Style$Position$2',58,null),Fi=uw(zD,'Style$Position$3',59,null),Gi=uw(zD,'Style$Position$4',60,null),Ii=uw(zD,'Style$TextAlign$1',62,null),Ji=uw(zD,'Style$TextAlign$2',63,null),Ki=uw(zD,'Style$TextAlign$3',64,null),Li=uw(zD,'Style$TextAlign$4',65,null),jk=tw(oD,'DirectionalTextHelper',177),Pl=tw(kD,'UnsupportedOperationException',253),Fl=tw(kD,'IllegalStateException',242),Tj=tw(uD,'Window$ClosingEvent',146),tj=tw(sD,'HandlerManager',102),Uj=tw(uD,'Window$WindowHandlers',147),Vk=tw(qD,'EventBus',105),$k=tw(qD,'SimpleEventBus',104),sj=tw(sD,'HandlerManager$Bus',103),Xk=tw(qD,'SimpleEventBus$1',209),Yk=tw(qD,'SimpleEventBus$2',210),Zk=tw(qD,'SimpleEventBus$3',211),Sk=tw(oD,'WidgetCollection',204),rm=sw(vD,'Widget;',287),Rk=tw(oD,'WidgetCollection$WidgetIterator',205),Hl=tw(kD,'NullPointerException',247),El=tw(kD,'IllegalArgumentException',241),Dk=tw(oD,'ScrollImpl',192),Ll=tw(kD,'StringBuffer',251),nj=tw(BD,'CloseEvent',99),mj=tw(BD,'AttachEvent',98),_i=tw(yD,'MouseDownEvent',85),ej=tw(yD,'MouseUpEvent',89),bj=tw(yD,'MouseMoveEvent',86),dj=tw(yD,'MouseOverEvent',88),cj=tw(yD,'MouseOutEvent',87),zj=tw('com.google.gwt.text.shared.','AbstractRenderer',121),Bj=tw(CD,'PassthroughRenderer',123),Aj=tw(CD,'PassthroughParser',122),fj=tw(yD,'PrivateMap',90),uj=tw(sD,'LegacyHandlerWrapper',106),Pj=tw(DD,'TouchScroller',127),Oj=tw(DD,'TouchScroller$TemporalPoint',137),Mj=tw(DD,'TouchScroller$MomentumCommand',134),Nj=tw(DD,'TouchScroller$MomentumTouchRemovalCommand',136),Lj=tw(DD,'TouchScroller$MomentumCommand$1',135),Fj=tw(DD,'TouchScroller$1',128),Gj=tw(DD,'TouchScroller$2',129),Hj=tw(DD,'TouchScroller$3',130),Ij=tw(DD,'TouchScroller$4',131),Jj=tw(DD,'TouchScroller$5',132),Kj=tw(DD,'TouchScroller$6',133),hm=tw(xD,'NoSuchElementException',274),gm=tw(xD,'MapEntryImpl',273),Gl=tw(kD,'IndexOutOfBoundsException',243),jj=tw(yD,'TouchEvent',93),lj=tw(yD,'TouchStartEvent',97),ij=tw(yD,'TouchEvent$TouchSupportDetector',95),kj=tw(yD,'TouchMoveEvent',96),hj=tw(yD,'TouchEndEvent',94),gj=tw(yD,'TouchCancelEvent',92),Cj=tw(DD,'DefaultMomentum',124),Dj=tw(DD,'Momentum$State',125),Yl=tw(xD,'AbstractList',263),cm=tw(xD,'ArrayList',268),Wl=tw(xD,'AbstractList$IteratorImpl',264),Xl=tw(xD,'AbstractList$ListIteratorImpl',265),ml=tw(nD,'VisibleGene',225),cl=tw(nD,'Gene',215),ul=tw(ED,'Requirement',229),tl=tw(ED,'ProteinLengthRequirement',233),pl=tw(ED,'IntronNumberRequirement',228),ol=tw(FD,'Problem',227),xl=tw(ED,'SingleMutationRequirement',236),wl=tw(ED,'ShortermRNARequirement',235),ql=tw(ED,'LongerProteinRequirement',230),vl=tw(ED,'ShorterProteinRequirement',234),sl=tw(ED,'NomRNARequirement',232),rl=tw(ED,'NoProteinRequirement',231),oj=tw(BD,'ResizeEvent',100),kl=tw(nD,'HTMLContainer',223),Wj=tw(GD,'HistoryImpl',151),Vj=tw(GD,'HistoryImplTimer',152),ll=tw(nD,'Nucleotide',224),bl=tw(nD,'Exon',214),nl=tw(FD,'GenexState',226),pj=tw(BD,'ValueChangeEvent',101),dm=tw(xD,'Collections$EmptyList',270),al=tw(nD,'ColorSequencer',213),hi=tw(tD,'AnimationSchedulerImpl',7),gi=tw(tD,'AnimationSchedulerImplTimer',8),fi=tw(tD,'AnimationSchedulerImplTimer$AnimationHandleImpl',11),jm=sw('[Lcom.google.gwt.animation.client.','AnimationSchedulerImplTimer$AnimationHandleImpl;',288),ei=tw(tD,'AnimationSchedulerImplTimer$1',9),Ej=tw(DD,'Point',126);$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalEnd'});if ($wnd.genex) $wnd.genex.onScriptLoad();
+_.b=null;_.c=null;_.d=null;_.e=false;_.f=null;_.g=null;_.i=null;_.j=false;var Mb;zm(24,1,{},_b);_.M=function ac(){this.b.e=true;Qb(this.b);this.b.e=false;return this.b.j=Rb(this.b)};_.b=null;zm(25,1,{},cc);_.M=function dc(){this.b.e&&Zb(this.b.f,1);return this.b.j};_.b=null;zm(31,1,{});zm(32,31,{},pc);_.b=UA;zm(46,1,{50:1,53:1,54:1});_.eQ=function Rc(a){return this===a};_.hC=function Sc(){return Ib(this)};_.tS=function Tc(){return this.b};_.b=null;_.c=0;zm(45,46,tA);var Uc,Vc,Wc,Xc,Yc;zm(47,45,tA,ad);zm(48,45,tA,cd);zm(49,45,tA,ed);zm(50,45,tA,gd);zm(51,46,uA);var id,jd,kd,ld,md;zm(52,51,uA,qd);zm(53,51,uA,sd);zm(54,51,uA,ud);zm(55,51,uA,wd);zm(56,46,vA);var yd,zd,Ad,Bd,Cd;zm(57,56,vA,Gd);zm(58,56,vA,Id);zm(59,56,vA,Kd);zm(60,56,vA,Md);zm(61,46,wA);var Od,Pd,Qd,Rd,Sd;zm(62,61,wA,Wd);zm(63,61,wA,Yd);zm(64,61,wA,$d);zm(65,61,wA,ae);zm(66,46,xA);var ce,de,ee,fe,ge,he,ie,je,ke,le;zm(67,66,xA,pe);zm(68,66,xA,re);zm(69,66,xA,te);zm(70,66,xA,ve);zm(71,66,xA,xe);zm(72,66,xA,ze);zm(73,66,xA,Be);zm(74,66,xA,De);zm(75,66,xA,Fe);zm(81,1,{});_.tS=function Me(){return 'An event type'};_.g=null;zm(80,81,{});_.P=function Oe(){this.f=false;this.g=null};_.f=false;zm(79,80,{});_.O=function Te(){return this.Q()};_.b=null;_.c=null;var Pe=null;zm(78,79,{});zm(77,78,{});zm(76,77,{},Ye);_.N=function Ze(a){Wh(a,11).R(this)};_.Q=function $e(){return We};var We;zm(84,1,{});_.hC=function df(){return this.d};_.tS=function ef(){return 'Event type'};_.d=0;var cf=0;zm(83,84,{},ff);zm(82,83,{12:1},gf);_.b=null;_.c=null;zm(85,77,{},mf);_.N=function nf(a){lf(this,Wh(a,13))};_.Q=function of(){return jf};var jf;zm(86,77,{},tf);_.N=function uf(a){sf(this,Wh(a,14))};_.Q=function vf(){return qf};var qf;zm(87,77,{},zf);_.N=function Af(a){Wh(Wh(a,15),39)};_.Q=function Bf(){return xf};var xf;zm(88,77,{},Ff);_.N=function Gf(a){Wh(Wh(a,16),39)};_.Q=function Hf(){return Df};var Df;zm(89,77,{},Mf);_.N=function Nf(a){Lf(this,Wh(a,17))};_.Q=function Of(){return Jf};var Jf;zm(90,1,{},Sf);_.b=null;zm(93,78,{});var Vf=null;zm(92,93,{},Yf);_.N=function Zf(a){kn(Wh(Wh(a,18),34).b)};_.Q=function $f(){return Wf};var Wf;zm(94,93,{},cg);_.N=function dg(a){kn(Wh(Wh(a,19),33).b)};_.Q=function eg(){return ag};var ag;zm(95,1,{},gg);zm(96,93,{},lg);_.N=function mg(a){kg(this,Wh(a,20))};_.Q=function ng(){return ig};var ig;zm(97,93,{},sg);_.N=function tg(a){rg(this,Wh(a,21))};_.Q=function ug(){return pg};var pg;zm(98,80,{},yg);_.N=function zg(a){xg(this,Wh(a,22))};_.O=function Bg(){return wg};_.b=false;var wg=null;zm(99,80,{},Eg);_.N=function Fg(a){Wh(a,23).S(this)};_.O=function Hg(){return Dg};var Dg=null;zm(100,80,{},Kg);_.N=function Lg(a){Wh(a,25).T(this)};_.O=function Ng(){return Jg};_.b=0;var Jg=null;zm(101,80,{},Rg);_.N=function Sg(a){Qg(Wh(a,26))};_.O=function Ug(){return Pg};var Pg=null;zm(102,1,yA,Zg,$g);_.U=function _g(a){Xg(this,a)};_.b=null;_.c=null;zm(105,1,{});zm(104,105,{});_.b=null;_.c=0;_.d=false;zm(103,104,{},oh);zm(106,1,{28:1},qh);_.b=null;zm(108,15,zA,th);_.b=null;zm(107,108,zA,wh);zm(109,1,{27:1},yh);zm(111,46,{30:1,50:1,53:1,54:1},Hh);var Ch,Dh,Eh,Fh;zm(112,1,{},Jh);_.qI=0;var Ph,Qh;zm(121,1,{});zm(122,1,{},Fm);var Em=null;zm(123,121,{},Im);var Hm=null;zm(124,1,{},Mm);zm(125,1,{},Rm);_.b=0;_.c=0;_.d=null;_.e=null;_.f=null;zm(126,1,{32:1},Wm,Xm);_.eQ=function Ym(a){var b;if(!Yh(a,32)){return false}b=Wh(a,32);return this.b==b.b&&this.c==b.c};_.hC=function Zm(){return ai(this.b)^ai(this.c)};_.tS=function $m(){return 'Point('+this.b+','+this.c+tB};_.b=0;_.c=0;zm(127,1,{},tn);_.b=null;_.c=null;_.d=false;_.g=null;_.i=null;_.o=null;_.p=null;_.q=null;_.s=false;_.t=null;var an=null;zm(128,1,{22:1,27:1},vn);_.b=null;zm(129,1,{21:1,27:1},xn);_.b=null;zm(130,1,{20:1,27:1},zn);_.b=null;zm(131,1,{19:1,27:1,33:1},Bn);_.b=null;zm(132,1,{18:1,27:1,34:1},Dn);_.b=null;zm(133,1,AA,Fn);_.V=function Gn(a){var b;if(1==Qo(a.e.type)){b=new Wm(a.e.clientX||0,a.e.clientY||0);if(gn(this.b,b)||hn(this.b,b)){a.b=true;a.e.stopPropagation();a.e.preventDefault()}}};_.b=null;zm(134,1,{},Jn);_.M=function Kn(){var a,b,c,d,e,f,g;if(this!=this.f.i){In(this);return false}a=cb(this.b);Pm(this.e,a-this.d);this.d=a;Om(this.e,a);e=Lm(this.e);e||In(this);rn(this.f,this.e.e);d=ai(this.e.e.b);c=_s(this.f.t);b=Zs(this.f.t);f=$s(this.f.t);g=ai(this.e.e.c);if((f<=g||0>=g)&&(b<=d||c>=d)){In(this);return false}return e};_.d=0;_.e=null;_.f=null;_.g=null;zm(135,1,BA,Mn);_.T=function Nn(a){In(this.b)};_.b=null;zm(136,1,{},Pn);_.M=function Qn(){var a,b,c;a=eb();b=new _y(this.b.r);while(b.c<b.e.zb()){c=Wh(Zy(b),35);a-c.c>=2500&&$y(b)}return this.b.r.c!=0};_.b=null;zm(137,1,{35:1},Tn,Un);_.b=null;_.c=0;var Vn=null,Wn=null;var co=null;zm(142,80,{},ko);_.N=function lo(a){Wh(a,36).V(this);ho.d=false};_.O=function no(){return go};_.P=function oo(){io(this)};_.b=false;_.c=false;_.d=false;_.e=null;var go=null,ho=null;var po=null;zm(144,1,CA,to);_.S=function uo(a){while((Q(),P).c>0){R(Wh(vz(P,0),38))}};var vo=false,wo=null,xo=0,yo=0,zo=false;zm(146,80,{},Ko);_.N=function Lo(a){bi(a);null.Jb()};_.O=function Mo(){return Io};var Io;zm(147,102,yA,Oo);var Po=false;var Uo=null,Vo=null,Wo=null,Xo=null,Yo=null,Zo=null;zm(151,1,yA);_.X=function gp(a){return decodeURI(a.replace('%23','#'))};_.U=function hp(a){Xg(this.b,a)};_.Y=function ip(a){a=a==null?UA:a;if(!Ww(a,ep==null?UA:ep)){ep=a;Tg(this)}};var ep=UA;zm(152,151,yA,mp);zm(158,1,{40:1,43:1});_.Z=function zp(){return this.I};_.$=function Ap(a){ao(this.I,DB,a)};_._=function Dp(a){ao(this.I,CB,a)};_.tS=function Ep(){if(!this.I){return '(null handle)'}return this.I.outerHTML};_.I=null;zm(157,158,DA);_.ab=function Op(){};_.bb=function Pp(){};_.U=function Qp(a){Ip(this,a)};_.cb=function Rp(){Jp(this)};_.W=function Sp(a){Kp(this,a)};_.db=function Tp(){Lp(this)};_.eb=function Up(){};_.fb=function Vp(){};_.E=false;_.F=0;_.G=null;_.H=null;zm(156,157,DA);_.ab=function Xp(){lq(this,(jq(),hq))};_.bb=function Yp(){lq(this,(jq(),iq))};zm(155,156,DA);_.hb=function aq(){return new au(this.g)};_.gb=function bq(a){return $p(this,a)};zm(154,155,DA);_.gb=function fq(a){return dq(this,a)};zm(159,107,zA,kq);var hq,iq;zm(160,1,{},nq);_.ib=function oq(a){a.cb()};zm(161,1,{},qq);_.ib=function rq(a){a.db()};zm(164,157,DA);_.cb=function vq(){var a;Jp(this);a=this.I.tabIndex;-1==a&&(this.I.tabIndex=0,undefined)};zm(163,164,DA);zm(162,163,DA,xq);zm(165,155,DA);_.e=null;_.f=null;zm(168,156,DA);_.jb=function Hq(){return this.I};_.hb=function Iq(){return new lt(this)};_.gb=function Jq(a){return Dq(this,a)};_.D=null;zm(167,168,DA);_.jb=function Tq(){return Ac(this.I)};_.Z=function Uq(){return Bc(Ac(this.I))};_.kb=function Vq(){Mq(this)};_.V=function Wq(a){a.d&&(a.e,false)&&(a.b=true)};_.fb=function Xq(){this.B&&ts(this.A,false,true)};_.$=function Yq(a){this.p=a;Nq(this);a.length==0&&(this.p=null)};_._=function Zq(a){this.q=a;Nq(this);a.length==0&&(this.q=null)};_.n=false;_.o=false;_.p=null;_.q=null;_.r=null;_.t=null;_.u=false;_.v=false;_.w=-1;_.x=false;_.y=null;_.z=false;_.B=false;_.C=-1;zm(166,167,DA);_.ab=function _q(){Jp(this.k)};_.bb=function ar(){Lp(this.k)};_.hb=function br(){return new lt(this.k)};_.gb=function cr(a){return Dq(this.k,a)};_.k=null;zm(169,168,DA,fr);_.jb=function hr(){return this.b};_.b=null;_.c=null;zm(170,166,DA,rr);_.ab=function tr(){try{Jp(this.k)}finally{Jp(this.b)}};_.bb=function ur(){try{Lp(this.k)}finally{Lp(this.b)}};_.kb=function vr(){mr(this)};_.W=function wr(a){switch(Qo(a.type)){case 4:case 8:case 64:case 16:case 32:if(!this.g&&!nr(this,a)){return}}Kp(this,a)};_.V=function xr(a){var b;b=a.e;!a.b&&Qo(a.e.type)==4&&nr(this,b)&&(b.preventDefault(),undefined);a.d&&(a.e,false)&&(a.b=true)};_.b=null;_.c=0;_.d=0;_.e=0;_.f=0;_.g=false;_.i=null;_.j=0;zm(171,1,BA,zr);_.T=function Ar(a){this.b.j=a.b};_.b=null;zm(175,157,DA);_.b=null;zm(174,175,DA,Ir);zm(173,174,DA,Kr,Lr);zm(172,173,DA,Mr);zm(176,1,{13:1,14:1,15:1,16:1,17:1,27:1,39:1},Or);_.b=null;zm(177,1,{},Rr);_.b=null;_.c=null;_.d=null;var Sr,Tr,Ur;zm(178,1,{});zm(179,178,{},Yr);_.b=null;var Zr;zm(180,1,{},as);_.b=null;zm(181,165,DA,ds);_.gb=function es(a){var b,c;c=Bc(a.I);b=$p(this,a);b&&rc(this.c,c);return b};_.c=null;zm(182,1,BA,hs);_.T=function is(a){gs()};zm(183,1,AA,ks);_.V=function ls(a){Oq(this.b,a)};_.b=null;zm(184,1,{26:1,27:1},ns);_.b=null;zm(185,3,{},us);_.b=null;_.c=false;_.d=false;_.e=0;_.f=-1;_.g=null;_.i=null;_.j=false;zm(186,10,qA,ws);_.K=function xs(){this.b.i=null;x(this.b,eb())};_.b=null;zm(188,154,EA,Gs);var Cs,Ds,Es;zm(189,1,{},Ls);_.ib=function Ms(a){a.E&&a.db()};zm(190,1,CA,Os);_.S=function Ps(a){Is()};zm(191,188,EA,Rs);zm(192,1,{},Xs);var Ts=null;zm(193,168,DA,dt);_.jb=function et(){return this.b};_.cb=function ft(){Jp(this);this.c.__listener=this};_.db=function gt(){this.c.__listener=null;Lp(this)};_.$=function ht(a){ao(this.I,DB,a)};_._=function it(a){ao(this.I,CB,a)};_.b=null;_.c=null;_.d=null;zm(194,1,{},lt);_.lb=function mt(){return this.b};_.mb=function nt(){return kt(this)};_.nb=function ot(){!!this.c&&this.d.gb(this.c)};_.c=null;_.d=null;zm(197,164,DA);_.W=function tt(a){var b;b=Qo(a.type);(b&896)!=0?Kp(this,a):Kp(this,a)};_.eb=function ut(){};zm(196,197,DA);zm(195,196,DA,wt);zm(198,46,FA);var zt,At,Bt,Ct,Dt;zm(199,198,FA,Ht);zm(200,198,FA,Jt);zm(201,198,FA,Lt);zm(202,198,FA,Nt);zm(203,165,DA,Qt);_.gb=function Rt(a){var b,c;c=Bc(a.I);b=$p(this,a);b&&rc(this.e,Bc(c));return b};zm(204,1,{},Yt);_.hb=function Zt(){return new au(this)};_.b=null;_.c=null;_.d=0;zm(205,1,{},au);_.lb=function bu(){return this.b<this.c.d-1};_.mb=function cu(){return _t(this)};_.nb=function du(){if(this.b<0||this.b>=this.c.d){throw new Ew}this.c.c.gb(this.c.b[this.b--])};_.b=-1;_.c=null;zm(209,1,{},iu);_.b=null;_.c=null;_.d=null;zm(210,1,GA,ku);_.ob=function lu(){fh(this.b,this.d,this.c)};_.b=null;_.c=null;_.d=null;zm(211,1,GA,nu);_.ob=function ou(){hh(this.b,this.d,this.c)};_.b=null;_.c=null;_.d=null;zm(213,1,{},su);_.b=0;zm(214,1,{},uu);_.b=0;_.c=0;_.d=0;zm(215,1,{},Ku);_.b=null;_.c=null;_.d=null;_.e=null;_.f=null;_.g=0;_.i=0;_.j=0;_.k=null;_.n=null;_.o=null;_.p=0;_.q=0;_.r=null;_.s=null;_.t=null;_.u=0;zm(216,1,{},Vu);_.pb=function Wu(a){var b,c;if(a==39){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1);b=Ru(this,this.b,this.e);Uu(this,b,this.e);this.c=b.c.c.length;b.c.g+1;Mu(this)}if(a==37){--this.e;this.e<0&&(this.e=0);b=Ru(this,this.b,this.e);Uu(this,b,this.e);this.c=b.c.c.length;b.c.g+1;Mu(this)}if(a==8||a==46){this.B=this.f;c=new vx(this.b);rx(c,this.e);this.b=c.b.b;this.e>=0&&--this.e;b=Ru(this,this.b,this.e);Uu(this,b,this.e);this.f=Eu(b.c);this.c=b.c.c.length;Mu(this)}};_.qb=function Xu(a,b){var c,d;if(Ww(a,WC)||Ww(a,XC)||Ww(a,YC)||Ww(a,ZC)){this.B=this.f;d=new vx(this.b);sx(d,this.e,a);this.b=d.b.b;++this.e;c=Ru(this,this.b,this.e);Uu(this,c,this.e);this.f=Eu(c.c);this.c=c.c.c.length;c.c.g+1;Mu(this)}if(Ww(a,'a')||Ww(a,$C)||Ww(a,'c')||Ww(a,'t')){this.B=this.f;d=new vx(this.b);tx(d,this.e,this.e+1,a.toUpperCase());this.b=d.b.b;c=Ru(this,this.b,this.e);Uu(this,c,this.e);this.f=Eu(c.c);this.c=c.c.c.length;c.c.g+1;Mu(this)}if(Ww(a,_C)||Ww(a,HB)||Ww(a,aD)||Ww(a,'_')){if(Ww(a,_C)||Ww(a,aD)){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1)}else{--this.e;this.e<0&&(this.e=0)}c=Ru(this,this.b,this.e);Uu(this,c,this.e);this.c=c.c.c.length;c.c.g+1;Mu(this)}if(b==39){++this.e;this.e>this.b.length-1&&(this.e=this.b.length-1);c=Ru(this,this.b,this.e);Uu(this,c,this.e);this.c=c.c.c.length;c.c.g+1;Mu(this)}if(b==37){--this.e;this.e<0&&(this.e=0);c=Ru(this,this.b,this.e);Uu(this,c,this.e);this.c=c.c.c.length;c.c.g+1;Mu(this)}};_.rb=function Yu(a){var b;if(a>=0&&a<=this.c){b=Ru(this,this.b,a);Uu(this,b,a);this.c=b.c.c.length;this.e=a;Mu(this)}};_.sb=function $u(a){var b;a!=null&&rv(this.z,a);this.z.f=bD;this.z.i=cD;this.z.d=dD;this.z.c=eD;this.z.e=fD;this.g=this.z.b;this.b=this.z.b;this.c=this.b.length;this.D=this.z.f;this.E=this.z.g;this.H=this.z.i;this.v=this.z.d;this.u=this.z.c;this.A=this.z.e;(Ww(this.v,aC)||Ww(this.u,aC))&&(this.A=UA);b=Ru(this,this.g,-1);this.i=b.c.f;this.j=b.c.r;this.c=b.c.c.length;this.f=Eu(b.c);Jr(this.s,b.b.c+'<\/pre><\/body><\/html>')};_.tb=function av(a){var b,c,d,e,f;this.C=new Iv;if(a==1){b=new ew;b.c=gD;Gv(this.C,b);d=new bw;d.c='Your change does not make the mature mRNA shorter.';Gv(this.C,d)}else if(a==2){b=new ew;b.c=gD;Gv(this.C,b);d=new Ov;d.c='Your change does not make the protein longer.';Gv(this.C,d)}else if(a==3){b=new ew;b.c=gD;Gv(this.C,b);d=new $v;d.c='Your change does not make the protein shorter.';Gv(this.C,d)}else if(a==4){b=new ew;b.c=gD;Gv(this.C,b);d=new Uv;d.c='Your change does not prevent mRNA from being made.';Gv(this.C,d);f=new Rv;f.c='Your change does not prevent protein from being made';Gv(this.C,f)}else if(a==5){c=new Xv;c.b=15;c.c='Your protein does not have 5 amino acids.';Gv(this.C,c);e=new Lv;e.b=1;e.c='Your gene does not contain one intron.';Gv(this.C,e)}};_.b=null;_.c=0;_.d=null;_.e=0;_.f=UA;_.g=null;_.i=UA;_.j=UA;_.k=null;_.n=null;_.o=false;_.p=null;_.q=null;_.r=null;_.s=null;_.t=null;_.u=null;_.v=null;_.w=null;_.x=null;_.y=null;_.A=null;_.B=UA;_.C=null;_.D=null;_.E=0;_.F=null;_.G=null;_.H=null;_.I=null;zm(217,1,HA,dv);_.R=function ev(a){mr(this.b.k);this.b.p.I[hD]=UA};_.b=null;zm(218,1,{},gv);_.b=null;zm(219,1,HA,iv);_.R=function jv(a){var b,c;this.b.B=this.b.f;c=vc(this.b.p.I,hD);c=c.toUpperCase();c=$w(c,'[^AGCT]',UA);this.b.b=c;this.b.e=-1;b=Ru(this.b,this.b.b,-1);Uu(this.b,b,-1);this.b.f=Eu(b.c);this.b.c=b.c.c.length;mr(this.b.k);Mu(this.b)};_.b=null;zm(220,1,HA,lv);_.R=function mv(a){var b;this.b.b=this.b.g;b=Ru(this.b,this.b.b,-1);Uu(this.b,b,-1);this.b.f=Eu(b.c);this.b.c=b.c.c.length;Mu(this.b)};_.b=null;zm(221,1,HA,ov);_.R=function pv(a){Kq(this.b.k)};_.b=null;zm(222,1,{},sv);_.b=null;_.c=null;_.d=null;_.e=null;_.f=null;_.g=0;_.i=null;zm(223,1,{},uv);_.b=null;_.c=null;zm(224,1,{48:1},yv);_.b=0;_.c=0;_.d=false;_.e=false;_.f=0;_.g=0;_.i=false;zm(225,1,{},Av);_.b=null;_.c=null;zm(226,1,{},Dv);_.tS=function Ev(){return Cv(this)};_.b=null;_.c=0;_.d=null;_.e=null;_.f=0;_.g=null;_.i=null;_.j=null;zm(227,1,{},Iv);_.b=null;zm(229,1,IA);_.c='unassigned';zm(228,229,IA,Lv);_.ub=function Mv(a){return a.c==this.b+1};_.b=0;zm(230,229,IA,Ov);_.ub=function Pv(a){return a.d.length>a.j.length};zm(231,229,IA,Rv);_.ub=function Sv(a){return Ww(a.d,UA)};zm(232,229,IA,Uv);_.ub=function Vv(a){return Ww(a.e,UA)};zm(233,229,IA,Xv);_.ub=function Yv(a){return a.d.length==this.b};_.b=0;zm(234,229,IA,$v);_.ub=function _v(a){return a.d.length<a.j.length};zm(235,229,IA,bw);_.ub=function cw(a){return a.e.length<a.i.length};zm(236,229,IA,ew);_.ub=function fw(a){var b,c,d,e;e=a.g;b=a.b;if(e.length!=b.length)return false;d=0;for(c=0;c<e.length;++c){e.charCodeAt(c)!=b.charCodeAt(c)&&++d}if(d==1)return true;return false};zm(237,15,sA,hw);zm(238,1,{50:1,51:1,53:1},mw);_.eQ=function nw(a){return Yh(a,51)&&Wh(a,51).b==this.b};_.hC=function ow(){return this.b?1231:1237};_.tS=function pw(){return this.b?'true':'false'};_.b=false;var jw,kw;zm(239,1,{},rw);_.tS=function yw(){return ((this.b&2)!=0?'interface ':(this.b&1)!=0?UA:'class ')+this.d};_.b=0;_.c=0;_.d=null;zm(240,15,sA,Aw);zm(241,15,sA,Cw);zm(242,15,sA,Ew,Fw);zm(243,15,sA,Hw,Iw);zm(247,15,sA,Nw,Ow);var Pw;zm(249,1,{50:1,55:1},Sw);_.tS=function Tw(){return this.b+'.'+this.d+'(Unknown Source'+(this.c>=0?iD+this.c:UA)+tB};_.b=null;_.c=0;_.d=null;_=String.prototype;_.cM={1:1,50:1,52:1,53:1};_.eQ=function ex(a){return Ww(this,a)};_.hC=function fx(){return mx(this)};_.tS=_.toString;var hx,ix=0,jx;zm(251,1,JA,ux,vx);_.tS=function wx(){return this.b.b};zm(252,1,JA,zx);_.tS=function Ax(){return this.b.b};zm(253,15,sA,Cx);zm(254,1,{});_.vb=function Gx(a){throw new Cx('Add not supported on this collection')};_.wb=function Hx(a){var b;b=Ex(this.hb(),a);return !!b};_.xb=function Ix(){return this.zb()==0};_.yb=function Jx(a){var b;b=Ex(this.hb(),a);if(b){b.nb();return true}else{return false}};_.tS=function Kx(){return Fx(this)};zm(256,1,KA);_.eQ=function Ox(a){var b,c,d,e,f;if(a===this){return true}if(!Yh(a,58)){return false}e=Wh(a,58);if(this.e!=e.e){return false}for(c=new uy((new my(e)).b);Yy(c.b);){b=c.c=Wh(Zy(c.b),59);d=b.Bb();f=b.Cb();if(!(d==null?this.d:Yh(d,1)?iD+Wh(d,1) in this.f:Yx(this,d,~~xb(d)))){return false}if(!mA(f,d==null?this.c:Yh(d,1)?Xx(this,Wh(d,1)):Wx(this,d,~~xb(d)))){return false}}return true};_.hC=function Px(){var a,b,c;c=0;for(b=new uy((new my(this)).b);Yy(b.b);){a=b.c=Wh(Zy(b.b),59);c+=a.hC();c=~~c}return c};_.tS=function Qx(){var a,b,c,d;d='{';a=false;for(c=new uy((new my(this)).b);Yy(c.b);){b=c.c=Wh(Zy(c.b),59);a?(d+=jD):(a=true);d+=UA+b.Bb();d+=aD;d+=UA+b.Cb()}return d+'}'};zm(255,256,KA);_.Ab=function gy(a,b){return _h(a)===_h(b)||a!=null&&wb(a,b)};_.b=null;_.c=null;_.d=false;_.e=0;_.f=null;zm(258,254,LA);_.eQ=function jy(a){var b,c,d;if(a===this){return true}if(!Yh(a,60)){return false}c=Wh(a,60);if(c.zb()!=this.zb()){return false}for(b=c.hb();b.lb();){d=b.mb();if(!this.wb(d)){return false}}return true};_.hC=function ky(){var a,b,c;a=0;for(b=this.hb();b.lb();){c=b.mb();if(c!=null){a+=xb(c);a=~~a}}return a};zm(257,258,LA,my);_.wb=function ny(a){return ly(this,a)};_.hb=function oy(){return new uy(this.b)};_.yb=function py(a){var b;if(ly(this,a)){b=Wh(a,59).Bb();cy(this.b,b);return true}return false};_.zb=function qy(){return this.b.e};_.b=null;zm(259,1,{},uy);_.lb=function vy(){return Yy(this.b)};_.mb=function wy(){return sy(this)};_.nb=function xy(){ty(this)};_.b=null;_.c=null;_.d=null;zm(261,1,MA);_.eQ=function Ay(a){var b;if(Yh(a,59)){b=Wh(a,59);if(mA(this.Bb(),b.Bb())&&mA(this.Cb(),b.Cb())){return true}}return false};_.hC=function By(){var a,b;a=0;b=0;this.Bb()!=null&&(a=xb(this.Bb()));this.Cb()!=null&&(b=xb(this.Cb()));return a^b};_.tS=function Cy(){return this.Bb()+aD+this.Cb()};zm(260,261,MA,Dy);_.Bb=function Ey(){return null};_.Cb=function Fy(){return this.b.c};_.Db=function Gy(a){return ay(this.b,a)};_.b=null;zm(262,261,MA,Iy);_.Bb=function Jy(){return this.b};_.Cb=function Ky(){return Xx(this.c,this.b)};_.Db=function Ly(a){return by(this.c,this.b,a)};_.b=null;_.c=null;zm(263,254,{57:1});_.Eb=function Ny(a,b){throw new Cx('Add not supported on this list')};_.vb=function Oy(a){this.Eb(this.zb(),a);return true};_.eQ=function Qy(a){var b,c,d,e,f;if(a===this){return true}if(!Yh(a,57)){return false}f=Wh(a,57);if(this.zb()!=f.zb()){return false}d=new _y(this);e=f.hb();while(d.c<d.e.zb()){b=Zy(d);c=Zy(e);if(!(b==null?c==null:wb(b,c))){return false}}return true};_.hC=function Ry(){var a,b,c;b=1;a=new _y(this);while(a.c<a.e.zb()){c=Zy(a);b=31*b+(c==null?0:xb(c));b=~~b}return b};_.hb=function Ty(){return new _y(this)};_.Gb=function Uy(){return new fz(this,0)};_.Hb=function Vy(a){return new fz(this,a)};_.Ib=function Wy(a){throw new Cx('Remove not supported on this list')};zm(264,1,{},_y);_.lb=function az(){return Yy(this)};_.mb=function bz(){return Zy(this)};_.nb=function cz(){$y(this)};_.c=0;_.d=-1;_.e=null;zm(265,264,{},fz);_.b=null;zm(266,258,LA,iz);_.wb=function jz(a){return Ux(this.b,a)};_.hb=function kz(){return hz(this)};_.zb=function lz(){return this.c.b.e};_.b=null;_.c=null;zm(267,1,{},oz);_.lb=function pz(){return Yy(this.b.b)};_.mb=function qz(){return nz(this)};_.nb=function rz(){ty(this.b)};_.b=null;zm(268,263,NA,Az);_.Eb=function Bz(a,b){(a<0||a>this.c)&&Sy(a,this.c);Kz(this.b,a,0,b);++this.c};_.vb=function Cz(a){return tz(this,a)};_.wb=function Dz(a){return wz(this,a,0)!=-1};_.Fb=function Ez(a){return vz(this,a)};_.xb=function Fz(){return this.c==0};_.Ib=function Gz(a){return xz(this,a)};_.yb=function Hz(a){return yz(this,a)};_.zb=function Iz(){return this.c};_.c=0;var Lz;zm(270,263,NA,Oz);_.wb=function Pz(a){return false};_.Fb=function Qz(a){throw new Hw};_.zb=function Rz(){return 0};zm(271,255,{50:1,58:1},Uz);zm(272,258,{50:1,60:1},Zz);_.vb=function $z(a){return Wz(this,a)};_.wb=function _z(a){return Ux(this.b,a)};_.xb=function aA(){return this.b.e==0};_.hb=function bA(){return hz(Nx(this.b))};_.yb=function cA(a){return Yz(this,a)};_.zb=function dA(){return this.b.e};_.tS=function eA(){return Fx(Nx(this.b))};_.b=null;zm(273,261,MA,gA);_.Bb=function hA(){return this.b};_.Cb=function iA(){return this.c};_.Db=function jA(a){var b;b=this.c;this.c=a;return b};_.b=null;_.c=null;zm(274,15,sA,lA);var OA=Fb;var Il=tw(kD,'Object',1),mi=tw(lD,'JavaScriptObject$',18),sm=sw(mD,'Object;',276),Ol=tw(kD,'Throwable',17),Dl=tw(kD,'Exception',16),Jl=tw(kD,'RuntimeException',15),Kl=tw(kD,'StackTraceElement',249),tm=sw(mD,'StackTraceElement;',277),yj=tw('com.google.gwt.lang.','SeedUtil',118),Cl=tw(kD,'Enum',46),il=tw(nD,'GenexGWT',216),el=tw(nD,'GenexGWT$1',217),fl=tw(nD,'GenexGWT$2',219),gl=tw(nD,'GenexGWT$3',220),hl=tw(nD,'GenexGWT$4',221),dl=tw(nD,'GenexGWT$1DeferredCommand',218),ni=tw(lD,'Scheduler',21),zl=tw(kD,'Boolean',238),im=sw(UA,'[C',278),Bl=tw(kD,'Class',239),Nl=tw(kD,VA,2),um=sw(mD,'String;',279),Al=tw(kD,'ClassCastException',240),Ml=tw(kD,'StringBuilder',252),yl=tw(kD,'ArrayStoreException',237),li=tw(lD,'JavaScriptException',14),Jk=tw(oD,'UIObject',158),Tk=tw(oD,'Widget',157),qk=tw(oD,'LabelBase',175),rk=tw(oD,'Label',174),lk=tw(oD,'HTML',173),mk=tw(oD,'HasHorizontalAlignment$AutoHorizontalAlignmentConstant',178),nk=tw(oD,'HasHorizontalAlignment$HorizontalAlignmentConstant',179),xj=uw(pD,'HasDirection$Direction',111,Ih),pm=sw('[Lcom.google.gwt.i18n.client.','HasDirection$Direction;',280),sk=tw(oD,'Panel',156),Gk=tw(oD,'SimplePanel',168),Ek=tw(oD,'ScrollPanel',193),Fk=tw(oD,'SimplePanel$1',194),ck=tw(oD,'ComplexPanel',155),Xj=tw(oD,'AbsolutePanel',154),_k=tw(qD,rD,108),vj=tw(sD,rD,107),$j=tw(oD,'AttachDetachException',159),Yj=tw(oD,'AttachDetachException$1',160),Zj=tw(oD,'AttachDetachException$2',161),Ck=tw(oD,'RootPanel',188),Bk=tw(oD,'RootPanel$DefaultRootPanel',191),zk=tw(oD,'RootPanel$1',189),Ak=tw(oD,'RootPanel$2',190),yk=tw(oD,'PopupPanel',167),dk=tw(oD,'DecoratedPopupPanel',166),ik=tw(oD,'DialogBox',170),gk=tw(oD,'DialogBox$CaptionImpl',172),hk=tw(oD,'DialogBox$MouseHandler',176),fk=tw(oD,'DialogBox$1',171),ji=tw(tD,'Animation',3),xk=tw(oD,'PopupPanel$ResizeAnimation',185),Sj=tw(uD,'Timer',10),wk=tw(oD,'PopupPanel$ResizeAnimation$1',186),tk=tw(oD,'PopupPanel$1',182),uk=tw(oD,'PopupPanel$3',183),vk=tw(oD,'PopupPanel$4',184),ci=tw(tD,'Animation$1',4),ii=tw(tD,'AnimationScheduler',5),di=tw(tD,'AnimationScheduler$AnimationHandle',6),Rj=tw(uD,'Timer$1',144),Wk=tw(qD,'Event',81),rj=tw(sD,'GwtEvent',80),Qj=tw(uD,'Event$NativePreviewEvent',142),Uk=tw(qD,'Event$Type',84),qj=tw(sD,'GwtEvent$Type',83),bk=tw(oD,'CellPanel',165),Qk=tw(oD,'VerticalPanel',203),ok=tw(oD,'HasVerticalAlignment$VerticalAlignmentConstant',180),kk=tw(oD,'FocusWidget',164),Pk=tw(oD,'ValueBoxBase',197),Hk=tw(oD,'TextBoxBase',196),Ik=tw(oD,'TextBox',195),Ok=uw(oD,'ValueBoxBase$TextAlignment',198,Ft),qm=sw(vD,'ValueBoxBase$TextAlignment;',281),Kk=uw(oD,'ValueBoxBase$TextAlignment$1',199,null),Lk=uw(oD,'ValueBoxBase$TextAlignment$2',200,null),Mk=uw(oD,'ValueBoxBase$TextAlignment$3',201,null),Nk=uw(oD,'ValueBoxBase$TextAlignment$4',202,null),wj=tw(pD,'AutoDirectionHandler',109),_j=tw(oD,'ButtonBase',163),ak=tw(oD,'Button',162),pk=tw(oD,'HorizontalPanel',181),si=tw(wD,'StringBufferImpl',31),jl=tw(nD,'GenexParams',222),am=tw(xD,'AbstractMap',256),Vl=tw(xD,'AbstractHashMap',255),em=tw(xD,'HashMap',271),Ql=tw(xD,'AbstractCollection',254),bm=tw(xD,'AbstractSet',258),Sl=tw(xD,'AbstractHashMap$EntrySet',257),Rl=tw(xD,'AbstractHashMap$EntrySetIterator',259),_l=tw(xD,'AbstractMapEntry',261),Tl=tw(xD,'AbstractHashMap$MapEntryNull',260),Ul=tw(xD,'AbstractHashMap$MapEntryString',262),$l=tw(xD,'AbstractMap$1',266),Zl=tw(xD,'AbstractMap$1$1',267),fm=tw(xD,'HashSet',272),Zi=tw(yD,'DomEvent',79),$i=tw(yD,'HumanInputEvent',78),aj=tw(yD,'MouseEvent',77),Xi=tw(yD,'ClickEvent',76),Yi=tw(yD,'DomEvent$Type',82),ek=tw(oD,'DecoratorPanel',169),qi=tw(wD,'SchedulerImpl',23),oi=tw(wD,'SchedulerImpl$Flusher',24),pi=tw(wD,'SchedulerImpl$Rescuer',25),ri=tw(wD,'StringBufferImplAppend',32),ki=tw(lD,'Duration',12),Wi=uw(zD,'Style$Unit',66,ne),om=sw(AD,'Style$Unit;',282),xi=uw(zD,'Style$Display',45,$c),km=sw(AD,'Style$Display;',283),Ci=uw(zD,'Style$Overflow',51,od),lm=sw(AD,'Style$Overflow;',284),Hi=uw(zD,'Style$Position',56,Ed),mm=sw(AD,'Style$Position;',285),Mi=uw(zD,'Style$TextAlign',61,Ud),nm=sw(AD,'Style$TextAlign;',286),Ni=uw(zD,'Style$Unit$1',67,null),Oi=uw(zD,'Style$Unit$2',68,null),Pi=uw(zD,'Style$Unit$3',69,null),Qi=uw(zD,'Style$Unit$4',70,null),Ri=uw(zD,'Style$Unit$5',71,null),Si=uw(zD,'Style$Unit$6',72,null),Ti=uw(zD,'Style$Unit$7',73,null),Ui=uw(zD,'Style$Unit$8',74,null),Vi=uw(zD,'Style$Unit$9',75,null),ti=uw(zD,'Style$Display$1',47,null),ui=uw(zD,'Style$Display$2',48,null),vi=uw(zD,'Style$Display$3',49,null),wi=uw(zD,'Style$Display$4',50,null),yi=uw(zD,'Style$Overflow$1',52,null),zi=uw(zD,'Style$Overflow$2',53,null),Ai=uw(zD,'Style$Overflow$3',54,null),Bi=uw(zD,'Style$Overflow$4',55,null),Di=uw(zD,'Style$Position$1',57,null),Ei=uw(zD,'Style$Position$2',58,null),Fi=uw(zD,'Style$Position$3',59,null),Gi=uw(zD,'Style$Position$4',60,null),Ii=uw(zD,'Style$TextAlign$1',62,null),Ji=uw(zD,'Style$TextAlign$2',63,null),Ki=uw(zD,'Style$TextAlign$3',64,null),Li=uw(zD,'Style$TextAlign$4',65,null),jk=tw(oD,'DirectionalTextHelper',177),Pl=tw(kD,'UnsupportedOperationException',253),Fl=tw(kD,'IllegalStateException',242),Tj=tw(uD,'Window$ClosingEvent',146),tj=tw(sD,'HandlerManager',102),Uj=tw(uD,'Window$WindowHandlers',147),Vk=tw(qD,'EventBus',105),$k=tw(qD,'SimpleEventBus',104),sj=tw(sD,'HandlerManager$Bus',103),Xk=tw(qD,'SimpleEventBus$1',209),Yk=tw(qD,'SimpleEventBus$2',210),Zk=tw(qD,'SimpleEventBus$3',211),Sk=tw(oD,'WidgetCollection',204),rm=sw(vD,'Widget;',287),Rk=tw(oD,'WidgetCollection$WidgetIterator',205),Hl=tw(kD,'NullPointerException',247),El=tw(kD,'IllegalArgumentException',241),Dk=tw(oD,'ScrollImpl',192),Ll=tw(kD,'StringBuffer',251),nj=tw(BD,'CloseEvent',99),mj=tw(BD,'AttachEvent',98),_i=tw(yD,'MouseDownEvent',85),ej=tw(yD,'MouseUpEvent',89),bj=tw(yD,'MouseMoveEvent',86),dj=tw(yD,'MouseOverEvent',88),cj=tw(yD,'MouseOutEvent',87),zj=tw('com.google.gwt.text.shared.','AbstractRenderer',121),Bj=tw(CD,'PassthroughRenderer',123),Aj=tw(CD,'PassthroughParser',122),fj=tw(yD,'PrivateMap',90),uj=tw(sD,'LegacyHandlerWrapper',106),Pj=tw(DD,'TouchScroller',127),Oj=tw(DD,'TouchScroller$TemporalPoint',137),Mj=tw(DD,'TouchScroller$MomentumCommand',134),Nj=tw(DD,'TouchScroller$MomentumTouchRemovalCommand',136),Lj=tw(DD,'TouchScroller$MomentumCommand$1',135),Fj=tw(DD,'TouchScroller$1',128),Gj=tw(DD,'TouchScroller$2',129),Hj=tw(DD,'TouchScroller$3',130),Ij=tw(DD,'TouchScroller$4',131),Jj=tw(DD,'TouchScroller$5',132),Kj=tw(DD,'TouchScroller$6',133),hm=tw(xD,'NoSuchElementException',274),gm=tw(xD,'MapEntryImpl',273),Gl=tw(kD,'IndexOutOfBoundsException',243),jj=tw(yD,'TouchEvent',93),lj=tw(yD,'TouchStartEvent',97),ij=tw(yD,'TouchEvent$TouchSupportDetector',95),kj=tw(yD,'TouchMoveEvent',96),hj=tw(yD,'TouchEndEvent',94),gj=tw(yD,'TouchCancelEvent',92),Cj=tw(DD,'DefaultMomentum',124),Dj=tw(DD,'Momentum$State',125),Yl=tw(xD,'AbstractList',263),cm=tw(xD,'ArrayList',268),Wl=tw(xD,'AbstractList$IteratorImpl',264),Xl=tw(xD,'AbstractList$ListIteratorImpl',265),ml=tw(nD,'VisibleGene',225),cl=tw(nD,'Gene',215),ul=tw(ED,'Requirement',229),tl=tw(ED,'ProteinLengthRequirement',233),pl=tw(ED,'IntronNumberRequirement',228),ol=tw(FD,'Problem',227),xl=tw(ED,'SingleMutationRequirement',236),wl=tw(ED,'ShortermRNARequirement',235),ql=tw(ED,'LongerProteinRequirement',230),vl=tw(ED,'ShorterProteinRequirement',234),sl=tw(ED,'NomRNARequirement',232),rl=tw(ED,'NoProteinRequirement',231),oj=tw(BD,'ResizeEvent',100),kl=tw(nD,'HTMLContainer',223),Wj=tw(GD,'HistoryImpl',151),Vj=tw(GD,'HistoryImplTimer',152),ll=tw(nD,'Nucleotide',224),bl=tw(nD,'Exon',214),nl=tw(FD,'GenexState',226),pj=tw(BD,'ValueChangeEvent',101),dm=tw(xD,'Collections$EmptyList',270),al=tw(nD,'ColorSequencer',213),hi=tw(tD,'AnimationSchedulerImpl',7),gi=tw(tD,'AnimationSchedulerImplTimer',8),fi=tw(tD,'AnimationSchedulerImplTimer$AnimationHandleImpl',11),jm=sw('[Lcom.google.gwt.animation.client.','AnimationSchedulerImplTimer$AnimationHandleImpl;',288),ei=tw(tD,'AnimationSchedulerImplTimer$1',9),Ej=tw(DD,'Point',126);$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalEnd'});if ($wnd.genex) $wnd.genex.onScriptLoad();
 --></script></body></html>
\ No newline at end of file
diff --git a/common/static/js/capa/genex/4EEB1DCF4B30D366C27968D1B5C0BD04.cache.html b/common/static/js/capa/genex/FF175D5583BDD5ACF40C7F0AFF9A374B.cache.html
similarity index 87%
rename from common/static/js/capa/genex/4EEB1DCF4B30D366C27968D1B5C0BD04.cache.html
rename to common/static/js/capa/genex/FF175D5583BDD5ACF40C7F0AFF9A374B.cache.html
index 4aa12e55d4..ca07bf3292 100644
--- a/common/static/js/capa/genex/4EEB1DCF4B30D366C27968D1B5C0BD04.cache.html
+++ b/common/static/js/capa/genex/FF175D5583BDD5ACF40C7F0AFF9A374B.cache.html
@@ -1,4 +1,4 @@
-<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.5.0";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '4EEB1DCF4B30D366C27968D1B5C0BD04';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script><!--
+<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.5.0";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = 'FF175D5583BDD5ACF40C7F0AFF9A374B';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script><!--
 function ZA(){}
 function Ub(){}
 function kc(){}
@@ -647,5 +647,5 @@ function $u(a){if(Hx(a,TF))return UF;if(Hx(a,VF))return UF;if(Hx(a,WF))return XF
 var GB='',oJ='\tCurrent DNA=',pJ='\tNum Exons=',rJ='\tProtein=',qJ='\tRNA=',nJ='\tSelected base=',kJ='\tStarting DNA=',lJ='\tStarting mRNA=',mJ='\tStarting protein=',GH='\n',sJ='\n\n',SB='\n ',OH="\n3'-",TB=' ',DH='    ',FH='       ',EH='        ',HH='    .    |',_H=' N-',RC=' exceptions caught: ',kD='"/&gt;',fE='#',EJ='$',eE='%23',mD="').<br>Modify your application's host HTML page doctype, or update your custom 'document.compatMode' configuration property settings.",JB='(',CJ='(Unknown Source',sE='(null handle)',HJ='(this Collection)',hD=')',KB=') ',_C='). Expect more errors.\n',RI='+',gD=',',GJ=', ',OJ=', Size: ',rE='-',mI="-3'\n",NH="-3'\n   ",PH="-5'\n",fI='-C',aI='-C\n',BJ='.',MD='.call(this) }',PD='.call(this)}',SD='.call(w.event.srcElement)}',XB='/>',lF='0',GE='0px',AF='1',nE='325px',zH="5'-",JH="5'-<span id='dna-strand'>",lE='818px',OB=':',FB=': ',SC='; ',WB='<',bI='<\/EM>',LH="<\/EM>\n3'-",pI="<\/EM>-3'\n",MH="<\/EM>-5'\n",KH="<\/EM><\/span>-3'\n   ",iE='<\/div><\/body><\/html>',GI='<\/font><\/pre><br><br><br><font size=+1><\/font><\/body><\/html>',YI='<\/pre><\/body><\/html>',gI='<\/pre><h3>',nI='<\/pre><h3>pre-mRNA: <EM class=exon>Ex<\/EM><EM class=next>o<\/EM><EM class=another>n<\/EM> Intron<\/h3><pre>',oI='<\/pre><h3>pre-mRNA: EXON intron<\/h3><pre>',YH='<\/style><\/head><body>',cI='<\/u>',AE="<BUTTON type='button'><\/BUTTON>",kI='<EM class=',qI='<EM class=promoter>',eI='<EM class=selected>',rI='<EM class=terminator>',BH='<EM class=terminator>Terminator<\/EM><\/h3><pre>\n',yH='<[^<]*>',FI='<font color=blue>',ZH='<font color=red>none<\/font>\n',CH='<h3>DNA: promoter, terminator<\/h3><pre>\n',hE='<html><body onload="if(parent.__gwt_onHistoryLoad)parent.__gwt_onHistoryLoad(__gwt_historyToken.innerText)"><div id="__gwt_historyToken">',AH='<html><h3>DNA: <EM class=promoter>Promoter<\/EM>',QH='<html><head>',RH='<style type="text/css">',dI='<u>',SI='=',lI='>',zB='@',JI='A',UG='AAA',XI='AAAAAAAAAAAAA',TG='AAC',WG='AAG',RG='AAU',kC='ABSOLUTE',zG='ACA',yG='ACC',AG='ACG',wG='ACU',oH='AGA',nH='AGC',pH='AGG',mH='AGU',eG='AUA',dG='AUC',fG='AUG',hC='AUTO',bG='AUU',KK='AbsolutePanel',OL='AbstractCollection',ML='AbstractHashMap',QL='AbstractHashMap$EntrySet',RL='AbstractHashMap$EntrySetIterator',TL='AbstractHashMap$MapEntryNull',UL='AbstractHashMap$MapEntryString',aO='AbstractList',cO='AbstractList$IteratorImpl',dO='AbstractList$ListIteratorImpl',LL='AbstractMap',VL='AbstractMap$1',WL='AbstractMap$1$1',SL='AbstractMapEntry',zN='AbstractRenderer',PL='AbstractSet',JJ='Add not supported on this collection',PJ='Add not supported on this list',CG='Ala',zC='An event type',aL='Animation',iL='Animation$1',jL='AnimationScheduler',kL='AnimationScheduler$AnimationHandle',CO='AnimationSchedulerImpl',DO='AnimationSchedulerImplTimer',HO='AnimationSchedulerImplTimer$1',EO='AnimationSchedulerImplTimer$AnimationHandleImpl',GO='AnimationSchedulerImplTimer$AnimationHandleImpl;',iH='Arg',bO='ArrayList',rK='ArrayStoreException',SG='Asn',YG='Asp',OK='AttachDetachException',PK='AttachDetachException$1',QK='AttachDetachException$2',sN='AttachEvent',FL='AutoDirectionHandler',bC='BLOCK',iD='BackCompat',lK='Boolean',HL='Button',GL='ButtonBase',LI='C',OG='CAA',WI='CAAAG',hJ='CAAGGCTATAACCGAGATTGATGCCTTGTGCGATAAGGTGTGTCCCCCCCCAAAGTGTCGGATGTCGAGTGCGCGTGCAAAAAAAAACAAAGGCGAGGACCTTAAGAAGGTGTGAGGGGGCGCTCGAT',NG='CAC',QG='CAG',LG='CAU',uG='CCA',tG='CCC',vG='CCG',rG='CCU',mC='CENTER',kH='CGA',jH='CGC',lH='CGG',hH='CGU',xC='CM',uI='CORRECT',$B='CSS1Compat',_F='CUA',$F='CUC',aG='CUG',ZF='CUU',AI='Cancel',NC='Cannot add a handler with a null type',OC='Cannot add a null handler',PC='Cannot fire null event',wE='Cannot set a new parent without first clearing the old parent',dF='Caption',rL='CellPanel',NE='Center',nK='Class',pK='ClassCastException',aM='ClickEvent',rN='CloseEvent',AO='Collections$EmptyList',BO='ColorSequencer',JK='ComplexPanel',cH='Cys',XC='DEFAULT',AD='DOMMouseScroll',WK='DecoratedPopupPanel',cM='DecoratorPanel',$N='DefaultMomentum',XK='DialogBox',$K='DialogBox$1',YK='DialogBox$CaptionImpl',ZK='DialogBox$MouseHandler',VM='DirectionalTextHelper',ZL='DomEvent',bM='DomEvent$Type',iM='Duration',sC='EM',XH='EM.another {font-style: normal; background: #FFFF50; color: black}',VH='EM.exon {font-style: normal; background: #FF90FF; color: black}',WH='EM.next {font-style: normal; background: #FF8C00; color: black}',TH='EM.promoter {font-style: normal; background: #90FF90; color: black}',SH='EM.selected {font-style: normal; background: blue; color: red}',UH='EM.terminator {font-style: normal; background: #FF9090; color: black}',$C='ERROR: Possible problem with your *.gwt.xml module file.\nThe compile time user.agent value (ie6) does not match the runtime user.agent value (',tC='EX',DI='Enter New DNA Sequence',cF='Enter new DNA Sequence',cK='Enum',mL='Event',BC='Event type',oL='Event$NativePreviewEvent',pL='Event$Type',_M='EventBus',YJ='Exception',QC='Exception caught: ',xO='Exon',lC='FIXED',uL='FocusWidget',KI='G',$G='GAA',ZG='GAC',aH='GAG',XG='GAU',EG='GCA',DG='GCC',FG='GCG',BG='GCU',tH='GGA',sH='GGC',uH='GGG',UI='GGGGG',qH='GGU',kG='GUA',jG='GUC',lG='GUG',VI='GUGCG',hG='GUU',jD="GWT no longer supports Quirks Mode (document.compatMode=' BackCompat').<br>Make sure your application's host HTML page has a Standards Mode (document.compatMode=' CSS1Compat') doctype,<br>e.g. by using &lt;!doctype html&gt; at the start of your application's HTML page.<br><br>To continue using this unsupported rendering mode and risk layout problems, suppress this message by adding<br>the following line to your*.gwt.xml module file:<br>&nbsp;&nbsp;&lt;extend-configuration-property name=\"document.compatMode\" value=\"",fO='Gene',eK='GenexGWT',fK='GenexGWT$1',jK='GenexGWT$1DeferredCommand',gK='GenexGWT$2',hK='GenexGWT$3',iK='GenexGWT$4',JL='GenexParams',yO='GenexState',tJ='GenexState\n',PG='Gln',_G='Glu',rH='Gly',nL='GwtEvent',qL='GwtEvent$Type',fC='HIDDEN',yK='HTML',tO='HTMLContainer',ZM='HandlerManager',bN='HandlerManager$Bus',CK='HasDirection$Direction',EK='HasDirection$Direction;',zK='HasHorizontalAlignment$AutoHorizontalAlignmentConstant',AK='HasHorizontalAlignment$HorizontalAlignmentConstant',tL='HasVerticalAlignment$VerticalAlignmentConstant',NL='HashMap',XL='HashSet',MG='His',uO='HistoryImpl',vO='HistoryImplIE6',IL='HorizontalPanel',$L='HumanInputEvent',cE='IFRAME',wC='IN',sI='INCORRECT',cC='INLINE',dC='INLINE_BLOCK',BF='INPUT',cG='Ile',jN='IllegalArgumentException',XM='IllegalStateException',NJ='Index: ',TN='IndexOutOfBoundsException',RE='Inner',jO='IntronNumberRequirement',nC='JUSTIFY',sK='JavaScriptException',UJ='JavaScriptObject$',oC='LEFT',WC='LTR',xK='Label',wK='LabelBase',ME='Left',EN='LegacyHandlerWrapper',XF='Leu',oO='LongerProteinRequirement',VG='Lys',yC='MM',SN='MapEntryImpl',gG='Met',_N='Momentum$State',tN='MouseDownEvent',_L='MouseEvent',vN='MouseMoveEvent',xN='MouseOutEvent',wN='MouseOverEvent',uN='MouseUpEvent',MJ='Must call next() before remove().',aC='NONE',yI='New DNA Sequence',rO='NoProteinRequirement',RN='NoSuchElementException',qO='NomRNARequirement',wO='Nucleotide',pE='Null widget handle. If you are creating a composite, ensure that initWidget() has been called.',iN='NullPointerException',tI='OK',SJ='Object',WJ='Object;',vC='PC',rC='PCT',uC='PT',qC='PX',FK='Panel',CN='PassthroughParser',BN='PassthroughRenderer',UF='Phe',IO='Point',fD='Point(',VK='PopupPanel',fL='PopupPanel$1',gL='PopupPanel$3',hL='PopupPanel$4',bL='PopupPanel$ResizeAnimation',eL='PopupPanel$ResizeAnimation$1',DN='PrivateMap',sG='Pro',lO='Problem',iO='ProteinLengthRequirement',jC='RELATIVE',pC='RIGHT',VC='RTL',QJ='Remove not supported on this list',hO='Requirement',CI='Reset DNA Sequence',sO='ResizeEvent',OE='Right',RK='RootPanel',TK='RootPanel$1',UK='RootPanel$2',SK='RootPanel$DefaultRootPanel',ZJ='RuntimeException',gC='SCROLL',iC='STATIC',kK='Scheduler',eM='SchedulerImpl',fM='SchedulerImpl$Flusher',gM='SchedulerImpl$Rescuer',kN='ScrollImpl',lN='ScrollImpl$ScrollImplTrident',HK='ScrollPanel',bK='SeedUtil',aF='Selected Base = ',nG='Ser',pO='ShorterProteinRequirement',nO='ShortermRNARequirement',tE="Should only call onAttach when the widget is detached from the browser's document",uE="Should only call onDetach when the widget is attached to the browser's document",aN='SimpleEventBus',cN='SimpleEventBus$1',dN='SimpleEventBus$2',eN='SimpleEventBus$3',GK='SimplePanel',IK='SimplePanel$1',mO='SingleMutationRequirement',hM='StackTraceCreator$Collector',$J='StackTraceElement',_J='StackTraceElement;',jJ='State:\n',IB='String',oK='String;',mN='StringBuffer',qK='StringBuilder',qE='Style names cannot be empty',nM='Style$Display',FM='Style$Display$1',GM='Style$Display$2',HM='Style$Display$3',IM='Style$Display$4',oM='Style$Display;',pM='Style$Overflow',JM='Style$Overflow$1',KM='Style$Overflow$2',LM='Style$Overflow$3',MM='Style$Overflow$4',qM='Style$Overflow;',rM='Style$Position',NM='Style$Position$1',OM='Style$Position$2',PM='Style$Position$3',QM='Style$Position$4',sM='Style$Position;',uM='Style$TextAlign',RM='Style$TextAlign$1',SM='Style$TextAlign$2',TM='Style$TextAlign$3',UM='Style$TextAlign$4',vM='Style$TextAlign;',kM='Style$Unit',wM='Style$Unit$1',xM='Style$Unit$2',yM='Style$Unit$3',zM='Style$Unit$4',AM='Style$Unit$5',BM='Style$Unit$6',CM='Style$Unit$7',DM='Style$Unit$8',EM='Style$Unit$9',mM='Style$Unit;',MI='T',TI='TATAA',xL='TextBox',wL='TextBoxBase',vE="This widget's parent does not implement HasWidgets",xG='Thr',XJ='Throwable',dL='Timer',lL='Timer$1',ZN='TouchCancelEvent',YN='TouchEndEvent',UN='TouchEvent',WN='TouchEvent$TouchSupportDetector',XN='TouchMoveEvent',GN='TouchScroller',LN='TouchScroller$1',MN='TouchScroller$2',NN='TouchScroller$3',ON='TouchScroller$4',PN='TouchScroller$5',QN='TouchScroller$6',IN='TouchScroller$MomentumCommand',KN='TouchScroller$MomentumCommand$1',JN='TouchScroller$MomentumTouchRemovalCommand',HN='TouchScroller$TemporalPoint',VN='TouchStartEvent',gH='Trp',HG='Tyr',iJ='U',JG='UAA',IG='UAC',KG='UAG',GG='UAU',pG='UCA',oG='UCC',qG='UCG',mG='UCU',eH='UGA',dH='UGC',fH='UGG',bH='UGU',uK='UIObject',WF='UUA',VF='UUC',YF='UUG',TF='UUU',MK='UmbrellaException',AJ='Unknown',WM='UnsupportedOperationException',eC='VISIBLE',iG='Val',vL='ValueBoxBase',yL='ValueBoxBase$TextAlignment',BL='ValueBoxBase$TextAlignment$1',CL='ValueBoxBase$TextAlignment$2',DL='ValueBoxBase$TextAlignment$3',EL='ValueBoxBase$TextAlignment$4',AL='ValueBoxBase$TextAlignment;',zO='ValueChangeEvent',sL='VerticalPanel',eO='VisibleGene',vK='Widget',gN='Widget;',fN='WidgetCollection',hN='WidgetCollection$WidgetIterator',YM='Window$ClosingEvent',$M='Window$WindowHandlers',oN='WindowImplIE$1',pN='WindowImplIE$2',ZI='You did not make a single base substitution.',lD="Your *.gwt.xml module configuration prohibits the use of the current doucment rendering mode (document.compatMode=' ",$I='Your change does not make the mature mRNA shorter.',_I='Your change does not make the protein longer.',aJ='Your change does not make the protein shorter.',bJ='Your change does not prevent mRNA from being made.',cJ='Your change does not prevent protein from being made',eJ='Your gene does not contain one intron.',dJ='Your protein does not have 5 amino acids.',FJ='[',mK='[C',FO='[Lcom.google.gwt.animation.client.',lM='[Lcom.google.gwt.dom.client.',DK='[Lcom.google.gwt.i18n.client.',zL='[Lcom.google.gwt.user.client.ui.',VJ='[Ljava.lang.',gJ='[^AGCT]',DJ='\\',IJ=']',ID='_',ND='__gwt_dispatchDblClickEvent_',JD='__gwt_dispatchEvent_',QD='__gwt_dispatchUnhandledEvent_',gE='__gwt_historyFrame',jE='__gwt_historyToken',NI='a',rF='absolute',jF='align',HF='alpha(opacity=0)',NB='anonymous',xH='another',xF='auto',oF='block',pD='blur',hF='bottom',PI='c',KE='cellPadding',JE='cellSpacing',eF='center',qD='change',zJ='class ',oE='className',AC='click',pF='clip',_K='com.google.gwt.animation.client.',TJ='com.google.gwt.core.client.',dM='com.google.gwt.core.client.impl.',jM='com.google.gwt.dom.client.',YL='com.google.gwt.event.dom.client.',qN='com.google.gwt.event.logical.shared.',NK='com.google.gwt.event.shared.',BK='com.google.gwt.i18n.client.',aK='com.google.gwt.lang.',yN='com.google.gwt.text.shared.',AN='com.google.gwt.text.shared.testing.',FN='com.google.gwt.touch.client.',cL='com.google.gwt.user.client.',aD='com.google.gwt.user.client.DocumentModeAsserter',nN='com.google.gwt.user.client.impl.',tK='com.google.gwt.user.client.ui.',YC='com.google.gwt.useragent.client.UserAgentAsserter',LK='com.google.web.bindery.event.shared.',CD='contextmenu',rD='dblclick',WE='dialogBottom',YE='dialogContent',VE='dialogMiddle',UE='dialogTop',TC='dir',mF='display',VB='div',HI='dna-strand',zD='error',vH='exon',wJ='false',sD='focus',LB='function',MB='function ',nD='function __gwt_initWindowCloseHandler(beforeunload, unload) {\n  var wnd = window\n  , oldOnBeforeUnload = wnd.onbeforeunload\n  , oldOnUnload = wnd.onunload;\n  \n  wnd.onbeforeunload = function(evt) {\n    var ret, oldRet;\n    try {\n      ret = beforeunload();\n    } finally {\n      oldRet = oldOnBeforeUnload && oldOnBeforeUnload(evt);\n    }\n    // Avoid returning null as IE6 will coerce it into a string.\n    // Ensure that "" gets returned properly.\n    if (ret != null) {\n      return ret;\n    }\n    if (oldRet != null) {\n      return oldRet;\n    }\n    // returns undefined.\n  };\n  \n  wnd.onunload = function(evt) {\n    try {\n      unload();\n    } finally {\n      oldOnUnload && oldOnUnload(evt);\n      wnd.onresize = null;\n      wnd.onscroll = null;\n      wnd.onbeforeunload = null;\n      wnd.onunload = null;\n    }\n  };\n  \n  // Remove the reference once we\'ve initialize the handler\n  wnd.__gwt_initWindowCloseHandler = undefined;\n}\n',oD="function __gwt_initWindowResizeHandler(resize) {\n  var wnd = window, oldOnResize = wnd.onresize;\n  \n  wnd.onresize = function(evt) {\n    try {\n      resize();\n    } finally {\n      oldOnResize && oldOnResize(evt);\n    }\n  };\n  \n  // Remove the reference once we've initialize the handler\n  wnd.__gwt_initWindowResizeHandler = undefined;\n}\n",OI='g',QF='gecko',RF='gecko1_8',BI='genex-button',xI='genex-dialogbox',zI='genex-dialogbox-message',EI='genex-label',vI='genex-scrollpanel',dK='genex.client.gx.',bD='genex.client.gx.GenexGWT',kO='genex.client.problems.',gO='genex.client.requirements.',wI='genex_container',FD='gesturechange',GD='gestureend',ED='gesturestart',BE='gwt-Button',XE='gwt-DecoratedPopupPanel',PE='gwt-DecoratorPanel',ZE='gwt-DialogBox',bF='gwt-HTML',_E='gwt-Label',SE='gwt-PopupPanel',DF='gwt-TextBox',mE='height',DB='hidden',ZB='html',ZC='ie6',PF='ie8',OF='ie9',EF='iframe',yJ='interface ',RJ='java.lang.',KL='java.util.',FF="javascript:''",fF='justify',tD='keydown',uD='keypress',vD='keyup',xE='left',wD='load',xD='losecapture',UC='ltr',iI='mRNA and Protein (<font color=blue>previous<\/font>):<\/h3><pre>',jI='mRNA and Protein (previous on line below):<\/h3><pre>',hI='mature-',QB='message',iF='middle',dD='moduleStartup',CC='mousedown',DC='mousemove',EC='mouseout',FC='mouseover',GC='mouseup',BD='mousewheel',NF='msie',EB='must be non-negative',PB='name',wH='next',GF='no',nF='none',$H='none\n',HB='null',xJ='number',AB='offsetHeight',BB='offsetWidth',YB='on',eD='onModuleLoadStart',_D='onblur',HD='onclick',bE='oncontextmenu',aE='ondblclick',$D='onfocus',XD='onkeydown',YD='onkeypress',ZD='onkeyup',dE='onload',TD='onmousedown',VD='onmousemove',UD='onmouseup',WD='onmousewheel',wF='onresize',vF='onscroll',JC='ontouchstart',KF='opera',CB='overflow',DD='paste',II='pointer',TE='popupContent',zE='position',FE='px',uF='px)',tF='px, ',sF='rect(',HE='rect(0px, 0px, 0px, 0px)',qF='rect(auto, auto, auto, auto)',yF='relative',OD='return function() { w.__gwt_dispatchDblClickEvent_',LD='return function() { w.__gwt_dispatchEvent_',RD='return function() { w.__gwt_dispatchUnhandledEvent_',KC='return;',gF='right',_B='rtl',MF='safari',UB='script',yD='scroll',$E='span',cD='startup',QI='t',CE='table',DE='tbody',QE='td',CF='text',JF='this.__popup.currentStyle.zIndex',RB='toString',yE='top',HC='touchcancel',IC='touchend',LC='touchmove',MC='touchstart',LE='tr',vJ='true',uJ='unassigned',SF='unknown',fJ='value',kF='verticalAlign',EE='visibility',IE='visible',KD='w',LF='webkit',kE='width',IF='zIndex',zF='zoom',KJ='{',IH='|',LJ='}';var _,Om={},lB={25:1,27:1},vB={60:1},gB={6:1,9:1,50:1,53:1,54:1},bB={50:1},$A={},qB={46:1},tB={52:1},xB={50:1,57:1},nB={24:1,29:1,37:1,40:1,41:1,43:1,45:1},uB={58:1},rB={11:1,27:1},iB={29:1},jB={47:1,50:1,56:1},cB={50:1,56:1},fB={6:1,8:1,50:1,53:1,54:1},wB={59:1},eB={6:1,7:1,50:1,53:1,54:1},dB={5:1,6:1,50:1,53:1,54:1},mB={23:1,27:1},pB={44:1,50:1,53:1,54:1},_A={4:1,50:1},kB={27:1,36:1},aB={38:1},oB={24:1,29:1,37:1,40:1,41:1,42:1,43:1,45:1},sB={49:1},hB={10:1,50:1,53:1,54:1};Pm(1,-1,$A);_.eQ=function s(a){return this===a};_.gC=function t(){return this.cZ};_.hC=function u(){return Ib(this)};_.tS=function v(){return this.cZ.c+zB+tx(this.hC())};_.toString=function(){return this.tS()};_.tM=ZA;Pm(3,1,{});_.k=-1;_.n=false;_.o=false;_.p=null;_.q=-1;_.r=null;_.s=-1;_.t=false;Pm(4,1,{},C);_.a=null;Pm(5,1,{});Pm(6,1,{2:1});Pm(7,5,{});var G=null;Pm(8,7,{},M);Pm(10,1,aB);_.I=function W(){this.b||iA(P,this);this.J()};_.b=false;_.c=0;var P;Pm(9,10,aB,X);_.J=function Y(){L(this.a)};_.a=null;Pm(11,6,{2:1,3:1},ab);_.a=null;_.b=null;Pm(12,1,{},db);Pm(17,1,cB);_.K=function kb(){return this.e};_.tS=function lb(){var a,b;a=this.cZ.c;b=this.K();return b!=null?a+FB+b:a};_.e=null;Pm(16,17,cB);Pm(15,16,cB,mb);Pm(14,15,cB,ob);_.K=function ub(){this.c==null&&(this.d=rb(this.b),this.a=this.a+FB+pb(this.b),this.c=JB+this.d+KB+tb(this.b)+this.a,undefined);return this.c};_.a=GB;_.b=null;_.c=null;_.d=null;Pm(21,1,{});var zb=0,Ab=0,Bb=0,Cb=-1;Pm(23,21,{},Ub);_.a=null;_.b=null;_.c=null;_.d=false;_.e=null;_.f=null;_.g=null;_.i=false;var Mb;Pm(24,1,{},_b);_.L=function ac(){this.a.d=true;Qb(this.a);this.a.d=false;return this.a.i=Rb(this.a)};_.a=null;Pm(25,1,{},cc);_.L=function dc(){this.a.d&&Zb(this.a.e,1);return this.a.i};_.a=null;Pm(28,1,{},kc);_.N=function lc(a){return ec(a)};var Fc=null;Pm(45,1,{50:1,53:1,54:1});_.eQ=function dd(a){return this===a};_.hC=function ed(){return Ib(this)};_.tS=function fd(){return this.a};_.a=null;_.b=0;Pm(44,45,dB);var gd,hd,id,jd,kd;Pm(46,44,dB,od);Pm(47,44,dB,qd);Pm(48,44,dB,sd);Pm(49,44,dB,ud);Pm(50,45,eB);var wd,xd,yd,zd,Ad;Pm(51,50,eB,Ed);Pm(52,50,eB,Gd);Pm(53,50,eB,Id);Pm(54,50,eB,Kd);Pm(55,45,fB);var Md,Nd,Od,Pd,Qd;Pm(56,55,fB,Ud);Pm(57,55,fB,Wd);Pm(58,55,fB,Yd);Pm(59,55,fB,$d);Pm(60,45,gB);var ae,be,ce,de,ee;Pm(61,60,gB,ie);Pm(62,60,gB,ke);Pm(63,60,gB,me);Pm(64,60,gB,oe);Pm(65,45,hB);var qe,re,se,te,ue,ve,we,xe,ye,ze;Pm(66,65,hB,De);Pm(67,65,hB,Fe);Pm(68,65,hB,He);Pm(69,65,hB,Je);Pm(70,65,hB,Le);Pm(71,65,hB,Ne);Pm(72,65,hB,Pe);Pm(73,65,hB,Re);Pm(74,65,hB,Te);Pm(80,1,{});_.tS=function $e(){return zC};_.f=null;Pm(79,80,{});_.Q=function af(){this.e=false;this.f=null};_.e=false;Pm(78,79,{});_.P=function ff(){return this.R()};_.a=null;_.b=null;var bf=null;Pm(77,78,{});Pm(76,77,{});Pm(75,76,{},lf);_.O=function mf(a){ii(a,11).S(this)};_.R=function nf(){return jf};var jf;Pm(83,1,{});_.hC=function sf(){return this.c};_.tS=function tf(){return BC};_.c=0;var rf=0;Pm(82,83,{},uf);Pm(81,82,{12:1},vf);_.a=null;_.b=null;Pm(84,76,{},Af);_.O=function Bf(a){zf(this,ii(a,13))};_.R=function Cf(){return xf};var xf;Pm(85,76,{},Hf);_.O=function If(a){Gf(this,ii(a,14))};_.R=function Jf(){return Ef};var Ef;Pm(86,76,{},Nf);_.O=function Of(a){ii(ii(a,15),39)};_.R=function Pf(){return Lf};var Lf;Pm(87,76,{},Tf);_.O=function Uf(a){ii(ii(a,16),39)};_.R=function Vf(){return Rf};var Rf;Pm(88,76,{},$f);_.O=function _f(a){Zf(this,ii(a,17))};_.R=function ag(){return Xf};var Xf;Pm(89,1,{},eg);_.a=null;Pm(92,77,{});var hg=null;Pm(91,92,{},kg);_.O=function lg(a){An(ii(ii(a,18),34).a)};_.R=function mg(){return ig};var ig;Pm(93,92,{},qg);_.O=function rg(a){An(ii(ii(a,19),33).a)};_.R=function sg(){return og};var og;Pm(94,1,{},ug);Pm(95,92,{},zg);_.O=function Ag(a){yg(this,ii(a,20))};_.R=function Bg(){return wg};var wg;Pm(96,92,{},Gg);_.O=function Hg(a){Fg(this,ii(a,21))};_.R=function Ig(){return Dg};var Dg;Pm(97,79,{},Mg);_.O=function Ng(a){Lg(this,ii(a,22))};_.P=function Pg(){return Kg};_.a=false;var Kg=null;Pm(98,79,{},Sg);_.O=function Tg(a){ii(a,23).T(this)};_.P=function Vg(){return Rg};var Rg=null;Pm(99,79,{},Yg);_.O=function Zg(a){ii(a,25).U(this)};_.P=function _g(){return Xg};_.a=0;var Xg=null;Pm(100,79,{},dh);_.O=function eh(a){ch(ii(a,26))};_.P=function gh(){return bh};var bh=null;Pm(101,1,iB,lh,mh);_.V=function nh(a){jh(this,a)};_.a=null;_.b=null;Pm(104,1,{});Pm(103,104,{});_.a=null;_.b=0;_.c=false;Pm(102,103,{},Ch);Pm(105,1,{28:1},Eh);_.a=null;Pm(107,15,jB,Hh);_.a=null;Pm(106,107,jB,Kh);Pm(108,1,{27:1},Mh);Pm(110,45,{30:1,50:1,53:1,54:1},Vh);var Qh,Rh,Sh,Th;Pm(111,1,{},Xh);_.qI=0;var bi,ci;Pm(120,1,{});Pm(121,1,{},Vm);var Um=null;Pm(122,120,{},Ym);var Xm=null;Pm(123,1,{},an);Pm(124,1,{},fn);_.a=0;_.b=0;_.c=null;_.d=null;_.e=null;Pm(125,1,{32:1},ln,mn);_.eQ=function nn(a){var b;if(!ki(a,32)){return false}b=ii(a,32);return this.a==b.a&&this.b==b.b};_.hC=function on(){return oi(this.a)^oi(this.b)};_.tS=function pn(){return fD+this.a+gD+this.b+hD};_.a=0;_.b=0;Pm(126,1,{},Jn);_.a=null;_.b=null;_.c=false;_.f=null;_.g=null;_.n=null;_.o=null;_.p=null;_.r=false;_.s=null;var rn=null;Pm(127,1,{22:1,27:1},Ln);_.a=null;Pm(128,1,{21:1,27:1},Nn);_.a=null;Pm(129,1,{20:1,27:1},Pn);_.a=null;Pm(130,1,{19:1,27:1,33:1},Rn);_.a=null;Pm(131,1,{18:1,27:1,34:1},Tn);_.a=null;Pm(132,1,kB,Vn);_.W=function Wn(a){var b;if(1==fp(a.d.type)){b=new ln(a.d.clientX||0,a.d.clientY||0);if(xn(this.a,b)||yn(this.a,b)){a.a=true;a.d.cancelBubble=true;Ic(a.d)}}};_.a=null;Pm(133,1,{},Zn);_.L=function $n(){var a,b,c,d,e,f,g;if(this!=this.e.g){Yn(this);return false}a=cb(this.a);dn(this.d,a-this.c);this.c=a;cn(this.d,a);e=_m(this.d);e||Yn(this);Hn(this.e,this.d.d);d=oi(this.d.d.a);c=Ht(this.e.s);b=Ft(this.e.s);f=Gt(this.e.s);g=oi(this.d.d.b);if((f<=g||0>=g)&&(b<=d||c>=d)){Yn(this);return false}return e};_.c=0;_.d=null;_.e=null;_.f=null;Pm(134,1,lB,ao);_.U=function bo(a){Yn(this.a)};_.a=null;Pm(135,1,{},eo);_.L=function fo(){var a,b,c;a=eb();b=new Lz(this.a.q);while(b.b<b.d.Db()){c=ii(Jz(b),35);a-c.b>=2500&&Kz(b)}return this.a.q.b!=0};_.a=null;Pm(136,1,{35:1},io,jo);_.a=null;_.b=0;var ko=null,lo=null;var to=null;Pm(141,79,{},Ao);_.O=function Bo(a){ii(a,36).W(this);xo.c=false};_.P=function Do(){return wo};_.Q=function Eo(){yo(this)};_.a=false;_.b=false;_.c=false;_.d=null;var wo=null,xo=null;var Fo=null;Pm(143,1,mB,Jo);_.T=function Ko(a){while((Q(),P).b>0){R(ii(fA(P,0),38))}};var Lo=false,Mo=null,No=0,Oo=0,Po=false;Pm(145,79,{},_o);_.O=function ap(a){pi(a);null.Nb()};_.P=function bp(){return Zo};var Zo;Pm(147,101,iB,dp);var ep=false;var ip=null,jp=null,kp=null,lp=null;Pm(150,1,iB);_.Y=function tp(a){return decodeURI(a.replace(eE,fE))};_.Z=function up(a){return encodeURI(a).replace(fE,eE)};_.V=function vp(a){jh(this.c,a)};_.$=function wp(a){};_._=function xp(a){a=a==null?GB:a;if(!Hx(a,rp==null?GB:rp)){rp=a;this.$(a);fh(this)}};var rp=GB;Pm(151,150,iB,Gp);_.ab=function Jp(){if(this.b){this.b=false;Fp(this,rp==null?GB:rp);return true}return false};_.$=function Kp(a){Fp(this,a)};_.bb=function Lp(){this.b=true;$wnd.location.reload()};_.a=null;_.b=false;Pm(154,1,{},Op);_.M=function Pp(){$wnd.__gwt_initWindowCloseHandler(yB(Wo),yB(Vo))};Pm(155,1,{},Rp);_.M=function Sp(){$wnd.__gwt_initWindowResizeHandler(yB(Xo))};Pm(160,1,{40:1,43:1});_.cb=function aq(){return this.H};_.db=function bq(a){ro(this.H,mE,a)};_.eb=function eq(a){ro(this.H,kE,a)};_.tS=function fq(){if(!this.H){return sE}return this.H.outerHTML};_.H=null;Pm(159,160,nB);_.fb=function pq(){};_.gb=function qq(){};_.V=function rq(a){jq(this,a)};_.hb=function sq(){kq(this)};_.X=function tq(a){lq(this,a)};_.ib=function uq(){mq(this)};_.jb=function vq(){};_.kb=function wq(){};_.D=false;_.E=0;_.F=null;_.G=null;Pm(158,159,nB);_.fb=function yq(){Oq(this,(Mq(),Kq))};_.gb=function zq(){Oq(this,(Mq(),Lq))};Pm(157,158,nB);_.mb=function Dq(){return new Iu(this.f)};_.lb=function Eq(a){return Bq(this,a)};Pm(156,157,nB);_.lb=function Iq(a){return Gq(this,a)};Pm(161,106,jB,Nq);var Kq,Lq;Pm(162,1,{},Qq);_.nb=function Rq(a){a.hb()};Pm(163,1,{},Tq);_.nb=function Uq(a){a.ib()};Pm(166,159,nB);_.hb=function Yq(){var a;kq(this);a=this.H.tabIndex;-1==a&&(this.H.tabIndex=0,undefined)};Pm(165,166,nB);Pm(164,165,nB,$q);Pm(167,157,nB);_.d=null;_.e=null;Pm(170,158,nB);_.ob=function ir(){return this.H};_.mb=function jr(){return new Tt(this)};_.lb=function kr(a){return er(this,a)};_.C=null;Pm(169,170,nB);_.ob=function ur(){return Dc(this.H)};_.cb=function vr(){return Ec(Dc(this.H))};_.pb=function wr(){nr(this)};_.W=function xr(a){a.c&&(a.d,false)&&(a.a=true)};_.kb=function yr(){this.A&&Ws(this.z,false,true)};_.db=function zr(a){this.o=a;or(this);a.length==0&&(this.o=null)};_.eb=function Ar(a){this.p=a;or(this);a.length==0&&(this.p=null)};_.k=false;_.n=false;_.o=null;_.p=null;_.q=null;_.s=null;_.t=false;_.u=false;_.v=-1;_.w=false;_.x=null;_.y=false;_.A=false;_.B=-1;Pm(168,169,nB);_.fb=function Cr(){kq(this.j)};_.gb=function Dr(){mq(this.j)};_.mb=function Er(){return new Tt(this.j)};_.lb=function Fr(a){return er(this.j,a)};_.j=null;Pm(171,170,nB,Ir);_.ob=function Kr(){return this.a};_.a=null;_.b=null;Pm(172,168,nB,Ur);_.fb=function Wr(){try{kq(this.j)}finally{kq(this.a)}};_.gb=function Xr(){try{mq(this.j)}finally{mq(this.a)}};_.pb=function Yr(){Pr(this)};_.X=function Zr(a){switch(fp(a.type)){case 4:case 8:case 64:case 16:case 32:if(!this.f&&!Qr(this,a)){return}}lq(this,a)};_.W=function $r(a){var b;b=a.d;!a.a&&fp(a.d.type)==4&&Qr(this,b)&&Ic(b);a.c&&(a.d,false)&&(a.a=true)};_.a=null;_.b=0;_.c=0;_.d=0;_.e=0;_.f=false;_.g=null;_.i=0;Pm(173,1,lB,as);_.U=function bs(a){this.a.i=a.a};_.a=null;Pm(177,159,nB);_.a=null;Pm(176,177,nB,js);Pm(175,176,nB,ls,ms);Pm(174,175,nB,ns);Pm(178,1,{13:1,14:1,15:1,16:1,17:1,27:1,39:1},ps);_.a=null;Pm(179,1,{},ss);_.a=null;_.b=null;_.c=null;var ts,us,vs;Pm(180,1,{});Pm(181,180,{},zs);_.a=null;var As;Pm(182,1,{},Ds);_.a=null;Pm(183,167,nB,Gs);_.lb=function Hs(a){var b,c;c=Ec(a.H);b=Bq(this,a);b&&tc(this.b,c);return b};_.b=null;Pm(184,1,lB,Ks);_.U=function Ls(a){Js()};Pm(185,1,kB,Ns);_.W=function Os(a){pr(this.a,a)};_.a=null;Pm(186,1,{26:1,27:1},Qs);_.a=null;Pm(187,3,{},Xs);_.a=null;_.b=false;_.c=false;_.d=0;_.e=-1;_.f=null;_.g=null;_.i=false;Pm(188,10,aB,Zs);_.J=function $s(){this.a.g=null;x(this.a,eb())};_.a=null;Pm(190,156,oB,ht);var dt,et,ft;Pm(191,1,{},mt);_.nb=function nt(a){a.D&&a.ib()};Pm(192,1,mB,pt);_.T=function qt(a){jt()};Pm(193,190,oB,st);Pm(194,1,{});var ut=null;Pm(195,194,{},Bt);var yt=null,zt=null;Pm(196,170,nB,Lt);_.ob=function Mt(){return this.a};_.hb=function Nt(){kq(this);this.b.__listener=this};_.ib=function Ot(){this.b.__listener=null;mq(this)};_.db=function Pt(a){ro(this.H,mE,a)};_.eb=function Qt(a){ro(this.H,kE,a)};_.a=null;_.b=null;_.c=null;Pm(197,1,{},Tt);_.qb=function Ut(){return this.a};_.rb=function Vt(){return St(this)};_.sb=function Wt(){!!this.b&&this.c.lb(this.b)};_.b=null;_.c=null;Pm(200,166,nB);_.X=function _t(a){var b;b=fp(a.type);(b&896)!=0?lq(this,a):lq(this,a)};_.jb=function au(){};Pm(199,200,nB);Pm(198,199,nB,cu);Pm(201,45,pB);var fu,gu,hu,iu,ju;Pm(202,201,pB,nu);Pm(203,201,pB,pu);Pm(204,201,pB,ru);Pm(205,201,pB,tu);Pm(206,167,nB,wu);_.lb=function xu(a){var b,c;c=Ec(a.H);b=Bq(this,a);b&&tc(this.d,Ec(c));return b};Pm(207,1,{},Eu);_.mb=function Fu(){return new Iu(this)};_.a=null;_.b=null;_.c=0;Pm(208,1,{},Iu);_.qb=function Ju(){return this.a<this.b.c-1};_.rb=function Ku(){return Hu(this)};_.sb=function Lu(){if(this.a<0||this.a>=this.b.c){throw new ox}this.b.b.lb(this.b.a[this.a--])};_.a=-1;_.b=null;Pm(213,1,{},Tu);_.a=null;_.b=null;_.c=null;Pm(214,1,qB,Vu);_.M=function Wu(){th(this.a,this.c,this.b)};_.a=null;_.b=null;_.c=null;Pm(215,1,qB,Yu);_.M=function Zu(){vh(this.a,this.c,this.b)};_.a=null;_.b=null;_.c=null;Pm(217,1,{},bv);_.a=0;Pm(218,1,{},dv);_.a=0;_.b=0;_.c=0;Pm(219,1,{},tv);_.a=null;_.b=null;_.c=null;_.d=null;_.e=null;_.f=0;_.g=0;_.i=0;_.j=null;_.k=null;_.n=null;_.o=0;_.p=0;_.q=null;_.r=null;_.s=null;_.t=0;Pm(220,1,{},Ev);_.tb=function Fv(a){var b,c;if(a==39){++this.d;this.d>this.a.length-1&&(this.d=this.a.length-1);b=Av(this,this.a,this.d);Dv(this,b,this.d);this.b=b.b.b.length;b.b.f+1;vv(this)}if(a==37){--this.d;this.d<0&&(this.d=0);b=Av(this,this.a,this.d);Dv(this,b,this.d);this.b=b.b.b.length;b.b.f+1;vv(this)}if(a==8||a==46){this.A=this.e;c=new fy(this.a);by(c,this.d);this.a=rc(c.a);this.d>=0&&--this.d;b=Av(this,this.a,this.d);Dv(this,b,this.d);this.e=nv(b.b);this.b=b.b.b.length;vv(this)}};_.ub=function Gv(a,b){var c,d;if(Hx(a,JI)||Hx(a,KI)||Hx(a,LI)||Hx(a,MI)){this.A=this.e;d=new fy(this.a);cy(d,this.d,a);this.a=rc(d.a);++this.d;c=Av(this,this.a,this.d);Dv(this,c,this.d);this.e=nv(c.b);this.b=c.b.b.length;c.b.f+1;vv(this)}if(Hx(a,NI)||Hx(a,OI)||Hx(a,PI)||Hx(a,QI)){this.A=this.e;d=new fy(this.a);dy(d,this.d,this.d+1,a.toUpperCase());this.a=rc(d.a);c=Av(this,this.a,this.d);Dv(this,c,this.d);this.e=nv(c.b);this.b=c.b.b.length;c.b.f+1;vv(this)}if(Hx(a,RI)||Hx(a,rE)||Hx(a,SI)||Hx(a,ID)){if(Hx(a,RI)||Hx(a,SI)){++this.d;this.d>this.a.length-1&&(this.d=this.a.length-1)}else{--this.d;this.d<0&&(this.d=0)}c=Av(this,this.a,this.d);Dv(this,c,this.d);this.b=c.b.b.length;c.b.f+1;vv(this)}if(b==39){++this.d;this.d>this.a.length-1&&(this.d=this.a.length-1);c=Av(this,this.a,this.d);Dv(this,c,this.d);this.b=c.b.b.length;c.b.f+1;vv(this)}if(b==37){--this.d;this.d<0&&(this.d=0);c=Av(this,this.a,this.d);Dv(this,c,this.d);this.b=c.b.b.length;c.b.f+1;vv(this)}};_.vb=function Hv(a){var b;if(a>=0&&a<=this.b){b=Av(this,this.a,a);Dv(this,b,a);this.b=b.b.b.length;this.d=a;vv(this)}};
 --></script>
 <script><!--
-_.wb=function Jv(a){var b;a!=null&&bw(this.y,a);this.y.e=TI;this.y.g=UI;this.y.c=VI;this.y.b=WI;this.y.d=XI;this.f=this.y.a;this.a=this.y.a;this.b=this.a.length;this.C=this.y.e;this.D=this.y.f;this.G=this.y.g;this.u=this.y.c;this.t=this.y.b;this.z=this.y.d;(Hx(this.u,nF)||Hx(this.t,nF))&&(this.z=GB);b=Av(this,this.f,-1);this.g=b.b.e;this.i=b.b.q;this.b=b.b.b.length;this.e=nv(b.b);ks(this.r,b.a.b+YI)};_.xb=function Lv(a){var b,c,d,e,f;this.B=new sw;if(a==1){b=new Qw;b.b=ZI;qw(this.B,b);d=new Nw;d.b=$I;qw(this.B,d)}else if(a==2){b=new Qw;b.b=ZI;qw(this.B,b);d=new yw;d.b=_I;qw(this.B,d)}else if(a==3){b=new Qw;b.b=ZI;qw(this.B,b);d=new Kw;d.b=aJ;qw(this.B,d)}else if(a==4){b=new Qw;b.b=ZI;qw(this.B,b);d=new Ew;d.b=bJ;qw(this.B,d);f=new Bw;f.b=cJ;qw(this.B,f)}else if(a==5){c=new Hw;c.a=c.a;c.b=dJ;qw(this.B,c);e=new vw;e.a=1;e.b=eJ;qw(this.B,e)}};_.a=null;_.b=0;_.c=null;_.d=0;_.e=GB;_.f=null;_.g=GB;_.i=GB;_.j=null;_.k=null;_.n=false;_.o=null;_.p=null;_.q=null;_.r=null;_.s=null;_.t=null;_.u=null;_.v=null;_.w=null;_.x=null;_.z=null;_.A=GB;_.B=null;_.C=null;_.D=0;_.E=null;_.F=null;_.G=null;_.H=null;Pm(221,1,rB,Ov);_.S=function Pv(a){Pr(this.a.j);this.a.o.H[fJ]=GB};_.a=null;Pm(222,1,{},Rv);_.M=function Sv(){xv(this.a);wv(this.a);yv(this.a);zv(this.a);typeof $wnd.genexIsReady===LB&&$wnd.genexIsReady()};_.a=null;Pm(223,1,rB,Uv);_.S=function Vv(a){var b,c;this.a.A=this.a.e;c=xc(this.a.o.H,fJ);c=c.toUpperCase();c=Lx(c,gJ,GB);this.a.a=c;this.a.d=-1;b=Av(this.a,this.a.a,-1);Dv(this.a,b,-1);this.a.e=nv(b.b);this.a.b=b.b.b.length;Pr(this.a.j);vv(this.a)};_.a=null;Pm(224,1,rB,Xv);_.S=function Yv(a){var b;this.a.a=this.a.f;b=Av(this.a,this.a.a,-1);Dv(this.a,b,-1);this.a.e=nv(b.b);this.a.b=b.b.b.length;vv(this.a)};_.a=null;Pm(225,1,rB,$v);_.S=function _v(a){lr(this.a.j)};_.a=null;Pm(226,1,{},cw);_.a=null;_.b=null;_.c=null;_.d=null;_.e=null;_.f=0;_.g=null;Pm(227,1,{},ew);_.a=null;_.b=null;Pm(228,1,{48:1},iw);_.a=0;_.b=0;_.c=false;_.d=false;_.e=0;_.f=0;_.g=false;Pm(229,1,{},kw);_.a=null;_.b=null;Pm(230,1,{},nw);_.tS=function ow(){return mw(this)};_.a=null;_.b=0;_.c=null;_.d=null;_.e=0;_.f=null;_.g=null;_.i=null;Pm(231,1,{},sw);_.a=null;Pm(233,1,sB);_.b=uJ;Pm(232,233,sB,vw);_.yb=function ww(a){return a.b==this.a+1};_.a=0;Pm(234,233,sB,yw);_.yb=function zw(a){return a.c.length>a.i.length};Pm(235,233,sB,Bw);_.yb=function Cw(a){return Hx(a.c,GB)};Pm(236,233,sB,Ew);_.yb=function Fw(a){return Hx(a.d,GB)};Pm(237,233,sB,Hw);_.yb=function Iw(a){return a.c.length==this.a};_.a=0;Pm(238,233,sB,Kw);_.yb=function Lw(a){return a.c.length<a.i.length};Pm(239,233,sB,Nw);_.yb=function Ow(a){return a.d.length<a.g.length};Pm(240,233,sB,Qw);_.yb=function Rw(a){var b,c,d,e;e=a.f;b=a.a;if(e.length!=b.length)return false;d=0;for(c=0;c<e.length;++c){e.charCodeAt(c)!=b.charCodeAt(c)&&++d}if(d==1)return true;return false};Pm(241,15,cB,Tw);Pm(242,1,{50:1,51:1,53:1},Yw);_.eQ=function Zw(a){return ki(a,51)&&ii(a,51).a==this.a};_.hC=function $w(){return this.a?1231:1237};_.tS=function _w(){return this.a?vJ:wJ};_.a=false;var Vw,Ww;Pm(243,1,{},bx);_.tS=function ix(){return ((this.a&2)!=0?yJ:(this.a&1)!=0?GB:zJ)+this.c};_.a=0;_.b=0;_.c=null;Pm(244,15,cB,kx);Pm(245,15,cB,mx);Pm(246,15,cB,ox,px);Pm(247,15,cB,rx,sx);Pm(251,15,cB,yx,zx);var Ax;Pm(253,1,{50:1,55:1},Dx);_.tS=function Ex(){return this.a+BJ+this.c+CJ+(this.b>=0?OB+this.b:GB)+hD};_.a=null;_.b=0;_.c=null;_=String.prototype;_.cM={1:1,50:1,52:1,53:1};_.eQ=function Qx(a){return Hx(this,a)};_.hC=function Rx(){return Yx(this)};_.tS=_.toString;var Tx,Ux=0,Vx;Pm(255,1,tB,ey,fy);_.tS=function gy(){return rc(this.a)};Pm(256,1,tB,jy);_.tS=function ky(){return rc(this.a)};Pm(257,15,cB,my);Pm(258,1,{});_.zb=function qy(a){throw new my(JJ)};_.Ab=function ry(a){var b;b=oy(this.mb(),a);return !!b};_.Bb=function sy(){return this.Db()==0};_.Cb=function ty(a){var b;b=oy(this.mb(),a);if(b){b.sb();return true}else{return false}};_.tS=function uy(){return py(this)};Pm(260,1,uB);_.eQ=function yy(a){var b,c,d,e,f;if(a===this){return true}if(!ki(a,58)){return false}e=ii(a,58);if(this.d!=e.d){return false}for(c=new ez((new Yy(e)).a);Iz(c.a);){b=c.b=ii(Jz(c.a),59);d=b.Fb();f=b.Gb();if(!(d==null?this.c:ki(d,1)?OB+ii(d,1) in this.e:Iy(this,d,~~xb(d)))){return false}if(!YA(f,d==null?this.b:ki(d,1)?Hy(this,ii(d,1)):Gy(this,d,~~xb(d)))){return false}}return true};_.hC=function zy(){var a,b,c;c=0;for(b=new ez((new Yy(this)).a);Iz(b.a);){a=b.b=ii(Jz(b.a),59);c+=a.hC();c=~~c}return c};_.tS=function Ay(){var a,b,c,d;d=KJ;a=false;for(c=new ez((new Yy(this)).a);Iz(c.a);){b=c.b=ii(Jz(c.a),59);a?(d+=GJ):(a=true);d+=GB+b.Fb();d+=SI;d+=GB+b.Gb()}return d+LJ};Pm(259,260,uB);_.Eb=function Sy(a,b){return ni(a)===ni(b)||a!=null&&wb(a,b)};_.a=null;_.b=null;_.c=false;_.d=0;_.e=null;Pm(262,258,vB);_.eQ=function Vy(a){var b,c,d;if(a===this){return true}if(!ki(a,60)){return false}c=ii(a,60);if(c.Db()!=this.Db()){return false}for(b=c.mb();b.qb();){d=b.rb();if(!this.Ab(d)){return false}}return true};_.hC=function Wy(){var a,b,c;a=0;for(b=this.mb();b.qb();){c=b.rb();if(c!=null){a+=xb(c);a=~~a}}return a};Pm(261,262,vB,Yy);_.Ab=function Zy(a){return Xy(this,a)};_.mb=function $y(){return new ez(this.a)};_.Cb=function _y(a){var b;if(Xy(this,a)){b=ii(a,59).Fb();Oy(this.a,b);return true}return false};_.Db=function az(){return this.a.d};_.a=null;Pm(263,1,{},ez);_.qb=function fz(){return Iz(this.a)};_.rb=function gz(){return cz(this)};_.sb=function hz(){dz(this)};_.a=null;_.b=null;_.c=null;Pm(265,1,wB);_.eQ=function kz(a){var b;if(ki(a,59)){b=ii(a,59);if(YA(this.Fb(),b.Fb())&&YA(this.Gb(),b.Gb())){return true}}return false};_.hC=function lz(){var a,b;a=0;b=0;this.Fb()!=null&&(a=xb(this.Fb()));this.Gb()!=null&&(b=xb(this.Gb()));return a^b};_.tS=function mz(){return this.Fb()+SI+this.Gb()};Pm(264,265,wB,nz);_.Fb=function oz(){return null};_.Gb=function pz(){return this.a.b};_.Hb=function qz(a){return My(this.a,a)};_.a=null;Pm(266,265,wB,sz);_.Fb=function tz(){return this.a};_.Gb=function uz(){return Hy(this.b,this.a)};_.Hb=function vz(a){return Ny(this.b,this.a,a)};_.a=null;_.b=null;Pm(267,258,{57:1});_.Ib=function xz(a,b){throw new my(PJ)};_.zb=function yz(a){this.Ib(this.Db(),a);return true};_.eQ=function Az(a){var b,c,d,e,f;if(a===this){return true}if(!ki(a,57)){return false}f=ii(a,57);if(this.Db()!=f.Db()){return false}d=new Lz(this);e=f.mb();while(d.b<d.d.Db()){b=Jz(d);c=Jz(e);if(!(b==null?c==null:wb(b,c))){return false}}return true};_.hC=function Bz(){var a,b,c;b=1;a=new Lz(this);while(a.b<a.d.Db()){c=Jz(a);b=31*b+(c==null?0:xb(c));b=~~b}return b};_.mb=function Dz(){return new Lz(this)};_.Kb=function Ez(){return new Rz(this,0)};_.Lb=function Fz(a){return new Rz(this,a)};_.Mb=function Gz(a){throw new my(QJ)};Pm(268,1,{},Lz);_.qb=function Mz(){return Iz(this)};_.rb=function Nz(){return Jz(this)};_.sb=function Oz(){Kz(this)};_.b=0;_.c=-1;_.d=null;Pm(269,268,{},Rz);_.a=null;Pm(270,262,vB,Uz);_.Ab=function Vz(a){return Ey(this.a,a)};_.mb=function Wz(){return Tz(this)};_.Db=function Xz(){return this.b.a.d};_.a=null;_.b=null;Pm(271,1,{},$z);_.qb=function _z(){return Iz(this.a.a)};_.rb=function aA(){return Zz(this)};_.sb=function bA(){dz(this.a)};_.a=null;Pm(272,267,xB,kA);_.Ib=function lA(a,b){(a<0||a>this.b)&&Cz(a,this.b);uA(this.a,a,0,b);++this.b};_.zb=function mA(a){return dA(this,a)};_.Ab=function nA(a){return gA(this,a,0)!=-1};_.Jb=function oA(a){return fA(this,a)};_.Bb=function pA(){return this.b==0};_.Mb=function qA(a){return hA(this,a)};_.Cb=function rA(a){return iA(this,a)};_.Db=function sA(){return this.b};_.b=0;var vA;Pm(274,267,xB,yA);_.Ab=function zA(a){return false};_.Jb=function AA(a){throw new rx};_.Db=function BA(){return 0};Pm(275,259,{50:1,58:1},EA);Pm(276,262,{50:1,60:1},JA);_.zb=function KA(a){return GA(this,a)};_.Ab=function LA(a){return Ey(this.a,a)};_.Bb=function MA(){return this.a.d==0};_.mb=function NA(){return Tz(xy(this.a))};_.Cb=function OA(a){return IA(this,a)};_.Db=function PA(){return this.a.d};_.tS=function QA(){return py(xy(this.a))};_.a=null;Pm(277,265,wB,SA);_.Fb=function TA(){return this.a};_.Gb=function UA(){return this.b};_.Hb=function VA(a){var b;b=this.b;this.b=a;return b};_.a=null;_.b=null;Pm(278,15,cB,XA);var yB=Fb;var Yl=dx(RJ,SJ,1),Ai=dx(TJ,UJ,18),Im=cx(VJ,WJ,280),cm=dx(RJ,XJ,17),Tl=dx(RJ,YJ,16),Zl=dx(RJ,ZJ,15),$l=dx(RJ,$J,253),Jm=cx(VJ,_J,281),Lj=dx(aK,bK,117),Sl=dx(RJ,cK,45),yl=dx(dK,eK,220),ul=dx(dK,fK,221),vl=dx(dK,gK,223),wl=dx(dK,hK,224),xl=dx(dK,iK,225),tl=dx(dK,jK,222),Bi=dx(TJ,kK,21),Pl=dx(RJ,lK,242),ym=cx(GB,mK,282),Rl=dx(RJ,nK,243),bm=dx(RJ,IB,2),Km=cx(VJ,oK,283),Ql=dx(RJ,pK,244),am=dx(RJ,qK,256),Ol=dx(RJ,rK,241),zi=dx(TJ,sK,14),Zk=dx(tK,uK,160),hl=dx(tK,vK,159),Fk=dx(tK,wK,177),Gk=dx(tK,xK,176),Ak=dx(tK,yK,175),Bk=dx(tK,zK,180),Ck=dx(tK,AK,181),Kj=ex(BK,CK,110,Wh),Fm=cx(DK,EK,284),Hk=dx(tK,FK,158),Wk=dx(tK,GK,170),Uk=dx(tK,HK,196),Vk=dx(tK,IK,197),rk=dx(tK,JK,157),kk=dx(tK,KK,156),pl=dx(LK,MK,107),Ij=dx(NK,MK,106),nk=dx(tK,OK,161),lk=dx(tK,PK,162),mk=dx(tK,QK,163),Rk=dx(tK,RK,190),Qk=dx(tK,SK,193),Ok=dx(tK,TK,191),Pk=dx(tK,UK,192),Nk=dx(tK,VK,169),sk=dx(tK,WK,168),xk=dx(tK,XK,172),vk=dx(tK,YK,174),wk=dx(tK,ZK,178),uk=dx(tK,$K,173),xi=dx(_K,aL,3),Mk=dx(tK,bL,187),dk=dx(cL,dL,10),Lk=dx(tK,eL,188),Ik=dx(tK,fL,184),Jk=dx(tK,gL,185),Kk=dx(tK,hL,186),qi=dx(_K,iL,4),wi=dx(_K,jL,5),ri=dx(_K,kL,6),ck=dx(cL,lL,143),kl=dx(LK,mL,80),Ej=dx(NK,nL,79),bk=dx(cL,oL,141),il=dx(LK,pL,83),Dj=dx(NK,qL,82),qk=dx(tK,rL,167),el=dx(tK,sL,206),Dk=dx(tK,tL,182),zk=dx(tK,uL,166),dl=dx(tK,vL,200),Xk=dx(tK,wL,199),Yk=dx(tK,xL,198),cl=ex(tK,yL,201,lu),Gm=cx(zL,AL,285),$k=ex(tK,BL,202,null),_k=ex(tK,CL,203,null),al=ex(tK,DL,204,null),bl=ex(tK,EL,205,null),Jj=dx(BK,FL,108),ok=dx(tK,GL,165),pk=dx(tK,HL,164),Ek=dx(tK,IL,183),zl=dx(dK,JL,226),qm=dx(KL,LL,260),jm=dx(KL,ML,259),um=dx(KL,NL,275),em=dx(KL,OL,258),rm=dx(KL,PL,262),gm=dx(KL,QL,261),fm=dx(KL,RL,263),pm=dx(KL,SL,265),hm=dx(KL,TL,264),im=dx(KL,UL,266),om=dx(KL,VL,270),nm=dx(KL,WL,271),vm=dx(KL,XL,276),kj=dx(YL,ZL,78),lj=dx(YL,$L,77),nj=dx(YL,_L,76),ij=dx(YL,aM,75),jj=dx(YL,bM,81),tk=dx(tK,cM,171),Ei=dx(dM,eM,23),Ci=dx(dM,fM,24),Di=dx(dM,gM,25),Fi=dx(dM,hM,28),yi=dx(TJ,iM,12),hj=ex(jM,kM,65,Be),Em=cx(lM,mM,286),Ki=ex(jM,nM,44,md),Am=cx(lM,oM,287),Pi=ex(jM,pM,50,Cd),Bm=cx(lM,qM,288),Ui=ex(jM,rM,55,Sd),Cm=cx(lM,sM,289),Zi=ex(jM,uM,60,ge),Dm=cx(lM,vM,290),$i=ex(jM,wM,66,null),_i=ex(jM,xM,67,null),aj=ex(jM,yM,68,null),bj=ex(jM,zM,69,null),cj=ex(jM,AM,70,null),dj=ex(jM,BM,71,null),ej=ex(jM,CM,72,null),fj=ex(jM,DM,73,null),gj=ex(jM,EM,74,null),Gi=ex(jM,FM,46,null),Hi=ex(jM,GM,47,null),Ii=ex(jM,HM,48,null),Ji=ex(jM,IM,49,null),Li=ex(jM,JM,51,null),Mi=ex(jM,KM,52,null),Ni=ex(jM,LM,53,null),Oi=ex(jM,MM,54,null),Qi=ex(jM,NM,56,null),Ri=ex(jM,OM,57,null),Si=ex(jM,PM,58,null),Ti=ex(jM,QM,59,null),Vi=ex(jM,RM,61,null),Wi=ex(jM,SM,62,null),Xi=ex(jM,TM,63,null),Yi=ex(jM,UM,64,null),yk=dx(tK,VM,179),dm=dx(RJ,WM,257),Vl=dx(RJ,XM,246),ek=dx(cL,YM,145),Gj=dx(NK,ZM,101),fk=dx(cL,$M,147),jl=dx(LK,_M,104),ol=dx(LK,aN,103),Fj=dx(NK,bN,102),ll=dx(LK,cN,213),ml=dx(LK,dN,214),nl=dx(LK,eN,215),gl=dx(tK,fN,207),Hm=cx(zL,gN,291),fl=dx(tK,hN,208),Xl=dx(RJ,iN,251),Ul=dx(RJ,jN,245),Tk=dx(tK,kN,194),Sk=dx(tK,lN,195),_l=dx(RJ,mN,255),ik=dx(nN,oN,154),jk=dx(nN,pN,155),Aj=dx(qN,rN,98),zj=dx(qN,sN,97),mj=dx(YL,tN,84),rj=dx(YL,uN,88),oj=dx(YL,vN,85),qj=dx(YL,wN,87),pj=dx(YL,xN,86),Mj=dx(yN,zN,120),Oj=dx(AN,BN,122),Nj=dx(AN,CN,121),sj=dx(YL,DN,89),Hj=dx(NK,EN,105),ak=dx(FN,GN,126),_j=dx(FN,HN,136),Zj=dx(FN,IN,133),$j=dx(FN,JN,135),Yj=dx(FN,KN,134),Sj=dx(FN,LN,127),Tj=dx(FN,MN,128),Uj=dx(FN,NN,129),Vj=dx(FN,ON,130),Wj=dx(FN,PN,131),Xj=dx(FN,QN,132),xm=dx(KL,RN,278),wm=dx(KL,SN,277),Wl=dx(RJ,TN,247),wj=dx(YL,UN,92),yj=dx(YL,VN,96),vj=dx(YL,WN,94),xj=dx(YL,XN,95),uj=dx(YL,YN,93),tj=dx(YL,ZN,91),Pj=dx(FN,$N,123),Qj=dx(FN,_N,124),mm=dx(KL,aO,267),sm=dx(KL,bO,272),km=dx(KL,cO,268),lm=dx(KL,dO,269),Cl=dx(dK,eO,229),sl=dx(dK,fO,219),Kl=dx(gO,hO,233),Jl=dx(gO,iO,237),Fl=dx(gO,jO,232),El=dx(kO,lO,231),Nl=dx(gO,mO,240),Ml=dx(gO,nO,239),Gl=dx(gO,oO,234),Ll=dx(gO,pO,238),Il=dx(gO,qO,236),Hl=dx(gO,rO,235),Bj=dx(qN,sO,99),Al=dx(dK,tO,227),hk=dx(nN,uO,150),gk=dx(nN,vO,151),Bl=dx(dK,wO,228),rl=dx(dK,xO,218),Dl=dx(kO,yO,230),Cj=dx(qN,zO,100),tm=dx(KL,AO,274),ql=dx(dK,BO,217),vi=dx(_K,CO,7),ui=dx(_K,DO,8),ti=dx(_K,EO,11),zm=cx(FO,GO,292),si=dx(_K,HO,9),Rj=dx(FN,IO,125);$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalEnd'});if ($wnd.genex) $wnd.genex.onScriptLoad();
+_.wb=function Jv(a){var b;a!=null&&bw(this.y,a);this.y.e=TI;this.y.g=UI;this.y.c=VI;this.y.b=WI;this.y.d=XI;this.f=this.y.a;this.a=this.y.a;this.b=this.a.length;this.C=this.y.e;this.D=this.y.f;this.G=this.y.g;this.u=this.y.c;this.t=this.y.b;this.z=this.y.d;(Hx(this.u,nF)||Hx(this.t,nF))&&(this.z=GB);b=Av(this,this.f,-1);this.g=b.b.e;this.i=b.b.q;this.b=b.b.b.length;this.e=nv(b.b);ks(this.r,b.a.b+YI)};_.xb=function Lv(a){var b,c,d,e,f;this.B=new sw;if(a==1){b=new Qw;b.b=ZI;qw(this.B,b);d=new Nw;d.b=$I;qw(this.B,d)}else if(a==2){b=new Qw;b.b=ZI;qw(this.B,b);d=new yw;d.b=_I;qw(this.B,d)}else if(a==3){b=new Qw;b.b=ZI;qw(this.B,b);d=new Kw;d.b=aJ;qw(this.B,d)}else if(a==4){b=new Qw;b.b=ZI;qw(this.B,b);d=new Ew;d.b=bJ;qw(this.B,d);f=new Bw;f.b=cJ;qw(this.B,f)}else if(a==5){c=new Hw;c.a=15;c.b=dJ;qw(this.B,c);e=new vw;e.a=1;e.b=eJ;qw(this.B,e)}};_.a=null;_.b=0;_.c=null;_.d=0;_.e=GB;_.f=null;_.g=GB;_.i=GB;_.j=null;_.k=null;_.n=false;_.o=null;_.p=null;_.q=null;_.r=null;_.s=null;_.t=null;_.u=null;_.v=null;_.w=null;_.x=null;_.z=null;_.A=GB;_.B=null;_.C=null;_.D=0;_.E=null;_.F=null;_.G=null;_.H=null;Pm(221,1,rB,Ov);_.S=function Pv(a){Pr(this.a.j);this.a.o.H[fJ]=GB};_.a=null;Pm(222,1,{},Rv);_.M=function Sv(){xv(this.a);wv(this.a);yv(this.a);zv(this.a);typeof $wnd.genexIsReady===LB&&$wnd.genexIsReady()};_.a=null;Pm(223,1,rB,Uv);_.S=function Vv(a){var b,c;this.a.A=this.a.e;c=xc(this.a.o.H,fJ);c=c.toUpperCase();c=Lx(c,gJ,GB);this.a.a=c;this.a.d=-1;b=Av(this.a,this.a.a,-1);Dv(this.a,b,-1);this.a.e=nv(b.b);this.a.b=b.b.b.length;Pr(this.a.j);vv(this.a)};_.a=null;Pm(224,1,rB,Xv);_.S=function Yv(a){var b;this.a.a=this.a.f;b=Av(this.a,this.a.a,-1);Dv(this.a,b,-1);this.a.e=nv(b.b);this.a.b=b.b.b.length;vv(this.a)};_.a=null;Pm(225,1,rB,$v);_.S=function _v(a){lr(this.a.j)};_.a=null;Pm(226,1,{},cw);_.a=null;_.b=null;_.c=null;_.d=null;_.e=null;_.f=0;_.g=null;Pm(227,1,{},ew);_.a=null;_.b=null;Pm(228,1,{48:1},iw);_.a=0;_.b=0;_.c=false;_.d=false;_.e=0;_.f=0;_.g=false;Pm(229,1,{},kw);_.a=null;_.b=null;Pm(230,1,{},nw);_.tS=function ow(){return mw(this)};_.a=null;_.b=0;_.c=null;_.d=null;_.e=0;_.f=null;_.g=null;_.i=null;Pm(231,1,{},sw);_.a=null;Pm(233,1,sB);_.b=uJ;Pm(232,233,sB,vw);_.yb=function ww(a){return a.b==this.a+1};_.a=0;Pm(234,233,sB,yw);_.yb=function zw(a){return a.c.length>a.i.length};Pm(235,233,sB,Bw);_.yb=function Cw(a){return Hx(a.c,GB)};Pm(236,233,sB,Ew);_.yb=function Fw(a){return Hx(a.d,GB)};Pm(237,233,sB,Hw);_.yb=function Iw(a){return a.c.length==this.a};_.a=0;Pm(238,233,sB,Kw);_.yb=function Lw(a){return a.c.length<a.i.length};Pm(239,233,sB,Nw);_.yb=function Ow(a){return a.d.length<a.g.length};Pm(240,233,sB,Qw);_.yb=function Rw(a){var b,c,d,e;e=a.f;b=a.a;if(e.length!=b.length)return false;d=0;for(c=0;c<e.length;++c){e.charCodeAt(c)!=b.charCodeAt(c)&&++d}if(d==1)return true;return false};Pm(241,15,cB,Tw);Pm(242,1,{50:1,51:1,53:1},Yw);_.eQ=function Zw(a){return ki(a,51)&&ii(a,51).a==this.a};_.hC=function $w(){return this.a?1231:1237};_.tS=function _w(){return this.a?vJ:wJ};_.a=false;var Vw,Ww;Pm(243,1,{},bx);_.tS=function ix(){return ((this.a&2)!=0?yJ:(this.a&1)!=0?GB:zJ)+this.c};_.a=0;_.b=0;_.c=null;Pm(244,15,cB,kx);Pm(245,15,cB,mx);Pm(246,15,cB,ox,px);Pm(247,15,cB,rx,sx);Pm(251,15,cB,yx,zx);var Ax;Pm(253,1,{50:1,55:1},Dx);_.tS=function Ex(){return this.a+BJ+this.c+CJ+(this.b>=0?OB+this.b:GB)+hD};_.a=null;_.b=0;_.c=null;_=String.prototype;_.cM={1:1,50:1,52:1,53:1};_.eQ=function Qx(a){return Hx(this,a)};_.hC=function Rx(){return Yx(this)};_.tS=_.toString;var Tx,Ux=0,Vx;Pm(255,1,tB,ey,fy);_.tS=function gy(){return rc(this.a)};Pm(256,1,tB,jy);_.tS=function ky(){return rc(this.a)};Pm(257,15,cB,my);Pm(258,1,{});_.zb=function qy(a){throw new my(JJ)};_.Ab=function ry(a){var b;b=oy(this.mb(),a);return !!b};_.Bb=function sy(){return this.Db()==0};_.Cb=function ty(a){var b;b=oy(this.mb(),a);if(b){b.sb();return true}else{return false}};_.tS=function uy(){return py(this)};Pm(260,1,uB);_.eQ=function yy(a){var b,c,d,e,f;if(a===this){return true}if(!ki(a,58)){return false}e=ii(a,58);if(this.d!=e.d){return false}for(c=new ez((new Yy(e)).a);Iz(c.a);){b=c.b=ii(Jz(c.a),59);d=b.Fb();f=b.Gb();if(!(d==null?this.c:ki(d,1)?OB+ii(d,1) in this.e:Iy(this,d,~~xb(d)))){return false}if(!YA(f,d==null?this.b:ki(d,1)?Hy(this,ii(d,1)):Gy(this,d,~~xb(d)))){return false}}return true};_.hC=function zy(){var a,b,c;c=0;for(b=new ez((new Yy(this)).a);Iz(b.a);){a=b.b=ii(Jz(b.a),59);c+=a.hC();c=~~c}return c};_.tS=function Ay(){var a,b,c,d;d=KJ;a=false;for(c=new ez((new Yy(this)).a);Iz(c.a);){b=c.b=ii(Jz(c.a),59);a?(d+=GJ):(a=true);d+=GB+b.Fb();d+=SI;d+=GB+b.Gb()}return d+LJ};Pm(259,260,uB);_.Eb=function Sy(a,b){return ni(a)===ni(b)||a!=null&&wb(a,b)};_.a=null;_.b=null;_.c=false;_.d=0;_.e=null;Pm(262,258,vB);_.eQ=function Vy(a){var b,c,d;if(a===this){return true}if(!ki(a,60)){return false}c=ii(a,60);if(c.Db()!=this.Db()){return false}for(b=c.mb();b.qb();){d=b.rb();if(!this.Ab(d)){return false}}return true};_.hC=function Wy(){var a,b,c;a=0;for(b=this.mb();b.qb();){c=b.rb();if(c!=null){a+=xb(c);a=~~a}}return a};Pm(261,262,vB,Yy);_.Ab=function Zy(a){return Xy(this,a)};_.mb=function $y(){return new ez(this.a)};_.Cb=function _y(a){var b;if(Xy(this,a)){b=ii(a,59).Fb();Oy(this.a,b);return true}return false};_.Db=function az(){return this.a.d};_.a=null;Pm(263,1,{},ez);_.qb=function fz(){return Iz(this.a)};_.rb=function gz(){return cz(this)};_.sb=function hz(){dz(this)};_.a=null;_.b=null;_.c=null;Pm(265,1,wB);_.eQ=function kz(a){var b;if(ki(a,59)){b=ii(a,59);if(YA(this.Fb(),b.Fb())&&YA(this.Gb(),b.Gb())){return true}}return false};_.hC=function lz(){var a,b;a=0;b=0;this.Fb()!=null&&(a=xb(this.Fb()));this.Gb()!=null&&(b=xb(this.Gb()));return a^b};_.tS=function mz(){return this.Fb()+SI+this.Gb()};Pm(264,265,wB,nz);_.Fb=function oz(){return null};_.Gb=function pz(){return this.a.b};_.Hb=function qz(a){return My(this.a,a)};_.a=null;Pm(266,265,wB,sz);_.Fb=function tz(){return this.a};_.Gb=function uz(){return Hy(this.b,this.a)};_.Hb=function vz(a){return Ny(this.b,this.a,a)};_.a=null;_.b=null;Pm(267,258,{57:1});_.Ib=function xz(a,b){throw new my(PJ)};_.zb=function yz(a){this.Ib(this.Db(),a);return true};_.eQ=function Az(a){var b,c,d,e,f;if(a===this){return true}if(!ki(a,57)){return false}f=ii(a,57);if(this.Db()!=f.Db()){return false}d=new Lz(this);e=f.mb();while(d.b<d.d.Db()){b=Jz(d);c=Jz(e);if(!(b==null?c==null:wb(b,c))){return false}}return true};_.hC=function Bz(){var a,b,c;b=1;a=new Lz(this);while(a.b<a.d.Db()){c=Jz(a);b=31*b+(c==null?0:xb(c));b=~~b}return b};_.mb=function Dz(){return new Lz(this)};_.Kb=function Ez(){return new Rz(this,0)};_.Lb=function Fz(a){return new Rz(this,a)};_.Mb=function Gz(a){throw new my(QJ)};Pm(268,1,{},Lz);_.qb=function Mz(){return Iz(this)};_.rb=function Nz(){return Jz(this)};_.sb=function Oz(){Kz(this)};_.b=0;_.c=-1;_.d=null;Pm(269,268,{},Rz);_.a=null;Pm(270,262,vB,Uz);_.Ab=function Vz(a){return Ey(this.a,a)};_.mb=function Wz(){return Tz(this)};_.Db=function Xz(){return this.b.a.d};_.a=null;_.b=null;Pm(271,1,{},$z);_.qb=function _z(){return Iz(this.a.a)};_.rb=function aA(){return Zz(this)};_.sb=function bA(){dz(this.a)};_.a=null;Pm(272,267,xB,kA);_.Ib=function lA(a,b){(a<0||a>this.b)&&Cz(a,this.b);uA(this.a,a,0,b);++this.b};_.zb=function mA(a){return dA(this,a)};_.Ab=function nA(a){return gA(this,a,0)!=-1};_.Jb=function oA(a){return fA(this,a)};_.Bb=function pA(){return this.b==0};_.Mb=function qA(a){return hA(this,a)};_.Cb=function rA(a){return iA(this,a)};_.Db=function sA(){return this.b};_.b=0;var vA;Pm(274,267,xB,yA);_.Ab=function zA(a){return false};_.Jb=function AA(a){throw new rx};_.Db=function BA(){return 0};Pm(275,259,{50:1,58:1},EA);Pm(276,262,{50:1,60:1},JA);_.zb=function KA(a){return GA(this,a)};_.Ab=function LA(a){return Ey(this.a,a)};_.Bb=function MA(){return this.a.d==0};_.mb=function NA(){return Tz(xy(this.a))};_.Cb=function OA(a){return IA(this,a)};_.Db=function PA(){return this.a.d};_.tS=function QA(){return py(xy(this.a))};_.a=null;Pm(277,265,wB,SA);_.Fb=function TA(){return this.a};_.Gb=function UA(){return this.b};_.Hb=function VA(a){var b;b=this.b;this.b=a;return b};_.a=null;_.b=null;Pm(278,15,cB,XA);var yB=Fb;var Yl=dx(RJ,SJ,1),Ai=dx(TJ,UJ,18),Im=cx(VJ,WJ,280),cm=dx(RJ,XJ,17),Tl=dx(RJ,YJ,16),Zl=dx(RJ,ZJ,15),$l=dx(RJ,$J,253),Jm=cx(VJ,_J,281),Lj=dx(aK,bK,117),Sl=dx(RJ,cK,45),yl=dx(dK,eK,220),ul=dx(dK,fK,221),vl=dx(dK,gK,223),wl=dx(dK,hK,224),xl=dx(dK,iK,225),tl=dx(dK,jK,222),Bi=dx(TJ,kK,21),Pl=dx(RJ,lK,242),ym=cx(GB,mK,282),Rl=dx(RJ,nK,243),bm=dx(RJ,IB,2),Km=cx(VJ,oK,283),Ql=dx(RJ,pK,244),am=dx(RJ,qK,256),Ol=dx(RJ,rK,241),zi=dx(TJ,sK,14),Zk=dx(tK,uK,160),hl=dx(tK,vK,159),Fk=dx(tK,wK,177),Gk=dx(tK,xK,176),Ak=dx(tK,yK,175),Bk=dx(tK,zK,180),Ck=dx(tK,AK,181),Kj=ex(BK,CK,110,Wh),Fm=cx(DK,EK,284),Hk=dx(tK,FK,158),Wk=dx(tK,GK,170),Uk=dx(tK,HK,196),Vk=dx(tK,IK,197),rk=dx(tK,JK,157),kk=dx(tK,KK,156),pl=dx(LK,MK,107),Ij=dx(NK,MK,106),nk=dx(tK,OK,161),lk=dx(tK,PK,162),mk=dx(tK,QK,163),Rk=dx(tK,RK,190),Qk=dx(tK,SK,193),Ok=dx(tK,TK,191),Pk=dx(tK,UK,192),Nk=dx(tK,VK,169),sk=dx(tK,WK,168),xk=dx(tK,XK,172),vk=dx(tK,YK,174),wk=dx(tK,ZK,178),uk=dx(tK,$K,173),xi=dx(_K,aL,3),Mk=dx(tK,bL,187),dk=dx(cL,dL,10),Lk=dx(tK,eL,188),Ik=dx(tK,fL,184),Jk=dx(tK,gL,185),Kk=dx(tK,hL,186),qi=dx(_K,iL,4),wi=dx(_K,jL,5),ri=dx(_K,kL,6),ck=dx(cL,lL,143),kl=dx(LK,mL,80),Ej=dx(NK,nL,79),bk=dx(cL,oL,141),il=dx(LK,pL,83),Dj=dx(NK,qL,82),qk=dx(tK,rL,167),el=dx(tK,sL,206),Dk=dx(tK,tL,182),zk=dx(tK,uL,166),dl=dx(tK,vL,200),Xk=dx(tK,wL,199),Yk=dx(tK,xL,198),cl=ex(tK,yL,201,lu),Gm=cx(zL,AL,285),$k=ex(tK,BL,202,null),_k=ex(tK,CL,203,null),al=ex(tK,DL,204,null),bl=ex(tK,EL,205,null),Jj=dx(BK,FL,108),ok=dx(tK,GL,165),pk=dx(tK,HL,164),Ek=dx(tK,IL,183),zl=dx(dK,JL,226),qm=dx(KL,LL,260),jm=dx(KL,ML,259),um=dx(KL,NL,275),em=dx(KL,OL,258),rm=dx(KL,PL,262),gm=dx(KL,QL,261),fm=dx(KL,RL,263),pm=dx(KL,SL,265),hm=dx(KL,TL,264),im=dx(KL,UL,266),om=dx(KL,VL,270),nm=dx(KL,WL,271),vm=dx(KL,XL,276),kj=dx(YL,ZL,78),lj=dx(YL,$L,77),nj=dx(YL,_L,76),ij=dx(YL,aM,75),jj=dx(YL,bM,81),tk=dx(tK,cM,171),Ei=dx(dM,eM,23),Ci=dx(dM,fM,24),Di=dx(dM,gM,25),Fi=dx(dM,hM,28),yi=dx(TJ,iM,12),hj=ex(jM,kM,65,Be),Em=cx(lM,mM,286),Ki=ex(jM,nM,44,md),Am=cx(lM,oM,287),Pi=ex(jM,pM,50,Cd),Bm=cx(lM,qM,288),Ui=ex(jM,rM,55,Sd),Cm=cx(lM,sM,289),Zi=ex(jM,uM,60,ge),Dm=cx(lM,vM,290),$i=ex(jM,wM,66,null),_i=ex(jM,xM,67,null),aj=ex(jM,yM,68,null),bj=ex(jM,zM,69,null),cj=ex(jM,AM,70,null),dj=ex(jM,BM,71,null),ej=ex(jM,CM,72,null),fj=ex(jM,DM,73,null),gj=ex(jM,EM,74,null),Gi=ex(jM,FM,46,null),Hi=ex(jM,GM,47,null),Ii=ex(jM,HM,48,null),Ji=ex(jM,IM,49,null),Li=ex(jM,JM,51,null),Mi=ex(jM,KM,52,null),Ni=ex(jM,LM,53,null),Oi=ex(jM,MM,54,null),Qi=ex(jM,NM,56,null),Ri=ex(jM,OM,57,null),Si=ex(jM,PM,58,null),Ti=ex(jM,QM,59,null),Vi=ex(jM,RM,61,null),Wi=ex(jM,SM,62,null),Xi=ex(jM,TM,63,null),Yi=ex(jM,UM,64,null),yk=dx(tK,VM,179),dm=dx(RJ,WM,257),Vl=dx(RJ,XM,246),ek=dx(cL,YM,145),Gj=dx(NK,ZM,101),fk=dx(cL,$M,147),jl=dx(LK,_M,104),ol=dx(LK,aN,103),Fj=dx(NK,bN,102),ll=dx(LK,cN,213),ml=dx(LK,dN,214),nl=dx(LK,eN,215),gl=dx(tK,fN,207),Hm=cx(zL,gN,291),fl=dx(tK,hN,208),Xl=dx(RJ,iN,251),Ul=dx(RJ,jN,245),Tk=dx(tK,kN,194),Sk=dx(tK,lN,195),_l=dx(RJ,mN,255),ik=dx(nN,oN,154),jk=dx(nN,pN,155),Aj=dx(qN,rN,98),zj=dx(qN,sN,97),mj=dx(YL,tN,84),rj=dx(YL,uN,88),oj=dx(YL,vN,85),qj=dx(YL,wN,87),pj=dx(YL,xN,86),Mj=dx(yN,zN,120),Oj=dx(AN,BN,122),Nj=dx(AN,CN,121),sj=dx(YL,DN,89),Hj=dx(NK,EN,105),ak=dx(FN,GN,126),_j=dx(FN,HN,136),Zj=dx(FN,IN,133),$j=dx(FN,JN,135),Yj=dx(FN,KN,134),Sj=dx(FN,LN,127),Tj=dx(FN,MN,128),Uj=dx(FN,NN,129),Vj=dx(FN,ON,130),Wj=dx(FN,PN,131),Xj=dx(FN,QN,132),xm=dx(KL,RN,278),wm=dx(KL,SN,277),Wl=dx(RJ,TN,247),wj=dx(YL,UN,92),yj=dx(YL,VN,96),vj=dx(YL,WN,94),xj=dx(YL,XN,95),uj=dx(YL,YN,93),tj=dx(YL,ZN,91),Pj=dx(FN,$N,123),Qj=dx(FN,_N,124),mm=dx(KL,aO,267),sm=dx(KL,bO,272),km=dx(KL,cO,268),lm=dx(KL,dO,269),Cl=dx(dK,eO,229),sl=dx(dK,fO,219),Kl=dx(gO,hO,233),Jl=dx(gO,iO,237),Fl=dx(gO,jO,232),El=dx(kO,lO,231),Nl=dx(gO,mO,240),Ml=dx(gO,nO,239),Gl=dx(gO,oO,234),Ll=dx(gO,pO,238),Il=dx(gO,qO,236),Hl=dx(gO,rO,235),Bj=dx(qN,sO,99),Al=dx(dK,tO,227),hk=dx(nN,uO,150),gk=dx(nN,vO,151),Bl=dx(dK,wO,228),rl=dx(dK,xO,218),Dl=dx(kO,yO,230),Cj=dx(qN,zO,100),tm=dx(KL,AO,274),ql=dx(dK,BO,217),vi=dx(_K,CO,7),ui=dx(_K,DO,8),ti=dx(_K,EO,11),zm=cx(FO,GO,292),si=dx(_K,HO,9),Rj=dx(FN,IO,125);$stats && $stats({moduleName:'genex',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalEnd'});if ($wnd.genex) $wnd.genex.onScriptLoad();
 --></script></body></html>
\ No newline at end of file
diff --git a/common/static/js/capa/genex/genex.css b/common/static/js/capa/genex/genex.css
index a05f31110b..459c854f92 100644
--- a/common/static/js/capa/genex/genex.css
+++ b/common/static/js/capa/genex/genex.css
@@ -57,10 +57,15 @@ pre, #dna-strand {
   background: white;
 }
 .gwt-DialogBox .dialogBottomCenter {
+  background: url(images/hborder.png) repeat-x 0px -2945px;
+  -background: url(images/hborder_ie6.png) repeat-x 0px -2144px;
 }
 .gwt-DialogBox .dialogMiddleLeft {
+  background: url(images/vborder.png) repeat-y -31px 0px;
 }
 .gwt-DialogBox .dialogMiddleRight {
+  background: url(images/vborder.png) repeat-y -32px 0px;
+  -background: url(images/vborder_ie6.png) repeat-y -32px 0px;
 }
 .gwt-DialogBox .dialogTopLeftInner {
   width: 10px;
@@ -82,12 +87,20 @@ pre, #dna-strand {
   zoom: 1;
 }
 .gwt-DialogBox .dialogTopLeft {
+  background: url(images/circles.png) no-repeat -20px 0px;
+  -background: url(images/circles_ie6.png) no-repeat -20px 0px;
 }
 .gwt-DialogBox .dialogTopRight {
+  background: url(images/circles.png) no-repeat -28px 0px;
+  -background: url(images/circles_ie6.png) no-repeat -28px 0px;
 }
 .gwt-DialogBox .dialogBottomLeft {
+  background: url(images/circles.png) no-repeat 0px -36px;
+  -background: url(images/circles_ie6.png) no-repeat 0px -36px;
 }
 .gwt-DialogBox .dialogBottomRight {
+  background: url(images/circles.png) no-repeat -8px -36px;
+  -background: url(images/circles_ie6.png) no-repeat -8px -36px;
 }
 * html .gwt-DialogBox .dialogTopLeftInner {
   width: 10px;
diff --git a/common/static/js/capa/genex/genex.nocache.js b/common/static/js/capa/genex/genex.nocache.js
index 07da038234..fe892a53dc 100644
--- a/common/static/js/capa/genex/genex.nocache.js
+++ b/common/static/js/capa/genex/genex.nocache.js
@@ -1,4 +1,4 @@
-function genex(){var P='',xb='" for "gwt:onLoadErrorFn"',vb='" for "gwt:onPropertyErrorFn"',ib='"><\/script>',Z='#',Xb='.cache.html',_='/',lb='//',Qb='026A6180B5959B8660E084245FEE5E9E',Rb='1F433010E1134C95BF6CB43F552F3019',Sb='2DDA730EDABB80B88A6B0DFA3AFEACA2',Tb='4EEB1DCF4B30D366C27968D1B5C0BD04',Ub='5033ABB047340FB9346B622E2CC7107D',Wb=':',pb='::',dc='<script defer="defer">genex.onInjectionDone(\'genex\')<\/script>',hb='<script id="',sb='=',$='?',ub='Bad handler "',Vb='DF3D3A7FAEE63D711CF2D95BDB3F538C',cc='DOMContentLoaded',jb='SCRIPT',gb='__gwt_marker_genex',kb='base',cb='baseUrl',T='begin',S='bootstrap',bb='clear.cache.gif',rb='content',Y='end',Kb='gecko',Lb='gecko1_8',Q='genex',Yb='genex.css',eb='genex.nocache.js',ob='genex::',U='gwt.codesvr=',V='gwt.hosted=',W='gwt.hybrid',wb='gwt:onLoadErrorFn',tb='gwt:onPropertyErrorFn',qb='gwt:property',bc='head',Ob='hosted.html?genex',ac='href',Jb='ie6',Ib='ie8',Hb='ie9',yb='iframe',ab='img',zb="javascript:''",Zb='link',Nb='loadExternalRefs',mb='meta',Bb='moduleRequested',X='moduleStartup',Gb='msie',nb='name',Db='opera',Ab='position:absolute;width:0;height:0;border:none',$b='rel',Fb='safari',db='script',Pb='selectingPermutation',R='startup',_b='stylesheet',fb='undefined',Mb='unknown',Cb='user.agent',Eb='webkit';var m=window,n=document,o=m.__gwtStatsEvent?function(a){return m.__gwtStatsEvent(a)}:null,p=m.__gwtStatsSessionId?m.__gwtStatsSessionId:null,q,r,s,t=P,u={},v=[],w=[],x=[],y=0,z,A;o&&o({moduleName:Q,sessionId:p,subSystem:R,evtGroup:S,millis:(new Date).getTime(),type:T});if(!m.__gwt_stylesLoaded){m.__gwt_stylesLoaded={}}if(!m.__gwt_scriptsLoaded){m.__gwt_scriptsLoaded={}}function B(){var b=false;try{var c=m.location.search;return (c.indexOf(U)!=-1||(c.indexOf(V)!=-1||m.external&&m.external.gwtOnLoad))&&c.indexOf(W)==-1}catch(a){}B=function(){return b};return b}
+function genex(){var P='',xb='" for "gwt:onLoadErrorFn"',vb='" for "gwt:onPropertyErrorFn"',ib='"><\/script>',Z='#',Xb='.cache.html',_='/',lb='//',Qb='3F4ADBED36D589545A9300A1EA686D36',Rb='73F4B6D6D466BAD6850A60128DF5B80D',Wb=':',pb='::',dc='<script defer="defer">genex.onInjectionDone(\'genex\')<\/script>',hb='<script id="',sb='=',$='?',Sb='BA18AC23ACC5016C5D0799E864BBDFFE',ub='Bad handler "',Tb='C7B18436BA03373FB13ED589C2CCF417',cc='DOMContentLoaded',Ub='E1A9A95677AFC620CAD5759B7ACC3E67',Vb='FF175D5583BDD5ACF40C7F0AFF9A374B',jb='SCRIPT',gb='__gwt_marker_genex',kb='base',cb='baseUrl',T='begin',S='bootstrap',bb='clear.cache.gif',rb='content',Y='end',Kb='gecko',Lb='gecko1_8',Q='genex',Yb='genex.css',eb='genex.nocache.js',ob='genex::',U='gwt.codesvr=',V='gwt.hosted=',W='gwt.hybrid',wb='gwt:onLoadErrorFn',tb='gwt:onPropertyErrorFn',qb='gwt:property',bc='head',Ob='hosted.html?genex',ac='href',Jb='ie6',Ib='ie8',Hb='ie9',yb='iframe',ab='img',zb="javascript:''",Zb='link',Nb='loadExternalRefs',mb='meta',Bb='moduleRequested',X='moduleStartup',Gb='msie',nb='name',Db='opera',Ab='position:absolute;width:0;height:0;border:none',$b='rel',Fb='safari',db='script',Pb='selectingPermutation',R='startup',_b='stylesheet',fb='undefined',Mb='unknown',Cb='user.agent',Eb='webkit';var m=window,n=document,o=m.__gwtStatsEvent?function(a){return m.__gwtStatsEvent(a)}:null,p=m.__gwtStatsSessionId?m.__gwtStatsSessionId:null,q,r,s,t=P,u={},v=[],w=[],x=[],y=0,z,A;o&&o({moduleName:Q,sessionId:p,subSystem:R,evtGroup:S,millis:(new Date).getTime(),type:T});if(!m.__gwt_stylesLoaded){m.__gwt_stylesLoaded={}}if(!m.__gwt_scriptsLoaded){m.__gwt_scriptsLoaded={}}function B(){var b=false;try{var c=m.location.search;return (c.indexOf(U)!=-1||(c.indexOf(V)!=-1||m.external&&m.external.gwtOnLoad))&&c.indexOf(W)==-1}catch(a){}B=function(){return b};return b}
 function C(){if(q&&r){var b=n.getElementById(Q);var c=b.contentWindow;if(B()){c.__gwt_getProperty=function(a){return H(a)}}genex=null;c.gwtOnLoad(z,Q,t,y);o&&o({moduleName:Q,sessionId:p,subSystem:R,evtGroup:X,millis:(new Date).getTime(),type:Y})}}
 function D(){function e(a){var b=a.lastIndexOf(Z);if(b==-1){b=a.length}var c=a.indexOf($);if(c==-1){c=a.length}var d=a.lastIndexOf(_,Math.min(c,b));return d>=0?a.substring(0,d+1):P}
 function f(a){if(a.match(/^\w+:\/\//)){}else{var b=n.createElement(ab);b.src=a+bb;a=e(b.src)}return a}
@@ -13,6 +13,6 @@ function F(a){var b=u[a];return b==null?null:b}
 function G(a,b){var c=x;for(var d=0,e=a.length-1;d<e;++d){c=c[a[d]]||(c[a[d]]=[])}c[a[e]]=b}
 function H(a){var b=w[a](),c=v[a];if(b in c){return b}var d=[];for(var e in c){d[c[e]]=e}if(A){A(a,d,b)}throw null}
 var I;function J(){if(!I){I=true;var a=n.createElement(yb);a.src=zb;a.id=Q;a.style.cssText=Ab;a.tabIndex=-1;n.body.appendChild(a);o&&o({moduleName:Q,sessionId:p,subSystem:R,evtGroup:X,millis:(new Date).getTime(),type:Bb});a.contentWindow.location.replace(t+L)}}
-w[Cb]=function(){var b=navigator.userAgent.toLowerCase();var c=function(a){return parseInt(a[1])*1000+parseInt(a[2])};if(function(){return b.indexOf(Db)!=-1}())return Db;if(function(){return b.indexOf(Eb)!=-1}())return Fb;if(function(){return b.indexOf(Gb)!=-1&&n.documentMode>=9}())return Hb;if(function(){return b.indexOf(Gb)!=-1&&n.documentMode>=8}())return Ib;if(function(){var a=/msie ([0-9]+)\.([0-9]+)/.exec(b);if(a&&a.length==3)return c(a)>=6000}())return Jb;if(function(){return b.indexOf(Kb)!=-1}())return Lb;return Mb};v[Cb]={gecko1_8:0,ie6:1,ie8:2,ie9:3,opera:4,safari:5};genex.onScriptLoad=function(){if(I){r=true;C()}};genex.onInjectionDone=function(){q=true;o&&o({moduleName:Q,sessionId:p,subSystem:R,evtGroup:Nb,millis:(new Date).getTime(),type:Y});C()};E();D();var K;var L;if(B()){if(m.external&&(m.external.initModule&&m.external.initModule(Q))){m.location.reload();return}L=Ob;K=P}o&&o({moduleName:Q,sessionId:p,subSystem:R,evtGroup:S,millis:(new Date).getTime(),type:Pb});if(!B()){try{G([Fb],Qb);G([Lb],Rb);G([Hb],Sb);G([Jb],Tb);G([Db],Ub);G([Ib],Vb);K=x[H(Cb)];var M=K.indexOf(Wb);if(M!=-1){y=Number(K.substring(M+1));K=K.substring(0,M)}L=K+Xb}catch(a){return}}var N;function O(){if(!s){s=true;if(!__gwt_stylesLoaded[Yb]){var a=n.createElement(Zb);__gwt_stylesLoaded[Yb]=a;a.setAttribute($b,_b);a.setAttribute(ac,t+Yb);n.getElementsByTagName(bc)[0].appendChild(a)}C();if(n.removeEventListener){n.removeEventListener(cc,O,false)}if(N){clearInterval(N)}}}
+w[Cb]=function(){var b=navigator.userAgent.toLowerCase();var c=function(a){return parseInt(a[1])*1000+parseInt(a[2])};if(function(){return b.indexOf(Db)!=-1}())return Db;if(function(){return b.indexOf(Eb)!=-1}())return Fb;if(function(){return b.indexOf(Gb)!=-1&&n.documentMode>=9}())return Hb;if(function(){return b.indexOf(Gb)!=-1&&n.documentMode>=8}())return Ib;if(function(){var a=/msie ([0-9]+)\.([0-9]+)/.exec(b);if(a&&a.length==3)return c(a)>=6000}())return Jb;if(function(){return b.indexOf(Kb)!=-1}())return Lb;return Mb};v[Cb]={gecko1_8:0,ie6:1,ie8:2,ie9:3,opera:4,safari:5};genex.onScriptLoad=function(){if(I){r=true;C()}};genex.onInjectionDone=function(){q=true;o&&o({moduleName:Q,sessionId:p,subSystem:R,evtGroup:Nb,millis:(new Date).getTime(),type:Y});C()};E();D();var K;var L;if(B()){if(m.external&&(m.external.initModule&&m.external.initModule(Q))){m.location.reload();return}L=Ob;K=P}o&&o({moduleName:Q,sessionId:p,subSystem:R,evtGroup:S,millis:(new Date).getTime(),type:Pb});if(!B()){try{G([Hb],Qb);G([Fb],Rb);G([Ib],Sb);G([Lb],Tb);G([Db],Ub);G([Jb],Vb);K=x[H(Cb)];var M=K.indexOf(Wb);if(M!=-1){y=Number(K.substring(M+1));K=K.substring(0,M)}L=K+Xb}catch(a){return}}var N;function O(){if(!s){s=true;if(!__gwt_stylesLoaded[Yb]){var a=n.createElement(Zb);__gwt_stylesLoaded[Yb]=a;a.setAttribute($b,_b);a.setAttribute(ac,t+Yb);n.getElementsByTagName(bc)[0].appendChild(a)}C();if(n.removeEventListener){n.removeEventListener(cc,O,false)}if(N){clearInterval(N)}}}
 if(n.addEventListener){n.addEventListener(cc,function(){J();O()},false)}var N=setInterval(function(){if(/loaded|complete/.test(n.readyState)){J();O()}},50);o&&o({moduleName:Q,sessionId:p,subSystem:R,evtGroup:S,millis:(new Date).getTime(),type:Y});o&&o({moduleName:Q,sessionId:p,subSystem:R,evtGroup:Nb,millis:(new Date).getTime(),type:T});n.write(dc)}
 genex();
\ No newline at end of file
diff --git a/common/static/js/capa/genex/images/circles.png b/common/static/js/capa/genex/images/circles.png
new file mode 100644
index 0000000000..2a84b9c320
Binary files /dev/null and b/common/static/js/capa/genex/images/circles.png differ
diff --git a/common/static/js/capa/genex/images/circles_ie6.png b/common/static/js/capa/genex/images/circles_ie6.png
new file mode 100644
index 0000000000..3a388fc5d3
Binary files /dev/null and b/common/static/js/capa/genex/images/circles_ie6.png differ
diff --git a/common/static/js/capa/genex/images/corner.png b/common/static/js/capa/genex/images/corner.png
new file mode 100644
index 0000000000..51aa4582aa
Binary files /dev/null and b/common/static/js/capa/genex/images/corner.png differ
diff --git a/common/static/js/capa/genex/images/corner_ie6.png b/common/static/js/capa/genex/images/corner_ie6.png
new file mode 100644
index 0000000000..5197449254
Binary files /dev/null and b/common/static/js/capa/genex/images/corner_ie6.png differ
diff --git a/common/static/js/capa/genex/images/hborder.png b/common/static/js/capa/genex/images/hborder.png
new file mode 100644
index 0000000000..ec58ae6126
Binary files /dev/null and b/common/static/js/capa/genex/images/hborder.png differ
diff --git a/common/static/js/capa/genex/images/hborder_ie6.png b/common/static/js/capa/genex/images/hborder_ie6.png
new file mode 100644
index 0000000000..2268f88a76
Binary files /dev/null and b/common/static/js/capa/genex/images/hborder_ie6.png differ
diff --git a/common/static/js/capa/genex/images/thumb_horz.png b/common/static/js/capa/genex/images/thumb_horz.png
new file mode 100644
index 0000000000..b43e683e1f
Binary files /dev/null and b/common/static/js/capa/genex/images/thumb_horz.png differ
diff --git a/common/static/js/capa/genex/images/thumb_vertical.png b/common/static/js/capa/genex/images/thumb_vertical.png
new file mode 100644
index 0000000000..bd57f594ac
Binary files /dev/null and b/common/static/js/capa/genex/images/thumb_vertical.png differ
diff --git a/common/static/js/capa/genex/images/vborder.png b/common/static/js/capa/genex/images/vborder.png
new file mode 100644
index 0000000000..6840d11a12
Binary files /dev/null and b/common/static/js/capa/genex/images/vborder.png differ
diff --git a/common/static/js/capa/genex/images/vborder_ie6.png b/common/static/js/capa/genex/images/vborder_ie6.png
new file mode 100644
index 0000000000..90baeb1f99
Binary files /dev/null and b/common/static/js/capa/genex/images/vborder_ie6.png differ
diff --git a/common/static/js/vendor/jquery-jvectormap-1.1.1/jquery-jvectormap-1.1.1.css b/common/static/js/vendor/jquery-jvectormap-1.1.1/jquery-jvectormap-1.1.1.css
new file mode 100644
index 0000000000..3d9c8844bb
--- /dev/null
+++ b/common/static/js/vendor/jquery-jvectormap-1.1.1/jquery-jvectormap-1.1.1.css
@@ -0,0 +1,37 @@
+.jvectormap-label {
+    position: absolute;
+    display: none;
+    border: solid 1px #CDCDCD;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    background: #292929;
+    color: white;
+    font-family: sans-serif, Verdana;
+    font-size: smaller;
+    padding: 3px;
+}
+
+.jvectormap-zoomin, .jvectormap-zoomout {
+    position: absolute;
+    left: 10px;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    background: #292929;
+    padding: 3px;
+    color: white;
+    width: 10px;
+    height: 10px;
+    cursor: pointer;
+    line-height: 10px;
+    text-align: center;
+}
+
+.jvectormap-zoomin {
+    top: 10px;
+}
+
+.jvectormap-zoomout {
+    top: 30px;
+}
\ No newline at end of file
diff --git a/common/static/js/vendor/jquery-jvectormap-1.1.1/jquery-jvectormap-1.1.1.min.js b/common/static/js/vendor/jquery-jvectormap-1.1.1/jquery-jvectormap-1.1.1.min.js
new file mode 100644
index 0000000000..17450a0983
--- /dev/null
+++ b/common/static/js/vendor/jquery-jvectormap-1.1.1/jquery-jvectormap-1.1.1.min.js
@@ -0,0 +1,7 @@
+/**
+ * jVectorMap version 1.1
+ *
+ * Copyright 2011-2012, Kirill Lebedev
+ * Licensed under the MIT license.
+ *
+ */(function(e){var t={set:{colors:1,values:1,backgroundColor:1,scaleColors:1,normalizeFunction:1,focus:1},get:{selectedRegions:1,selectedMarkers:1,mapObject:1,regionName:1}};e.fn.vectorMap=function(e){var n,r,i,n=this.children(".jvectormap-container").data("mapObject");if(e==="addMap")jvm.WorldMap.maps[arguments[1]]=arguments[2];else{if(!(e!=="set"&&e!=="get"||!t[e][arguments[1]]))return r=arguments[1].charAt(0).toUpperCase()+arguments[1].substr(1),n[e+r].apply(n,Array.prototype.slice.call(arguments,2));e=e||{},e.container=this,n=new jvm.WorldMap(e)}return this}})(jQuery),function(e){function r(t){var n=t||window.event,r=[].slice.call(arguments,1),i=0,s=!0,o=0,u=0;return t=e.event.fix(n),t.type="mousewheel",n.wheelDelta&&(i=n.wheelDelta/120),n.detail&&(i=-n.detail/3),u=i,n.axis!==undefined&&n.axis===n.HORIZONTAL_AXIS&&(u=0,o=-1*i),n.wheelDeltaY!==undefined&&(u=n.wheelDeltaY/120),n.wheelDeltaX!==undefined&&(o=-1*n.wheelDeltaX/120),r.unshift(t,i,o,u),(e.event.dispatch||e.event.handle).apply(this,r)}var t=["DOMMouseScroll","mousewheel"];if(e.event.fixHooks)for(var n=t.length;n;)e.event.fixHooks[t[--n]]=e.event.mouseHooks;e.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var e=t.length;e;)this.addEventListener(t[--e],r,!1);else this.onmousewheel=r},teardown:function(){if(this.removeEventListener)for(var e=t.length;e;)this.removeEventListener(t[--e],r,!1);else this.onmousewheel=null}},e.fn.extend({mousewheel:function(e){return e?this.bind("mousewheel",e):this.trigger("mousewheel")},unmousewheel:function(e){return this.unbind("mousewheel",e)}})}(jQuery);var jvm={inherits:function(e,t){function n(){}n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e,e.parentClass=t},mixin:function(e,t){var n;for(n in t.prototype)t.prototype.hasOwnProperty(n)&&(e.prototype[n]=t.prototype[n])},min:function(e){var t=Number.MAX_VALUE,n;if(e instanceof Array)for(n=0;n<e.length;n++)e[n]<t&&(t=e[n]);else for(n in e)e[n]<t&&(t=e[n]);return t},max:function(e){var t=Number.MIN_VALUE,n;if(e instanceof Array)for(n=0;n<e.length;n++)e[n]>t&&(t=e[n]);else for(n in e)e[n]>t&&(t=e[n]);return t},keys:function(e){var t=[],n;for(n in e)t.push(n);return t},values:function(e){var t=[],n,r;for(r=0;r<arguments.length;r++){e=arguments[r];for(n in e)t.push(e[n])}return t}};jvm.$=jQuery,jvm.AbstractElement=function(e,t){this.node=this.createElement(e),this.name=e,this.properties={},t&&this.set(t)},jvm.AbstractElement.prototype.set=function(e,t){var n;if(typeof e=="object")for(n in e)this.properties[n]=e[n],this.applyAttr(n,e[n]);else this.properties[e]=t,this.applyAttr(e,t)},jvm.AbstractElement.prototype.get=function(e){return this.properties[e]},jvm.AbstractElement.prototype.applyAttr=function(e,t){this.node.setAttribute(e,t)},jvm.AbstractElement.prototype.remove=function(){jvm.$(this.node).remove()},jvm.AbstractCanvasElement=function(e,t,n){this.container=e,this.setSize(t,n),this.rootElement=new jvm[this.classPrefix+"GroupElement"],this.node.appendChild(this.rootElement.node),this.container.appendChild(this.node)},jvm.AbstractCanvasElement.prototype.add=function(e,t){t=t||this.rootElement,t.add(e),e.canvas=this},jvm.AbstractCanvasElement.prototype.addPath=function(e,t,n){var r=new jvm[this.classPrefix+"PathElement"](e,t);return this.add(r,n),r},jvm.AbstractCanvasElement.prototype.addCircle=function(e,t,n){var r=new jvm[this.classPrefix+"CircleElement"](e,t);return this.add(r,n),r},jvm.AbstractCanvasElement.prototype.addGroup=function(e){var t=new jvm[this.classPrefix+"GroupElement"];return e?e.node.appendChild(t.node):this.node.appendChild(t.node),t.canvas=this,t},jvm.AbstractShapeElement=function(e,t,n){this.style=n||{},this.style.current={},this.isHovered=!1,this.isSelected=!1,this.updateStyle()},jvm.AbstractShapeElement.prototype.setHovered=function(e){this.isHovered!==e&&(this.isHovered=e,this.updateStyle())},jvm.AbstractShapeElement.prototype.setSelected=function(e){this.isSelected!==e&&(this.isSelected=e,this.updateStyle(),jvm.$(this.node).trigger("selected",[e]))},jvm.AbstractShapeElement.prototype.setStyle=function(e,t){var n={};typeof e=="object"?n=e:n[e]=t,jvm.$.extend(this.style.current,n),this.updateStyle()},jvm.AbstractShapeElement.prototype.updateStyle=function(){var e={};jvm.$.extend(e,this.style.initial||{}),jvm.$.extend(e,this.style.current||{}),this.isHovered&&jvm.$.extend(e,this.style.hover||{}),this.isSelected&&(jvm.$.extend(e,this.style.selected||{}),this.isHovered&&jvm.$.extend(e,this.style.selectedHover||{})),this.set(e)},jvm.SVGElement=function(e,t){jvm.SVGElement.parentClass.apply(this,arguments)},jvm.inherits(jvm.SVGElement,jvm.AbstractElement),jvm.SVGElement.svgns="http://www.w3.org/2000/svg",jvm.SVGElement.prototype.createElement=function(e){return document.createElementNS(jvm.SVGElement.svgns,e)},jvm.SVGElement.prototype.addClass=function(e){this.node.setAttribute("class",e)},jvm.SVGElement.prototype.getElementCtr=function(e){return jvm["SVG"+e]},jvm.SVGElement.prototype.getBBox=function(){return this.node.getBBox()},jvm.SVGGroupElement=function(){jvm.SVGGroupElement.parentClass.call(this,"g")},jvm.inherits(jvm.SVGGroupElement,jvm.SVGElement),jvm.SVGGroupElement.prototype.add=function(e){this.node.appendChild(e.node)},jvm.SVGCanvasElement=function(e,t,n){this.classPrefix="SVG",jvm.SVGCanvasElement.parentClass.call(this,"svg"),jvm.AbstractCanvasElement.apply(this,arguments)},jvm.inherits(jvm.SVGCanvasElement,jvm.SVGElement),jvm.mixin(jvm.SVGCanvasElement,jvm.AbstractCanvasElement),jvm.SVGCanvasElement.prototype.setSize=function(e,t){this.width=e,this.height=t,this.node.setAttribute("width",e),this.node.setAttribute("height",t)},jvm.SVGCanvasElement.prototype.applyTransformParams=function(e,t,n){this.scale=e,this.transX=t,this.transY=n,this.rootElement.node.setAttribute("transform","scale("+e+") translate("+t+", "+n+")")},jvm.SVGShapeElement=function(e,t,n){jvm.SVGShapeElement.parentClass.call(this,e,t),jvm.AbstractShapeElement.apply(this,arguments)},jvm.inherits(jvm.SVGShapeElement,jvm.SVGElement),jvm.mixin(jvm.SVGShapeElement,jvm.AbstractShapeElement),jvm.SVGPathElement=function(e,t){jvm.SVGPathElement.parentClass.call(this,"path",e,t),this.node.setAttribute("fill-rule","evenodd")},jvm.inherits(jvm.SVGPathElement,jvm.SVGShapeElement),jvm.SVGCircleElement=function(e,t){jvm.SVGCircleElement.parentClass.call(this,"circle",e,t)},jvm.inherits(jvm.SVGCircleElement,jvm.SVGShapeElement),jvm.VMLElement=function(e,t){jvm.VMLElement.VMLInitialized||jvm.VMLElement.initializeVML(),jvm.VMLElement.parentClass.apply(this,arguments)},jvm.inherits(jvm.VMLElement,jvm.AbstractElement),jvm.VMLElement.VMLInitialized=!1,jvm.VMLElement.initializeVML=function(){try{document.namespaces.rvml||document.namespaces.add("rvml","urn:schemas-microsoft-com:vml"),jvm.VMLElement.prototype.createElement=function(e){return document.createElement("<rvml:"+e+' class="rvml">')}}catch(e){jvm.VMLElement.prototype.createElement=function(e){return document.createElement("<"+e+' xmlns="urn:schemas-microsoft.com:vml" class="rvml">')}}document.createStyleSheet().addRule(".rvml","behavior:url(#default#VML)"),jvm.VMLElement.VMLInitialized=!0},jvm.VMLElement.prototype.getElementCtr=function(e){return jvm["VML"+e]},jvm.VMLElement.prototype.addClass=function(e){jvm.$(this.node).addClass(e)},jvm.VMLElement.prototype.applyAttr=function(e,t){this.node[e]=t},jvm.VMLElement.prototype.getBBox=function(){var e=jvm.$(this.node);return{x:e.position().left/this.canvas.scale,y:e.position().top/this.canvas.scale,width:e.width()/this.canvas.scale,height:e.height()/this.canvas.scale}},jvm.VMLGroupElement=function(){jvm.VMLGroupElement.parentClass.call(this,"group"),this.node.style.left="0px",this.node.style.top="0px",this.node.coordorigin="0 0"},jvm.inherits(jvm.VMLGroupElement,jvm.VMLElement),jvm.VMLGroupElement.prototype.add=function(e){this.node.appendChild(e.node)},jvm.VMLCanvasElement=function(e,t,n){this.classPrefix="VML",jvm.VMLCanvasElement.parentClass.call(this,"group"),jvm.AbstractCanvasElement.apply(this,arguments),this.node.style.position="absolute"},jvm.inherits(jvm.VMLCanvasElement,jvm.VMLElement),jvm.mixin(jvm.VMLCanvasElement,jvm.AbstractCanvasElement),jvm.VMLCanvasElement.prototype.setSize=function(e,t){var n,r,i,s;this.width=e,this.height=t,this.node.style.width=e+"px",this.node.style.height=t+"px",this.node.coordsize=e+" "+t,this.node.coordorigin="0 0";if(this.rootElement){n=this.rootElement.node.getElementsByTagName("shape");for(i=0,s=n.length;i<s;i++)n[i].coordsize=e+" "+t,n[i].style.width=e+"px",n[i].style.height=t+"px";r=this.node.getElementsByTagName("group");for(i=0,s=r.length;i<s;i++)r[i].coordsize=e+" "+t,r[i].style.width=e+"px",r[i].style.height=t+"px"}},jvm.VMLCanvasElement.prototype.applyTransformParams=function(e,t,n){this.scale=e,this.transX=t,this.transY=n,this.rootElement.node.coordorigin=this.width-t-this.width/100+","+(this.height-n-this.height/100),this.rootElement.node.coordsize=this.width/e+","+this.height/e},jvm.VMLShapeElement=function(e,t){jvm.VMLShapeElement.parentClass.call(this,e,t),this.fillElement=new jvm.VMLElement("fill"),this.strokeElement=new jvm.VMLElement("stroke"),this.node.appendChild(this.fillElement.node),this.node.appendChild(this.strokeElement.node),this.node.stroked=!1,jvm.AbstractShapeElement.apply(this,arguments)},jvm.inherits(jvm.VMLShapeElement,jvm.VMLElement),jvm.mixin(jvm.VMLShapeElement,jvm.AbstractShapeElement),jvm.VMLShapeElement.prototype.applyAttr=function(e,t){switch(e){case"fill":this.node.fillcolor=t;break;case"fill-opacity":this.fillElement.node.opacity=Math.round(t*100)+"%";break;case"stroke":t==="none"?this.node.stroked=!1:this.node.stroked=!0,this.node.strokecolor=t;break;case"stroke-opacity":this.strokeElement.node.opacity=Math.round(t*100)+"%";break;case"stroke-width":parseInt(t,10)===0?this.node.stroked=!1:this.node.stroked=!0,this.node.strokeweight=t;break;case"d":this.node.path=jvm.VMLPathElement.pathSvgToVml(t);break;default:jvm.VMLShapeElement.parentClass.prototype.applyAttr.apply(this,arguments)}},jvm.VMLPathElement=function(e,t){var n=new jvm.VMLElement("skew");jvm.VMLPathElement.parentClass.call(this,"shape",e,t),this.node.coordorigin="0 0",n.node.on=!0,n.node.matrix="0.01,0,0,0.01,0,0",n.node.offset="0,0",this.node.appendChild(n.node)},jvm.inherits(jvm.VMLPathElement,jvm.VMLShapeElement),jvm.VMLPathElement.prototype.applyAttr=function(e,t){e==="d"?this.node.path=jvm.VMLPathElement.pathSvgToVml(t):jvm.VMLShapeElement.prototype.applyAttr.call(this,e,t)},jvm.VMLPathElement.pathSvgToVml=function(e){var t="",n=0,r=0,i,s;return e=e.replace(/(-?\d+)e(-?\d+)/g,"0"),e.replace(/([MmLlHhVvCcSs])\s*((?:-?\d*(?:\.\d+)?\s*,?\s*)+)/g,function(e,t,o,u){o=o.replace(/(\d)-/g,"$1,-").replace(/^\s+/g,"").replace(/\s+$/g,"").replace(/\s+/g,",").split(","),o[0]||o.shift();for(var a=0,f=o.length;a<f;a++)o[a]=Math.round(100*o[a]);switch(t){case"m":return n+=o[0],r+=o[1],"t"+o.join(",");case"M":return n=o[0],r=o[1],"m"+o.join(",");case"l":return n+=o[0],r+=o[1],"r"+o.join(",");case"L":return n=o[0],r=o[1],"l"+o.join(",");case"h":return n+=o[0],"r"+o[0]+",0";case"H":return n=o[0],"l"+n+","+r;case"v":return r+=o[0],"r0,"+o[0];case"V":return r=o[0],"l"+n+","+r;case"c":return i=n+o[o.length-4],s=r+o[o.length-3],n+=o[o.length-2],r+=o[o.length-1],"v"+o.join(",");case"C":return i=o[o.length-4],s=o[o.length-3],n=o[o.length-2],r=o[o.length-1],"c"+o.join(",");case"s":return o.unshift(r-s),o.unshift(n-i),i=n+o[o.length-4],s=r+o[o.length-3],n+=o[o.length-2],r+=o[o.length-1],"v"+o.join(",");case"S":return o.unshift(r+r-s),o.unshift(n+n-i),i=o[o.length-4],s=o[o.length-3],n=o[o.length-2],r=o[o.length-1],"c"+o.join(",")}return""}).replace(/z/g,"e")},jvm.VMLCircleElement=function(e,t){jvm.VMLCircleElement.parentClass.call(this,"oval",e,t)},jvm.inherits(jvm.VMLCircleElement,jvm.VMLShapeElement),jvm.VMLCircleElement.prototype.applyAttr=function(e,t){switch(e){case"r":this.node.style.width=t*2+"px",this.node.style.height=t*2+"px",this.applyAttr("cx",this.get("cx")||0),this.applyAttr("cy",this.get("cy")||0);break;case"cx":if(!t)return;this.node.style.left=t-(this.get("r")||0)+"px";break;case"cy":if(!t)return;this.node.style.top=t-(this.get("r")||0)+"px";break;default:jvm.VMLCircleElement.parentClass.prototype.applyAttr.call(this,e,t)}},jvm.VectorCanvas=function(e,t,n){return this.mode=window.SVGAngle?"svg":"vml",this.mode=="svg"?this.impl=new jvm.SVGCanvasElement(e,t,n):this.impl=new jvm.VMLCanvasElement(e,t,n),this.impl},jvm.SimpleScale=function(e){this.scale=e},jvm.SimpleScale.prototype.getValue=function(e){return e},jvm.OrdinalScale=function(e){this.scale=e},jvm.OrdinalScale.prototype.getValue=function(e){return this.scale[e]},jvm.NumericScale=function(e,t,n,r){this.scale=[],t=t||"linear",e&&this.setScale(e),t&&this.setNormalizeFunction(t),n&&this.setMin(n),r&&this.setMax(r)},jvm.NumericScale.prototype={setMin:function(e){this.clearMinValue=e,typeof this.normalize=="function"?this.minValue=this.normalize(e):this.minValue=e},setMax:function(e){this.clearMaxValue=e,typeof this.normalize=="function"?this.maxValue=this.normalize(e):this.maxValue=e},setScale:function(e){var t;for(t=0;t<e.length;t++)this.scale[t]=[e[t]]},setNormalizeFunction:function(e){e==="polynomial"?this.normalize=function(e){return Math.pow(e,.2)}:e==="linear"?delete this.normalize:this.normalize=e,this.setMin(this.clearMinValue),this.setMax(this.clearMaxValue)},getValue:function(e){var t=[],n=0,r,i=0,s;typeof this.normalize=="function"&&(e=this.normalize(e));for(i=0;i<this.scale.length-1;i++)r=this.vectorLength(this.vectorSubtract(this.scale[i+1],this.scale[i])),t.push(r),n+=r;s=(this.maxValue-this.minValue)/n;for(i=0;i<t.length;i++)t[i]*=s;i=0,e-=this.minValue;while(e-t[i]>=0)e-=t[i],i++;return i==this.scale.length-1?e=this.vectorToNum(this.scale[i]):e=this.vectorToNum(this.vectorAdd(this.scale[i],this.vectorMult(this.vectorSubtract(this.scale[i+1],this.scale[i]),e/t[i]))),e},vectorToNum:function(e){var t=0,n;for(n=0;n<e.length;n++)t+=Math.round(e[n])*Math.pow(256,e.length-n-1);return t},vectorSubtract:function(e,t){var n=[],r;for(r=0;r<e.length;r++)n[r]=e[r]-t[r];return n},vectorAdd:function(e,t){var n=[],r;for(r=0;r<e.length;r++)n[r]=e[r]+t[r];return n},vectorMult:function(e,t){var n=[],r;for(r=0;r<e.length;r++)n[r]=e[r]*t;return n},vectorLength:function(e){var t=0,n;for(n=0;n<e.length;n++)t+=e[n]*e[n];return Math.sqrt(t)}},jvm.ColorScale=function(e,t,n,r){jvm.ColorScale.parentClass.apply(this,arguments)},jvm.inherits(jvm.ColorScale,jvm.NumericScale),jvm.ColorScale.prototype.setScale=function(e){var t;for(t=0;t<e.length;t++)this.scale[t]=jvm.ColorScale.rgbToArray(e[t])},jvm.ColorScale.prototype.getValue=function(e){return jvm.ColorScale.numToRgb(jvm.ColorScale.parentClass.prototype.getValue.call(this,e))},jvm.ColorScale.arrayToRgb=function(e){var t="#",n,r;for(r=0;r<e.length;r++)n=e[r].toString(16),t+=n.length==1?"0"+n:n;return t},jvm.ColorScale.numToRgb=function(e){e=e.toString(16);while(e.length<6)e="0"+e;return"#"+e},jvm.ColorScale.rgbToArray=function(e){return e=e.substr(1),[parseInt(e.substr(0,2),16),parseInt(e.substr(2,2),16),parseInt(e.substr(4,2),16)]},jvm.DataSeries=function(e,t){var n;e=e||{},e.attribute=e.attribute||"fill",this.elements=t,this.params=e,e.attributes&&this.setAttributes(e.attributes),jvm.$.isArray(e.scale)?(n=e.attribute==="fill"||e.attribute==="stroke"?jvm.ColorScale:jvm.NumericScale,this.scale=new n(e.scale,e.normalizeFunction,e.min,e.max)):e.scale?this.scale=new jvm.OrdinalScale(e.scale):this.scale=new jvm.SimpleScale(e.scale),e.values&&(this.values=e.values||{},this.setValues(e.values))},jvm.DataSeries.prototype={setAttributes:function(e,t){var n=e,r;if(typeof e=="string")this.elements[e]&&this.elements[e].setStyle(this.params.attribute,t);else for(r in n)this.elements[r]&&this.elements[r].element.setStyle(this.params.attribute,n[r])},setValues:function(e){var t=Number.MIN_VALUE,n=Number.MAX_VALUE,r,i,s={};if(this.scale instanceof jvm.OrdinalScale||this.scale instanceof jvm.SimpleScale)for(i in e)e[i]?s[i]=this.scale.getValue(e[i]):s[i]=this.elements[i].element.style.initial[this.params.attribute];else{if(!this.params.min||!this.params.max){for(i in e)r=parseFloat(e[i]),r>t&&(t=e[i]),r<n&&(n=r);this.params.min||this.scale.setMin(n),this.params.max||this.scale.setMax(t),this.params.min=n,this.params.max=t}for(i in e)r=parseFloat(e[i]),isNaN(r)?s[i]=this.elements[i].element.style.initial[this.params.attribute]:s[i]=this.scale.getValue(r)}this.setAttributes(s),$.extend(this.values,e)},clear:function(){var e,t={};for(e in this.values)t[e]=this.elements[e].element.style.initial[this.params.attribute];this.setAttributes(t),this.values={}},setScale:function(e){this.scale.setScale(e),this.values&&this.setValues(this.values)},setNormalizeFunction:function(e){this.scale.setNormalizeFunction(e),this.values&&this.setValues(this.values)}},jvm.Proj={mill:function(e,t,n){return{x:(t-n)/360*jvm.WorldMap.circumference,y:-(180/Math.PI*(5/4)*Math.log(Math.tan(Math.PI/4+.8*e*Math.PI/360)))/360*jvm.WorldMap.circumference}},merc:function(e,t,n){return{x:(t-n)/360*jvm.WorldMap.circumference,y:-(180/Math.PI*Math.log(Math.tan(Math.PI/4+e*Math.PI/360)))/360*jvm.WorldMap.circumference}},aea:function(e,t,n){var r=0,i=n/180*Math.PI,s=29.5/180*Math.PI,o=45.5/180*Math.PI,u=e/180*Math.PI,a=t/180*Math.PI,f=(Math.sin(s)+Math.sin(o))/2,l=Math.cos(s)*Math.cos(s)+2*f*Math.sin(s),c=f*(a-i),h=Math.sqrt(l-2*f*Math.sin(u))/f,p=Math.sqrt(l-2*f*Math.sin(r))/f;return{x:h*Math.sin(c)/(2*Math.PI)*jvm.WorldMap.circumference,y:-(p-h*Math.cos(c))/(2*Math.PI)*jvm.WorldMap.circumference}},lcc:function(e,t,r){var i=0,s=r/180*Math.PI,o=t/180*Math.PI,u=33/180*Math.PI,a=.25*Math.PI,f=e/180*Math.PI;return n=Math.log(Math.cos(u)*(1/Math.cos(a)))/Math.log(Math.tan(Math.PI/4+a/2)*(1/Math.tan(Math.PI/4+u/2))),F=Math.cos(u)*Math.pow(Math.tan(Math.PI/4+u/2),n)/n,ro=F*Math.pow(1/Math.tan(Math.PI/4+f/2),n),ro0=F*Math.pow(1/Math.tan(Math.PI/4+i/2),n),{x:ro*Math.sin(n*(o-s))/(2*Math.PI)*jvm.WorldMap.circumference,y:-(ro0-ro*Math.cos(n*(o-s)))/(2*Math.PI)*jvm.WorldMap.circumference}}},jvm.WorldMap=function(e){var t=this,n;this.params=jvm.$.extend(!0,{},jvm.WorldMap.defaultParams,e),this.mapData=jvm.WorldMap.maps[this.params.map],this.markers={},this.regions={},this.regionsColors={},this.regionsData={},this.container=jvm.$("<div>").css({width:"100%",height:"100%"}).addClass("jvectormap-container"),this.params.container.append(this.container),this.container.data("mapObject",this),this.container.css({position:"relative",overflow:"hidden"}),this.defaultWidth=this.mapData.width,this.defaultHeight=this.mapData.height,this.setBackgroundColor(this.params.backgroundColor),this.onResize=function(){t.setSize()},jvm.$(window).resize(this.onResize);for(n in jvm.WorldMap.apiEvents)this.params[n]&&this.container.bind(jvm.WorldMap.apiEvents[n]+".jvectormap",this.params[n]);this.canvas=new jvm.VectorCanvas(this.container[0],this.width,this.height),"ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch?this.params.bindTouchEvents&&this.bindContainerTouchEvents():this.bindContainerEvents(),this.bindElementEvents(),this.createLabel(),this.bindZoomButtons(),this.createRegions(),this.createMarkers(this.params.markers||{}),this.setSize(),this.params.focusOn&&(typeof this.params.focusOn=="object"?this.setFocus.call(this,this.params.focusOn.scale,this.params.focusOn.x,this.params.focusOn.y):this.setFocus.call(this,this.params.focusOn)),this.params.selectedRegions&&this.setSelectedRegions(this.params.selectedRegions),this.params.selectedMarkers&&this.setSelectedMarkers(this.params.selectedMarkers),this.params.series&&this.createSeries()},jvm.WorldMap.prototype={transX:0,transY:0,scale:1,baseTransX:0,baseTransY:0,baseScale:1,width:0,height:0,setBackgroundColor:function(e){this.container.css("background-color",e)},resize:function(){var e=this.baseScale;this.width/this.height>this.defaultWidth/this.defaultHeight?(this.baseScale=this.height/this.defaultHeight,this.baseTransX=Math.abs(this.width-this.defaultWidth*this.baseScale)/(2*this.baseScale)):(this.baseScale=this.width/this.defaultWidth,this.baseTransY=Math.abs(this.height-this.defaultHeight*this.baseScale)/(2*this.baseScale)),this.scale*=this.baseScale/e,this.transX*=this.baseScale/e,this.transY*=this.baseScale/e},setSize:function(){this.width=this.container.width(),this.height=this.container.height(),this.resize(),this.canvas.setSize(this.width,this.height),this.applyTransform()},reset:function(){var e,t;for(e in this.series)for(t=0;t<this.series[e].length;t++)this.series[e][t].clear();this.scale=this.baseScale,this.transX=this.baseTransX,this.transY=this.baseTransY,this.applyTransform()},applyTransform:function(){var e,t,n,r;this.defaultWidth*this.scale<=this.width?(e=(this.width-this.defaultWidth*this.scale)/(2*this.scale),n=(this.width-this.defaultWidth*this.scale)/(2*this.scale)):(e=0,n=(this.width-this.defaultWidth*this.scale)/this.scale),this.defaultHeight*this.scale<=this.height?(t=(this.height-this.defaultHeight*this.scale)/(2*this.scale),r=(this.height-this.defaultHeight*this.scale)/(2*this.scale)):(t=0,r=(this.height-this.defaultHeight*this.scale)/this.scale),this.transY>t?this.transY=t:this.transY<r&&(this.transY=r),this.transX>e?this.transX=e:this.transX<n&&(this.transX=n),this.canvas.applyTransformParams(this.scale,this.transX,this.transY),this.markers&&this.repositionMarkers()},bindContainerEvents:function(){var e=!1,t,n,r=this;this.container.mousemove(function(i){return e&&(r.transX-=(t-i.pageX)/r.scale,r.transY-=(n-i.pageY)/r.scale,r.applyTransform(),t=i.pageX,n=i.pageY),!1}).mousedown(function(r){return e=!0,t=r.pageX,n=r.pageY,!1}),jvm.$("body").mouseup(function(){e=!1}),this.params.zoomOnScroll&&this.container.mousewheel(function(e,t,n,i){var s=jvm.$(r.container).offset(),o=e.pageX-s.left,u=e.pageY-s.top,a=Math.pow(1.3,i);r.label.hide(),r.setScale(r.scale*a,o,u),e.preventDefault()})},bindContainerTouchEvents:function(){var e,t,n,r=this,i,s,o,u;jvm.$(this.container).bind("gesturestart",function(i){return e=r.scale,t=r.transX,n=r.transY,!1}),jvm.$(this.container).bind("gesturechange",function(t){var n=t.originalEvent.scale;return r.setScale(e*n,o,u),r.label.hide(),!1}),jvm.$(this.container).bind("touchstart",function(e){var t=e.originalEvent.touches;t.length==2&&(t[0].pageX>t[1].pageX?o=t[1].pageX+(t[0].pageX-t[1].pageX)/2:o=t[0].pageX+(t[1].pageX-t[0].pageX)/2,t[0].pageY>t[1].pageY?u=t[1].pageY+(t[0].pageY-t[1].pageY)/2:u=t[0].pageY+(t[1].pageY-t[0].pageY)/2),i=e.originalEvent.touches[0].pageX,s=e.originalEvent.touches[0].pageY}),jvm.$(this.container).bind("touchmove",function(e){var t;if(r.scale!=r.baseScale)return e.originalEvent.touches.length==1&&i&&s?(t=e.originalEvent.touches[0],r.transX-=(i-t.pageX)/r.scale,r.transY-=(s-t.pageY)/r.scale,r.applyTransform(),r.label.hide(),i=t.pageX,s=t.pageY):(i=!1,s=!1),!1})},bindElementEvents:function(){var e=this,t;this.container.mousemove(function(){t=!0}),this.container.delegate("[class~='jvectormap-element']","mouseover mouseout",function(t){var n=this,r=jvm.$(this).attr("class").indexOf("jvectormap-region")===-1?"marker":"region",i=r=="region"?jvm.$(this).attr("data-code"):jvm.$(this).attr("data-index"),s=r=="region"?e.regions[i].element:e.markers[i].element,o=r=="region"?e.mapData.paths[i].name:e.markers[i].config.name||"",u=jvm.$.Event(r+"LabelShow.jvectormap"),a=jvm.$.Event(r+"Over.jvectormap");t.type=="mouseover"?(e.container.trigger(a,[i]),a.isDefaultPrevented()||s.setHovered(!0),e.label.text(o),e.container.trigger(u,[e.label,i]),u.isDefaultPrevented()||(e.label.show(),e.labelWidth=e.label.width(),e.labelHeight=e.label.height())):(s.setHovered(!1),e.label.hide(),e.container.trigger(r+"Out.jvectormap",[i]))}),this.container.delegate("[class~='jvectormap-element']","mousedown",function(e){t=!1}),this.container.delegate("[class~='jvectormap-element']","mouseup",function(n){var r=this,i=jvm.$(this).attr("class").indexOf("jvectormap-region")===-1?"marker":"region",s=i=="region"?jvm.$(this).attr("data-code"):jvm.$(this).attr("data-index"),o=jvm.$.Event(i+"Click.jvectormap"),u=i=="region"?e.regions[s].element:e.markers[s].element;if(!t){e.container.trigger(o,[s]);if(i==="region"&&e.params.regionsSelectable||i==="marker"&&e.params.markersSelectable)o.isDefaultPrevented()||(e.params[i+"sSelectableOne"]&&e.clearSelected(i+"s"),u.setSelected(!u.isSelected))}})},bindZoomButtons:function(){var e=this;jvm.$("<div/>").addClass("jvectormap-zoomin").text("+").appendTo(this.container),jvm.$("<div/>").addClass("jvectormap-zoomout").html("&#x2212;").appendTo(this.container),this.container.find(".jvectormap-zoomin").click(function(){e.setScale(e.scale*e.params.zoomStep,e.width/2,e.height/2)}),this.container.find(".jvectormap-zoomout").click(function(){e.setScale(e.scale/e.params.zoomStep,e.width/2,e.height/2)})},createLabel:function(){var e=this;this.label=jvm.$("<div/>").addClass("jvectormap-label").appendTo(jvm.$("body")),this.container.mousemove(function(t){var n=t.pageX-15-e.labelWidth,r=t.pageY-15-e.labelHeight;n<5&&(n=t.pageX+15),r<5&&(r=t.pageY+15),e.label.is(":visible")&&e.label.css({left:n,top:r})})},setScale:function(e,t,n,r){var i,s=jvm.$.Event("zoom.jvectormap");e>this.params.zoomMax*this.baseScale?e=this.params.zoomMax*this.baseScale:e<this.params.zoomMin*this.baseScale&&(e=this.params.zoomMin*this.baseScale),typeof t!="undefined"&&typeof n!="undefined"&&(i=e/this.scale,r?(this.transX=t+this.defaultWidth*(this.width/(this.defaultWidth*e))/2,this.transY=n+this.defaultHeight*(this.height/(this.defaultHeight*e))/2):(this.transX-=(i-1)/e*t,this.transY-=(i-1)/e*n)),this.scale=e,this.applyTransform(),this.container.trigger(s,[e/this.baseScale])},setFocus:function(e,t,n){var r;typeof e=="string"&&this.regions[e]?(r=this.regions[e].element.getBBox(),this.setScale(Math.min(this.width/r.width,this.height/r.height),-(r.x+r.width/2),-(r.y+r.height/2),!0)):this.setScale(e,-t*this.defaultWidth,-n*this.defaultHeight,!0)},getSelected:function(e){var t,n=[];for(t in this[e])this[e][t].element.isSelected&&n.push(t);return n},getSelectedRegions:function(){return this.getSelected("regions")},getSelectedMarkers:function(){return this.getSelected("markers")},setSelected:function(e,t){var n;typeof t!="object"&&(t=[t]);if(jvm.$.isArray(t))for(n=0;n<t.length;n++)this[e][t[n]].element.setSelected(!0);else for(n in t)this[e][n].element.setSelected(!!t[n])},setSelectedRegions:function(e){this.setSelected("regions",e)},setSelectedMarkers:function(e){this.setSelected("markers",e)},clearSelected:function(e){var t={},n=this.getSelected(e),r;for(r=0;r<n.length;r++)t[n[r]]=!1;this.setSelected(e,t)},clearSelectedRegions:function(){this.clearSelected("regions")},clearSelectedMarkers:function(){this.clearSelected("markers")},getMapObject:function(){return this},getRegionName:function(e){return this.mapData.paths[e].name},createRegions:function(){var e,t,n=this;for(e in this.mapData.paths)t=this.canvas.addPath({d:this.mapData.paths[e].path,"data-code":e},jvm.$.extend(!0,{},this.params.regionStyle)),jvm.$(t.node).bind("selected",function(e,t){n.container.trigger("regionSelected.jvectormap",[jvm.$(this).attr("data-code"),t,n.getSelectedRegions()])}),t.addClass("jvectormap-region jvectormap-element"),this.regions[e]={element:t,config:this.mapData.paths[e]}},createMarkers:function(e){var t,n,r,i,s,o=this;this.markersGroup=this.markersGroup||this.canvas.addGroup();if(jvm.$.isArray(e)){s=e.slice(),e={};for(t=0;t<s.length;t++)e[t]=s[t]}for(t in e)i=e[t]instanceof Array?{latLng:e[t]}:e[t],r=this.latLngToPoint.apply(this,i.latLng||[0,0]),n=this.canvas.addCircle({"data-index":t,cx:r.x,cy:r.y},jvm.$.extend(!0,{},this.params.markerStyle,{initial:i.style||{}}),this.markersGroup),n.addClass("jvectormap-marker jvectormap-element"),jvm.$(n.node).bind("selected",function(e,t){o.container.trigger("markerSelected.jvectormap",[jvm.$(this).attr("data-index"),t,o.getSelectedMarkers()])}),this.markers[t]&&this.removeMarkers([t]),this.markers[t]={element:n,config:i}},repositionMarkers:function(){var e,t;for(e in this.markers)t=this.latLngToPoint.apply(this,this.markers[e].config.latLng),this.markers[e].element.setStyle({cx:t.x,cy:t.y})},addMarker:function(e,t,n){var r={},i=[],s,o;r[e]=t;for(o=0;o<n.length;o++)s={},s[e]=n[o],i.push(s);this.addMarkers(r,i)},addMarkers:function(e,t){var n;t=t||[],this.createMarkers(e);for(n=0;n<t.length;n++)this.series.markers[n].setValues(t[n]||{})},removeMarkers:function(e){var t;for(t=0;t<e.length;t++)this.markers[e[t]].element.remove(),delete this.markers[e[t]]},removeAllMarkers:function(){var e,t=[];for(e in this.markers)t.push(e);this.removeMarkers(t)},latLngToPoint:function(e,t){var n,r=jvm.WorldMap.maps[this.params.map].projection,i=r.centralMeridian,s=this.width-this.baseTransX*2*this.baseScale,o=this.height-this.baseTransY*2*this.baseScale,u,a,f=this.scale/this.baseScale;return t<-180+i&&(t+=360),n=jvm.Proj[r.type](e,t,i),u=this.getInsetForPoint(n.x,n.y),u?(a=u.bbox,n.x=(n.x-a[0].x)/(a[1].x-a[0].x)*u.width*this.scale,n.y=(n.y-a[0].y)/(a[1].y-a[0].y)*u.height*this.scale,{x:n.x+this.transX*this.scale+u.left*this.scale,y:n.y+this.transY*this.scale+u.top*this.scale}):{x:0,y:0}},getInsetForPoint:function(e,t){var n=jvm.WorldMap.maps[this.params.map].insets,r,i;for(r=0;r<n.length;r++){i=n[r].bbox;if(e>i[0].x&&e<i[1].x&&t>i[0].y&&t<i[1].y)return n[r]}},createSeries:function(){var e,t;this.series={markers:[],regions:[]};for(t in this.params.series)for(e=0;e<this.params.series[t].length;e++)this.series[t][e]=new jvm.DataSeries(this.params.series[t][e],this[t])},remove:function(){this.label.remove(),this.container.remove(),jvm.$(window).unbind("resize",this.onResize)}},jvm.WorldMap.maps={},jvm.WorldMap.circumference=6381372*Math.PI*2,jvm.WorldMap.defaultParams={map:"world_mill_en",backgroundColor:"#505050",zoomOnScroll:!0,zoomMax:8,zoomMin:1,zoomStep:1.6,regionsSelectable:!1,markersSelectable:!1,bindTouchEvents:!0,regionStyle:{initial:{fill:"white","fill-opacity":1,stroke:"none","stroke-width":0,"stroke-opacity":1},hover:{"fill-opacity":.8},selected:{fill:"yellow"},selectedHover:{}},markerStyle:{initial:{fill:"grey",stroke:"#505050","fill-opacity":1,"stroke-width":1,"stroke-opacity":1,r:5},hover:{stroke:"black","stroke-width":2},selected:{fill:"blue"},selectedHover:{}}},jvm.WorldMap.apiEvents={onRegionLabelShow:"regionLabelShow",onRegionOver:"regionOver",onRegionOut:"regionOut",onRegionClick:"regionClick",onRegionSelected:"regionSelected",onMarkerLabelShow:"markerLabelShow",onMarkerOver:"markerOver",onMarkerOut:"markerOut",onMarkerClick:"markerClick",onMarkerSelected:"markerSelected",onZoom:"zoom"};
\ No newline at end of file
diff --git a/common/static/js/vendor/jquery-jvectormap-1.1.1/jquery-jvectormap-world-mill-en.js b/common/static/js/vendor/jquery-jvectormap-1.1.1/jquery-jvectormap-world-mill-en.js
new file mode 100644
index 0000000000..89f778398c
--- /dev/null
+++ b/common/static/js/vendor/jquery-jvectormap-1.1.1/jquery-jvectormap-world-mill-en.js
@@ -0,0 +1 @@
+$.fn.vectorMap('addMap', 'world_mill_en',{"insets": [{"width": 900.0, "top": 0, "height": 440.7063107441331, "bbox": [{"y": -12671671.123330014, "x": -20004297.151525836}, {"y": 6930392.02513512, "x": 20026572.394749384}], "left": 0}], "paths": {"BD": {"path": "M652.71,228.85l-0.04,1.38l-0.46,-0.21l-0.42,0.3l0.05,0.65l-0.17,-1.37l-0.48,-1.26l-1.08,-1.6l-0.23,-0.13l-2.31,-0.11l-0.31,0.36l0.21,0.98l-0.6,1.11l-0.8,-0.4l-0.37,0.09l-0.23,0.3l-0.54,-0.21l-0.78,-0.19l-0.38,-2.04l-0.83,-1.89l0.4,-1.5l-0.16,-0.35l-1.24,-0.57l0.36,-0.62l1.5,-0.95l0.02,-0.49l-1.62,-1.26l0.64,-1.31l1.7,1.0l0.12,0.04l0.96,0.11l0.19,1.62l0.25,0.26l2.38,0.37l2.32,-0.04l1.06,0.33l-0.92,1.79l-0.97,0.13l-0.23,0.16l-0.77,1.51l0.05,0.35l1.37,1.37l0.5,-0.14l0.35,-1.46l0.24,-0.0l1.24,3.92Z", "name": "Bangladesh"}, "BE": {"path": "M429.28,143.95l1.76,0.25l0.13,-0.01l2.16,-0.64l1.46,1.34l1.26,0.71l-0.23,1.8l-0.44,0.08l-0.24,0.25l-0.2,1.36l-1.8,-1.22l-0.23,-0.05l-1.14,0.23l-1.62,-1.43l-1.15,-1.31l-0.21,-0.1l-0.95,-0.04l-0.21,-0.68l1.66,-0.54Z", "name": "Belgium"}, "BF": {"path": "M413.48,260.21l-1.22,-0.46l-0.13,-0.02l-1.17,0.1l-0.15,0.06l-0.73,0.53l-0.87,-0.41l-0.39,-0.75l-0.13,-0.13l-0.98,-0.48l-0.14,-1.2l0.63,-0.99l0.05,-0.18l-0.05,-0.73l1.9,-2.01l0.08,-0.14l0.35,-1.65l0.49,-0.44l1.05,0.3l0.21,-0.02l1.05,-0.52l0.13,-0.13l0.3,-0.58l1.87,-1.1l0.11,-0.1l0.43,-0.72l2.23,-1.01l1.21,-0.32l0.51,0.4l0.19,0.06l1.25,-0.01l-0.14,0.89l0.01,0.13l0.34,1.16l0.06,0.11l1.35,1.59l0.07,1.13l0.24,0.28l2.64,0.53l-0.05,1.39l-0.42,0.59l-1.11,0.21l-0.22,0.17l-0.46,0.99l-0.69,0.23l-2.12,-0.05l-1.14,-0.2l-0.19,0.03l-0.72,0.36l-1.07,-0.17l-4.35,0.12l-0.29,0.29l-0.06,1.44l0.25,1.45Z", "name": "Burkina Faso"}, "BG": {"path": "M477.63,166.84l0.51,0.9l0.33,0.14l0.9,-0.21l1.91,0.47l3.68,0.16l0.17,-0.05l1.2,-0.75l2.78,-0.67l1.72,1.05l1.02,0.24l-0.97,0.97l-0.91,2.17l0.0,0.24l0.56,1.19l-1.58,-0.3l-0.16,0.01l-2.55,0.95l-0.2,0.28l-0.02,1.23l-1.92,0.24l-1.68,-0.99l-0.27,-0.02l-1.94,0.8l-1.52,-0.07l-0.15,-1.72l-0.12,-0.21l-0.99,-0.76l0.18,-0.18l0.02,-0.39l-0.17,-0.22l0.33,-0.75l0.91,-0.91l0.01,-0.42l-1.16,-1.25l-0.18,-0.89l0.24,-0.27Z", "name": "Bulgaria"}, "BA": {"path": "M468.39,164.66l0.16,0.04l0.43,-0.0l-0.43,0.93l0.06,0.34l1.08,1.06l-0.28,1.09l-0.5,0.13l-0.47,0.28l-0.86,0.74l-0.1,0.16l-0.28,1.29l-1.81,-0.94l-0.9,-1.22l-1.0,-0.73l-1.1,-1.1l-0.55,-0.96l-1.11,-1.3l0.3,-0.75l0.59,0.46l0.42,-0.04l0.46,-0.54l1.0,-0.06l2.11,0.5l1.72,-0.03l1.06,0.64Z", "name": "Bosnia and Herzegovina"}, "BN": {"path": "M707.34,273.57l0.76,-0.72l1.59,-1.03l-0.18,1.93l-0.9,-0.06l-0.28,0.14l-0.31,0.51l-0.68,-0.78Z", "name": "Brunei"}, "BO": {"path": "M263.83,340.79l-0.23,-0.12l-2.86,-0.11l-0.28,0.17l-0.77,1.67l-1.17,-1.51l-0.18,-0.11l-3.28,-0.64l-0.28,0.1l-2.02,2.3l-1.43,0.29l-0.91,-3.35l-1.31,-2.88l0.75,-2.41l-0.09,-0.32l-1.23,-1.03l-0.31,-1.76l-0.05,-0.12l-1.12,-1.6l1.49,-2.62l0.01,-0.28l-1.0,-2.0l0.48,-0.72l0.02,-0.29l-0.37,-0.78l0.87,-1.13l0.06,-0.18l0.05,-2.17l0.12,-1.71l0.5,-0.8l0.01,-0.3l-1.9,-3.58l1.3,0.15l1.34,-0.05l0.23,-0.12l0.51,-0.7l2.12,-0.99l1.31,-0.93l2.81,-0.37l-0.21,1.51l0.01,0.13l0.29,0.91l-0.19,1.64l0.11,0.27l2.72,2.27l0.15,0.07l2.71,0.41l0.92,0.88l0.12,0.07l1.64,0.49l1.0,0.71l0.18,0.06l1.5,-0.02l1.24,0.64l0.1,1.31l0.05,0.14l0.44,0.68l0.02,0.73l-0.44,0.03l-0.27,0.39l0.96,2.99l0.28,0.21l4.43,0.1l-0.28,1.12l0.0,0.15l0.27,1.02l0.15,0.19l1.27,0.67l0.52,1.42l-0.42,1.91l-0.66,1.1l-0.04,0.2l0.21,1.3l-0.19,0.13l-0.01,-0.27l-0.15,-0.24l-2.33,-1.33l-0.14,-0.04l-2.38,-0.03l-4.36,0.76l-0.21,0.16l-1.2,2.29l-0.03,0.13l-0.06,1.37l-0.79,2.53l-0.05,-0.08Z", "name": "Bolivia"}, "JP": {"path": "M781.17,166.78l1.8,0.67l0.28,-0.04l1.38,-1.01l0.43,2.67l-3.44,0.77l-0.18,0.12l-2.04,2.79l-3.71,-1.94l-0.42,0.15l-1.29,3.11l-2.32,0.04l-0.3,-2.63l1.12,-2.1l2.51,-0.16l0.28,-0.25l0.73,-4.22l0.58,-1.9l2.59,2.84l2.0,1.1ZM773.66,187.36l-0.92,2.24l-0.01,0.2l0.4,1.3l-1.18,1.81l-3.06,1.28l-4.35,0.17l-0.19,0.08l-3.4,3.06l-1.36,-0.87l-0.1,-1.95l-0.34,-0.28l-4.35,0.62l-2.99,1.33l-2.87,0.05l-0.28,0.2l0.09,0.33l2.37,1.93l-1.57,4.44l-1.35,0.97l-0.9,-0.79l0.57,-2.32l-0.15,-0.34l-1.5,-0.77l-0.81,-1.53l2.04,-0.75l0.14,-0.1l1.28,-1.72l2.47,-1.43l1.84,-1.92l4.83,-0.82l2.62,0.57l0.33,-0.16l2.45,-4.77l1.38,1.14l0.38,0.0l5.1,-4.02l0.09,-0.11l1.57,-3.57l0.02,-0.16l-0.42,-3.22l0.94,-1.67l2.27,-0.47l1.26,3.82l-0.07,2.23l-2.26,2.86l-0.06,0.19l0.04,2.93ZM757.85,196.18l0.22,0.66l-1.11,1.33l-0.8,-0.7l-0.33,-0.04l-1.28,0.65l-0.14,0.15l-0.54,1.34l-1.17,-0.57l0.02,-1.03l1.2,-1.45l1.24,0.28l0.29,-0.1l0.9,-1.03l1.51,0.5Z", "name": "Japan"}, "BI": {"path": "M494.7,295.83l-0.14,-2.71l-0.04,-0.13l-0.34,-0.62l0.93,0.12l0.3,-0.16l0.67,-1.25l0.9,0.11l0.11,0.76l0.08,0.16l0.46,0.48l0.02,0.56l-0.55,0.48l-0.96,1.29l-0.82,0.82l-0.61,0.07Z", "name": "Burundi"}, "BJ": {"path": "M427.4,268.94l-1.58,0.22l-0.52,-1.45l0.11,-5.73l-0.08,-0.21l-0.43,-0.44l-0.09,-1.13l-0.09,-0.19l-1.52,-1.52l0.24,-1.01l0.7,-0.23l0.18,-0.16l0.45,-0.97l1.07,-0.21l0.19,-0.12l0.53,-0.73l0.73,-0.65l0.68,-0.0l1.69,1.3l-0.08,0.67l0.02,0.14l0.52,1.38l-0.44,0.9l-0.01,0.24l0.2,0.52l-1.1,1.42l-0.76,0.76l-0.08,0.13l-0.47,1.59l0.05,1.69l-0.13,3.79Z", "name": "Benin"}, "BT": {"path": "M650.38,213.78l0.88,0.75l-0.13,1.24l-1.77,0.07l-2.1,-0.18l-1.57,0.4l-2.02,-0.91l-0.02,-0.24l1.54,-1.87l1.18,-0.6l1.67,0.59l1.32,0.08l1.01,0.67Z", "name": "Bhutan"}, "JM": {"path": "M226.67,238.37l1.64,0.23l1.2,0.56l0.11,0.19l-1.25,0.03l-0.14,0.04l-0.65,0.37l-1.24,-0.37l-1.17,-0.77l0.11,-0.22l0.86,-0.15l0.52,0.08Z", "name": "Jamaica"}, "BW": {"path": "M484.91,331.96l0.53,0.52l0.82,1.53l2.83,2.86l0.14,0.08l0.85,0.22l0.03,0.81l0.74,1.66l0.21,0.17l1.87,0.39l1.17,0.87l-3.13,1.71l-2.3,2.01l-0.07,0.1l-0.82,1.74l-0.66,0.88l-1.24,0.19l-0.24,0.2l-0.65,1.98l-1.4,0.55l-1.9,-0.12l-1.2,-0.74l-1.06,-0.32l-0.22,0.02l-1.22,0.62l-0.14,0.14l-0.58,1.21l-1.16,0.79l-1.18,1.13l-1.5,0.23l-0.4,-0.68l0.22,-1.53l-0.04,-0.19l-1.48,-2.54l-0.11,-0.11l-0.53,-0.31l-0.0,-7.25l2.18,-0.08l0.29,-0.3l0.07,-9.0l1.63,-0.08l3.69,-0.86l0.84,0.93l0.38,0.05l1.53,-0.97l0.79,-0.03l1.3,-0.53l0.23,0.1l0.92,1.96Z", "name": "Botswana"}, "BR": {"path": "M259.49,274.87l1.42,0.25l1.97,0.62l0.28,-0.05l0.67,-0.55l1.76,-0.38l2.8,-0.94l0.12,-0.08l0.92,-0.96l0.05,-0.33l-0.15,-0.32l0.73,-0.06l0.36,0.35l-0.27,0.93l0.17,0.36l0.76,0.34l0.44,0.9l-0.58,0.73l-0.06,0.13l-0.4,2.13l0.03,0.19l0.62,1.22l0.17,1.11l0.11,0.19l1.54,1.18l0.15,0.06l1.23,0.12l0.29,-0.15l0.2,-0.36l0.71,-0.11l1.13,-0.44l0.79,-0.63l1.25,0.19l0.65,-0.08l1.32,0.2l0.32,-0.18l0.23,-0.51l-0.05,-0.31l-0.31,-0.37l0.11,-0.31l0.75,0.17l0.13,0.0l1.1,-0.24l1.34,0.5l1.08,0.51l0.33,-0.05l0.67,-0.58l0.27,0.05l0.28,0.57l0.31,0.17l1.2,-0.18l0.17,-0.08l1.03,-1.05l0.76,-1.82l1.39,-2.16l0.49,-0.07l0.52,1.17l1.4,4.37l0.2,0.2l1.14,0.35l0.05,1.39l-1.8,1.97l0.01,0.42l0.78,0.75l0.18,0.08l4.16,0.37l0.08,2.25l0.5,0.22l1.78,-1.54l2.98,0.85l4.07,1.5l1.07,1.28l-0.37,1.23l0.36,0.38l2.83,-0.75l4.8,1.3l3.75,-0.09l3.6,2.02l3.27,2.84l1.93,0.72l2.13,0.11l0.76,0.66l1.22,4.56l-0.96,4.03l-1.22,1.58l-3.52,3.51l-1.63,2.91l-1.75,2.09l-0.5,0.04l-0.26,0.19l-0.72,1.99l0.18,4.76l-0.95,5.56l-0.74,0.96l-0.06,0.15l-0.43,3.39l-2.49,3.34l-0.06,0.13l-0.4,2.56l-1.9,1.07l-0.13,0.16l-0.51,1.38l-2.59,0.0l-3.94,1.01l-1.82,1.19l-2.85,0.81l-3.01,2.17l-2.12,2.65l-0.06,0.13l-0.36,2.0l0.01,0.13l0.4,1.42l-0.45,2.63l-0.53,1.23l-1.76,1.53l-2.76,4.79l-2.16,2.15l-1.69,1.29l-0.09,0.12l-1.12,2.6l-1.3,1.26l-0.45,-1.02l0.99,-1.18l0.01,-0.37l-1.5,-1.95l-1.98,-1.54l-2.58,-1.77l-0.2,-0.05l-0.81,0.07l-2.42,-2.05l-0.25,-0.07l-0.77,0.14l2.75,-3.07l2.8,-2.61l1.67,-1.09l2.11,-1.49l0.13,-0.24l0.05,-2.15l-0.07,-0.2l-1.26,-1.54l-0.35,-0.09l-0.64,0.27l0.3,-0.95l0.34,-1.57l0.01,-1.52l-0.16,-0.26l-0.9,-0.48l-0.27,-0.01l-0.86,0.39l-0.65,-0.08l-0.23,-0.8l-0.23,-2.39l-0.04,-0.12l-0.47,-0.79l-0.14,-0.12l-1.69,-0.71l-0.25,0.01l-0.93,0.47l-2.29,-0.44l0.15,-3.3l-0.03,-0.15l-0.62,-1.22l0.57,-0.39l0.13,-0.3l-0.22,-1.37l0.67,-1.13l0.44,-2.04l-0.01,-0.17l-0.59,-1.61l-0.14,-0.16l-1.25,-0.66l-0.22,-0.82l0.35,-1.41l-0.28,-0.37l-4.59,-0.1l-0.78,-2.41l0.34,-0.02l0.28,-0.31l-0.03,-1.1l-0.05,-0.16l-0.45,-0.68l-0.1,-1.4l-0.16,-0.24l-1.45,-0.76l-0.14,-0.03l-1.48,0.02l-1.04,-0.73l-1.62,-0.48l-0.93,-0.9l-0.16,-0.08l-2.72,-0.41l-2.53,-2.12l0.18,-1.54l-0.01,-0.13l-0.29,-0.91l0.26,-1.83l-0.34,-0.34l-3.28,0.43l-0.14,0.05l-1.3,0.93l-2.16,1.01l-0.12,0.09l-0.47,0.65l-1.12,0.05l-1.84,-0.21l-0.12,0.01l-1.33,0.41l-0.82,-0.21l0.16,-3.6l-0.48,-0.26l-1.97,1.43l-1.96,-0.06l-0.86,-1.23l-0.22,-0.13l-1.23,-0.11l0.34,-0.69l-0.05,-0.33l-1.36,-1.5l-0.92,-2.0l0.45,-0.32l0.13,-0.25l-0.0,-0.87l1.34,-0.64l0.17,-0.32l-0.23,-1.23l0.56,-0.77l0.05,-0.13l0.16,-1.03l2.7,-1.61l2.01,-0.47l0.16,-0.09l0.24,-0.27l2.11,0.11l0.31,-0.25l1.13,-6.87l0.06,-1.12l-0.4,-1.53l-0.1,-0.15l-1.0,-0.82l0.01,-1.45l1.08,-0.32l0.39,0.2l0.44,-0.24l0.08,-0.96l-0.25,-0.32l-1.22,-0.22l-0.02,-1.01l4.57,0.05l0.22,-0.09l0.6,-0.63l0.44,0.5l0.47,1.42l0.45,0.16l0.27,-0.18l1.21,1.16l0.23,0.08l1.95,-0.16l0.23,-0.14l0.43,-0.67l1.76,-0.55l1.05,-0.42l0.18,-0.2l0.25,-0.92l1.65,-0.66l0.18,-0.35l-0.14,-0.53l-0.26,-0.22l-1.91,-0.19l-0.29,-1.33l0.1,-1.64l-0.15,-0.28l-0.44,-0.25Z", "name": "Brazil"}, "BS": {"path": "M227.51,216.69l0.3,0.18l-0.24,1.07l0.03,-1.04l-0.09,-0.21ZM226.5,224.03l-0.13,0.03l-0.54,-1.3l-0.09,-0.12l-0.78,-0.64l0.4,-1.26l0.33,0.05l0.79,2.0l0.01,1.24ZM225.76,216.5l-2.16,0.34l-0.07,-0.41l0.85,-0.16l1.36,0.07l0.02,0.16Z", "name": "The Bahamas"}, "BY": {"path": "M480.08,135.28l2.09,0.02l0.13,-0.03l2.72,-1.3l0.16,-0.19l0.55,-1.83l1.94,-1.06l0.15,-0.31l-0.2,-1.33l1.33,-0.52l2.58,-1.3l2.39,0.8l0.3,0.75l0.37,0.17l1.22,-0.39l2.18,0.75l0.2,1.36l-0.48,0.85l0.01,0.32l1.57,2.26l0.92,0.6l-0.1,0.41l0.19,0.35l1.61,0.57l0.48,0.6l-0.64,0.49l-1.91,-0.11l-0.18,0.05l-0.48,0.32l-0.1,0.39l0.57,1.1l0.51,1.78l-1.79,0.17l-0.18,0.08l-0.77,0.73l-0.09,0.19l-0.13,1.31l-0.75,-0.22l-2.11,0.15l-0.56,-0.66l-0.39,-0.06l-0.8,0.49l-0.79,-0.4l-0.13,-0.03l-1.94,-0.07l-2.76,-0.79l-2.58,-0.27l-1.98,0.07l-0.15,0.05l-1.31,0.86l-0.8,0.09l-0.04,-1.16l-0.03,-0.12l-0.63,-1.28l1.22,-0.56l0.17,-0.27l0.01,-1.35l-0.04,-0.15l-0.66,-1.24l-0.08,-1.12Z", "name": "Belarus"}, "BZ": {"path": "M198.03,239.7l0.28,0.19l0.43,-0.1l0.82,-1.42l0.0,0.07l0.29,0.29l0.16,0.0l-0.02,0.35l-0.39,1.08l0.02,0.25l0.16,0.29l-0.23,0.8l0.04,0.24l0.09,0.14l-0.25,1.12l-0.38,0.53l-0.33,0.06l-0.21,0.15l-0.41,0.74l-0.25,0.0l0.17,-2.58l0.01,-2.2Z", "name": "Belize"}, "RU": {"path": "M688.57,38.85l0.63,2.39l0.44,0.19l2.22,-1.23l7.18,0.07l5.54,2.49l1.85,1.77l-0.55,2.34l-2.64,1.42l-6.57,2.76l-1.95,1.5l0.12,0.53l3.09,0.68l3.69,1.23l0.21,-0.01l1.98,-0.81l1.16,2.84l0.5,0.08l1.03,-1.18l3.86,-0.74l7.79,0.78l0.56,2.05l0.27,0.22l10.47,0.71l0.32,-0.29l0.13,-3.34l4.98,0.8l3.96,-0.02l3.88,2.43l1.06,2.79l-1.38,1.83l0.01,0.38l3.15,3.64l0.1,0.08l3.94,1.86l0.4,-0.14l2.28,-4.56l3.75,1.94l0.22,0.02l4.18,-1.22l4.76,1.4l0.26,-0.04l1.74,-1.23l3.98,0.63l0.32,-0.41l-1.71,-4.1l3.0,-1.86l22.39,3.04l2.06,2.67l0.1,0.08l6.55,3.51l0.17,0.03l10.08,-0.86l4.86,0.73l1.91,1.72l-0.29,3.13l0.18,0.31l3.08,1.26l0.19,0.01l3.32,-0.9l4.37,-0.11l4.78,0.87l4.61,-0.48l4.26,3.82l0.32,0.05l3.1,-1.4l0.12,-0.45l-1.91,-2.67l0.92,-1.64l7.78,1.22l5.22,-0.26l7.12,2.1l9.6,5.22l6.4,4.15l-0.2,2.44l0.14,0.28l1.69,1.04l0.45,-0.31l-0.51,-2.66l6.31,0.58l4.52,3.61l-2.1,1.52l-4.02,0.42l-0.27,0.29l-0.06,3.83l-0.81,0.67l-2.14,-0.11l-1.91,-1.39l-3.19,-1.13l-0.51,-1.63l-0.21,-0.2l-2.54,-0.67l-0.13,-0.0l-2.69,0.5l-1.12,-1.19l0.48,-1.36l-0.38,-0.39l-3.0,0.98l-0.17,0.44l1.02,1.76l-1.27,1.55l-3.09,1.71l-3.15,-0.29l-0.3,0.18l0.07,0.34l2.22,2.1l1.47,3.22l1.15,1.09l0.25,1.41l-0.48,0.76l-4.47,-0.81l-0.17,0.02l-6.97,2.9l-2.2,0.44l-0.11,0.05l-3.83,2.68l-3.63,2.32l-0.1,0.11l-0.76,1.4l-3.3,-2.4l-0.3,-0.03l-6.31,2.85l-0.99,-1.21l-0.4,-0.06l-2.32,1.54l-3.23,-0.49l-0.33,0.2l-0.79,2.39l-2.97,3.51l-0.07,0.21l0.09,1.47l0.22,0.27l2.62,0.74l-0.3,4.7l-2.06,0.12l-0.26,0.2l-1.07,2.94l0.04,0.27l0.83,1.19l-4.03,1.63l-0.18,0.21l-0.83,3.72l-3.55,0.79l-0.23,0.23l-0.73,3.32l-3.22,2.76l-0.76,-1.88l-1.07,-4.88l-1.39,-7.59l1.17,-4.76l2.05,-2.08l0.09,-0.19l0.11,-1.46l3.67,-0.77l0.15,-0.08l4.47,-4.61l4.29,-3.82l4.48,-3.01l0.11,-0.14l2.01,-5.43l-0.31,-0.4l-3.04,0.33l-0.24,0.17l-1.47,3.11l-5.98,3.94l-1.91,-4.36l-0.33,-0.17l-6.46,1.3l-0.15,0.08l-6.27,6.33l-0.01,0.41l1.7,1.87l-5.04,0.87l-3.51,0.34l0.16,-2.32l-0.26,-0.32l-3.89,-0.56l-0.19,0.04l-3.02,1.77l-7.63,-0.63l-8.24,1.1l-0.16,0.07l-8.11,7.09l-9.6,8.31l0.16,0.52l3.79,0.42l1.16,2.03l0.17,0.14l2.43,0.76l0.31,-0.08l1.5,-1.61l2.49,0.2l3.46,3.6l0.08,2.67l-1.91,3.26l-0.04,0.14l-0.21,3.91l-1.11,5.09l-3.73,4.55l-0.87,2.21l-6.73,7.14l-1.59,1.77l-3.23,1.72l-1.38,0.03l-1.48,-1.39l-0.37,-0.03l-3.36,2.22l-0.11,0.14l-0.16,0.42l-0.01,-1.09l1.0,-0.06l0.28,-0.27l0.36,-3.6l-0.61,-2.51l1.85,-0.94l2.94,0.53l0.32,-0.15l1.71,-3.1l0.84,-3.38l0.97,-1.18l1.32,-2.88l-0.34,-0.42l-4.14,0.95l-2.18,1.25l-3.51,-0.0l-0.95,-2.81l-0.1,-0.14l-2.97,-2.3l-0.11,-0.05l-4.19,-1.0l-0.89,-3.08l-0.87,-2.03l-0.95,-1.46l-1.54,-3.37l-0.12,-0.14l-2.27,-1.28l-3.83,-1.02l-3.37,0.1l-3.11,0.61l-0.13,0.06l-2.07,1.69l0.04,0.49l1.23,0.72l0.03,1.53l-1.34,1.05l-2.26,3.51l-0.05,0.17l0.02,1.27l-3.25,1.9l-2.87,-1.17l-0.14,-0.02l-2.86,0.26l-1.22,-1.02l-0.12,-0.06l-1.5,-0.35l-0.23,0.04l-3.62,2.27l-3.24,0.53l-2.28,0.79l-3.08,-0.51l-2.24,0.03l-1.49,-1.61l-2.45,-1.57l-0.11,-0.04l-2.6,-0.43l-3.17,0.43l-2.31,0.59l-3.31,-1.28l-0.45,-2.31l-0.21,-0.23l-2.94,-0.85l-2.26,-0.39l-2.77,-1.36l-0.37,0.09l-2.59,3.45l-0.03,0.32l0.91,1.74l-2.15,2.01l-3.47,-0.79l-2.44,-0.12l-1.59,-1.46l-0.2,-0.08l-2.55,-0.05l-2.12,-0.98l-0.24,-0.01l-3.85,1.57l-4.74,2.79l-2.59,0.55l-0.79,0.21l-1.21,-1.81l-0.29,-0.13l-3.05,0.41l-0.96,-1.25l-0.14,-0.1l-1.65,-0.6l-1.15,-1.82l-0.13,-0.12l-1.38,-0.6l-0.19,-0.02l-3.49,0.82l-3.35,-1.85l-0.38,0.08l-1.08,1.4l-5.36,-8.17l-3.02,-2.52l0.72,-0.85l0.01,-0.38l-0.37,-0.08l-6.22,3.21l-1.98,0.16l0.17,-1.51l-0.2,-0.31l-3.22,-1.17l-0.19,-0.0l-2.3,0.74l-0.72,-3.27l-0.24,-0.23l-4.5,-0.75l-0.21,0.04l-2.2,1.42l-6.21,1.27l-0.11,0.05l-1.16,0.81l-9.3,1.19l-0.18,0.09l-1.15,1.17l-0.02,0.39l1.56,2.01l-2.02,0.74l-0.16,0.42l0.35,0.68l-2.18,1.49l0.02,0.51l3.83,2.16l-0.45,1.13l-3.31,-0.13l-0.25,0.12l-0.57,0.77l-2.97,-1.59l-0.15,-0.04l-3.97,0.07l-0.13,0.03l-2.53,1.32l-2.84,-1.28l-5.52,-2.3l-0.12,-0.02l-3.91,0.09l-0.16,0.05l-5.17,3.6l-0.13,0.21l-0.25,1.89l-2.17,-1.6l-0.44,0.1l-2.0,3.59l0.06,0.37l0.55,0.5l-1.32,2.23l0.04,0.36l2.13,2.17l0.23,0.09l1.7,-0.08l1.42,1.89l-0.23,1.5l0.19,0.32l0.94,0.38l-0.89,1.44l-2.3,0.49l-0.17,0.11l-2.49,3.2l0.0,0.37l2.2,2.81l-0.23,1.93l0.06,0.22l2.56,3.32l-1.27,1.02l-0.4,0.66l-0.8,-0.15l-1.65,-1.75l-0.18,-0.09l-0.66,-0.09l-1.45,-0.64l-0.72,-1.16l-0.18,-0.13l-2.34,-0.63l-0.17,0.0l-1.32,0.41l-0.31,-0.4l-0.12,-0.09l-3.49,-1.48l-3.67,-0.49l-2.1,-0.52l-0.3,0.1l-0.12,0.14l-2.96,-2.4l-2.89,-1.19l-1.69,-1.42l1.27,-0.35l0.16,-0.1l2.08,-2.61l-0.04,-0.41l-1.02,-0.9l3.21,-1.12l0.2,-0.31l-0.07,-0.69l-0.37,-0.26l-1.86,0.42l0.05,-0.86l1.11,-0.76l2.35,-0.23l0.25,-0.19l0.39,-1.07l0.0,-0.19l-0.51,-1.64l0.95,-1.58l0.04,-0.16l-0.03,-0.95l-0.22,-0.28l-3.69,-1.06l-1.43,0.02l-1.45,-1.44l-0.29,-0.08l-1.83,0.49l-2.88,-1.04l0.04,-0.42l-0.04,-0.18l-0.89,-1.43l-0.23,-0.14l-1.77,-0.14l-0.13,-0.66l0.52,-0.56l0.01,-0.4l-1.6,-1.9l-0.27,-0.1l-2.55,0.32l-0.71,-0.16l-0.3,0.1l-0.53,0.63l-0.58,-0.08l-0.56,-1.97l-0.48,-0.94l0.17,-0.11l1.92,0.11l0.2,-0.06l0.97,-0.74l0.05,-0.42l-0.72,-0.91l-0.13,-0.1l-1.43,-0.51l0.09,-0.36l-0.13,-0.33l-0.97,-0.59l-1.43,-2.06l0.44,-0.77l0.04,-0.19l-0.25,-1.64l-0.2,-0.24l-2.45,-0.84l-0.19,-0.0l-1.05,0.34l-0.25,-0.62l-0.18,-0.17l-2.5,-0.84l-0.74,-1.93l-0.21,-1.7l-0.13,-0.21l-0.92,-0.63l0.83,-0.89l0.07,-0.27l-0.71,-3.26l1.69,-2.01l0.03,-0.34l-0.24,-0.41l2.63,-1.9l-0.01,-0.49l-2.31,-1.57l5.08,-4.61l2.33,-2.24l1.01,-2.08l-0.09,-0.37l-3.52,-2.56l0.94,-2.38l-0.04,-0.29l-2.14,-2.86l1.61,-3.35l-0.01,-0.29l-2.81,-4.58l2.19,-3.04l-0.06,-0.42l-3.7,-2.76l0.32,-2.67l1.87,-0.38l4.26,-1.77l2.46,-1.47l3.96,2.58l0.12,0.05l6.81,1.04l9.37,4.87l1.81,1.92l0.15,2.55l-2.61,2.06l-3.95,1.07l-11.1,-3.15l-0.17,0.0l-1.84,0.53l-0.1,0.53l3.97,2.97l0.15,1.77l0.16,4.14l0.19,0.27l3.21,1.22l1.94,1.03l0.44,-0.22l0.32,-1.94l-0.07,-0.25l-1.32,-1.52l1.25,-1.2l5.87,2.45l0.24,-0.01l2.11,-0.98l0.13,-0.42l-1.55,-2.75l5.52,-3.84l2.13,0.22l2.28,1.42l0.43,-0.12l1.46,-2.87l-0.04,-0.33l-1.97,-2.37l1.14,-2.38l-0.02,-0.3l-1.42,-2.07l6.15,1.22l1.14,1.92l-2.74,0.46l-0.25,0.3l0.02,2.36l0.12,0.24l1.97,1.44l0.25,0.05l3.87,-0.91l0.22,-0.23l0.58,-2.55l5.09,-1.98l8.67,-3.69l1.22,0.14l-2.06,2.2l0.18,0.5l3.11,0.45l0.23,-0.07l1.71,-1.41l4.59,-0.12l0.12,-0.03l3.53,-1.72l2.7,2.48l0.42,-0.01l2.85,-2.88l-0.0,-0.43l-2.42,-2.35l1.0,-1.13l7.2,1.31l3.42,1.36l9.06,4.97l0.39,-0.08l1.67,-2.27l-0.04,-0.4l-2.46,-2.23l-0.06,-0.82l-0.26,-0.27l-2.64,-0.38l0.69,-1.76l0.0,-0.22l-1.32,-3.47l-0.07,-1.27l4.52,-4.09l0.08,-0.11l1.6,-4.18l1.67,-0.84l6.33,1.2l0.46,2.31l-2.31,3.67l0.05,0.38l1.49,1.41l0.77,3.04l-0.56,6.05l0.09,0.24l2.62,2.54l-0.99,2.65l-4.87,5.96l0.17,0.48l2.86,0.61l0.31,-0.13l0.94,-1.42l2.67,-1.04l0.18,-0.19l0.64,-2.01l2.11,-1.98l0.05,-0.37l-1.38,-2.32l1.11,-2.74l-0.24,-0.41l-2.53,-0.33l-0.53,-2.16l1.96,-4.42l-0.05,-0.32l-3.03,-3.48l4.21,-2.94l0.12,-0.3l-0.52,-3.04l0.72,-0.06l1.18,2.35l-0.97,4.39l0.2,0.35l2.68,0.84l0.37,-0.38l-1.05,-3.07l3.89,-1.71l5.05,-0.24l4.55,2.62l0.36,-0.05l0.05,-0.36l-2.19,-3.84l-0.23,-4.78l4.07,-0.92l5.98,0.21l5.47,-0.64l0.2,-0.48l-1.88,-2.37l2.65,-2.99l2.75,-0.13l0.12,-0.03l4.82,-2.48l6.56,-0.67l0.23,-0.14l0.76,-1.27l6.33,-0.46l1.97,1.11l0.28,0.01l5.55,-2.71l4.53,0.08l0.29,-0.21l0.67,-2.18l2.29,-2.15l5.75,-2.13l3.48,1.4l-2.7,1.03l-0.19,0.31l0.26,0.26l5.47,0.78ZM871.83,65.73l0.25,-0.15l1.99,0.01l3.3,1.2l-0.08,0.22l-2.41,1.03l-5.73,0.49l-0.31,-1.0l2.99,-1.8ZM797.64,48.44l-2.22,1.51l-3.85,-0.43l-4.35,-1.85l0.42,-1.13l4.42,0.72l5.59,1.17ZM783.82,46.06l-1.71,3.25l-9.05,-0.14l-4.11,1.15l-4.64,-3.04l1.21,-3.13l3.11,-0.91l6.53,0.22l8.66,2.59ZM780.37,145.71l2.28,5.23l-3.09,-0.89l-0.37,0.19l-1.54,4.65l0.04,0.27l2.38,3.17l-0.05,1.4l-1.41,-1.41l-0.46,0.04l-1.23,1.81l-0.33,-1.86l0.28,-3.1l-0.28,-3.41l0.58,-2.46l0.11,-4.39l-0.03,-0.13l-1.44,-3.2l0.21,-4.39l2.19,-1.49l0.09,-0.41l-0.81,-1.3l0.48,-0.21l0.56,1.94l0.86,3.23l-0.05,3.36l1.03,3.35ZM780.16,57.18l-3.4,0.03l-5.06,-0.53l1.97,-1.59l2.95,-0.42l3.35,1.75l0.18,0.77ZM683.84,31.18l-13.29,1.97l4.16,-6.56l1.88,-0.58l1.77,0.34l6.08,3.02l-0.6,1.8ZM670.94,28.02l-5.18,0.65l-6.89,-1.58l-4.03,-2.07l-1.88,-3.98l-0.18,-0.16l-2.8,-0.93l5.91,-3.62l5.25,-1.29l4.73,2.88l5.63,5.44l-0.57,4.66ZM564.37,68.98l-0.85,0.23l-7.93,-0.57l-0.6,-1.84l-0.21,-0.2l-4.34,-1.18l-0.3,-2.08l2.34,-0.92l0.19,-0.29l-0.08,-2.43l4.85,-4.0l-0.12,-0.52l-1.68,-0.43l5.47,-3.94l0.11,-0.33l-0.6,-2.02l5.36,-2.55l8.22,-3.27l8.29,-0.96l4.34,-1.94l4.67,-0.65l1.45,1.72l-1.43,1.37l-8.8,2.52l-7.65,2.42l-7.92,4.84l-3.73,4.75l-3.92,4.58l-0.07,0.23l0.51,3.88l0.11,0.2l4.32,3.39ZM548.86,18.57l-3.28,0.75l-2.25,0.44l-0.22,0.19l-0.3,0.81l-2.67,0.86l-2.27,-1.14l1.2,-1.51l-0.23,-0.49l-3.14,-0.1l2.48,-0.54l3.55,-0.07l0.44,1.36l0.49,0.12l1.4,-1.35l2.2,-0.9l3.13,1.08l-0.54,0.49ZM477.5,133.25l-4.21,0.05l-2.69,-0.34l0.39,-1.03l3.24,-1.06l2.51,0.58l0.85,0.43l-0.2,0.71l-0.0,0.15l0.12,0.52Z", "name": "Russia"}, "RW": {"path": "M497.03,288.12l0.78,1.11l-0.12,1.19l-0.49,0.21l-1.25,-0.15l-0.3,0.16l-0.67,1.24l-1.01,-0.13l0.16,-0.92l0.22,-0.12l0.15,-0.24l0.09,-1.37l0.49,-0.48l0.42,0.18l0.25,-0.01l1.26,-0.65Z", "name": "Rwanda"}, "RS": {"path": "M469.75,168.65l0.21,-0.21l0.36,-1.44l-0.08,-0.29l-1.06,-1.03l0.54,-1.16l-0.28,-0.43l-0.26,0.0l0.55,-0.67l-0.01,-0.39l-0.77,-0.86l-0.45,-0.89l1.56,-0.67l1.39,0.12l1.22,1.1l0.26,0.91l0.16,0.19l1.38,0.66l0.17,1.12l0.14,0.21l1.46,0.9l0.35,-0.03l0.62,-0.54l0.09,0.06l-0.28,0.25l-0.03,0.42l0.29,0.34l-0.44,0.5l-0.07,0.26l0.22,1.12l0.07,0.14l1.02,1.1l-0.81,0.84l-0.42,0.96l0.04,0.3l0.12,0.15l-0.15,0.16l-1.04,0.04l-0.39,0.08l0.33,-0.81l-0.29,-0.41l-0.21,0.01l-0.39,-0.45l-0.13,-0.09l-0.32,-0.11l-0.27,-0.4l-0.14,-0.11l-0.4,-0.16l-0.31,-0.37l-0.34,-0.09l-0.45,0.17l-0.18,0.18l-0.29,0.84l-0.96,-0.65l-0.81,-0.33l-0.32,-0.37l-0.22,-0.18Z", "name": "Republic of Serbia"}, "LT": {"path": "M478.13,133.31l-0.14,-0.63l0.25,-0.88l-0.15,-0.35l-1.17,-0.58l-2.43,-0.57l-0.45,-2.51l2.58,-0.97l4.14,0.22l2.3,-0.32l0.26,0.54l0.22,0.17l1.26,0.22l2.25,1.6l0.19,1.23l-1.87,1.01l-0.14,0.18l-0.54,1.83l-2.54,1.21l-2.18,-0.02l-0.52,-0.91l-0.18,-0.14l-1.11,-0.32Z", "name": "Lithuania"}, "LU": {"path": "M435.95,147.99l0.33,0.49l-0.11,1.07l-0.39,0.04l-0.29,-0.15l0.21,-1.4l0.25,-0.05Z", "name": "Luxembourg"}, "LR": {"path": "M401.37,273.67l-0.32,0.01l-2.48,-1.15l-2.24,-1.89l-2.14,-1.38l-1.47,-1.42l0.44,-0.59l0.05,-0.13l0.12,-0.65l1.07,-1.3l1.08,-1.09l0.52,-0.07l0.43,-0.18l0.84,1.24l-0.15,0.89l0.07,0.25l0.49,0.54l0.22,0.1l0.71,0.01l0.27,-0.16l0.42,-0.83l0.19,0.02l-0.06,0.52l0.23,1.12l-0.5,1.03l0.06,0.35l0.73,0.69l0.14,0.08l0.71,0.15l0.92,0.91l0.06,0.76l-0.17,0.22l-0.06,0.15l-0.17,1.8Z", "name": "Liberia"}, "RO": {"path": "M477.94,155.19l1.02,-0.64l1.49,0.33l1.52,0.01l1.09,0.73l0.32,0.01l0.81,-0.46l1.8,-0.3l0.18,-0.1l0.54,-0.64l0.86,0.0l0.64,0.26l0.71,0.87l0.8,1.35l1.39,1.81l0.07,1.25l-0.26,1.3l0.01,0.15l0.45,1.42l0.15,0.18l1.12,0.57l0.25,0.01l1.05,-0.45l0.86,0.4l0.03,0.43l-0.92,0.51l-0.63,-0.24l-0.4,0.22l-0.64,3.41l-1.12,-0.24l-1.78,-1.09l-0.23,-0.04l-2.95,0.71l-1.25,0.77l-3.55,-0.16l-1.89,-0.47l-0.14,-0.0l-0.75,0.17l-0.61,-1.07l-0.3,-0.36l0.36,-0.32l-0.04,-0.48l-0.62,-0.38l-0.36,0.03l-0.62,0.54l-1.15,-0.71l-0.18,-1.14l-0.17,-0.22l-1.4,-0.67l-0.24,-0.86l-0.09,-0.14l-0.96,-0.87l1.49,-0.44l0.16,-0.11l1.51,-2.14l1.15,-2.09l1.44,-0.63Z", "name": "Romania"}, "GW": {"path": "M383.03,256.73l-1.12,-0.88l-0.14,-0.06l-0.94,-0.15l-0.43,-0.54l0.01,-0.27l-0.13,-0.26l-0.68,-0.48l-0.05,-0.16l0.99,-0.31l0.77,0.08l0.15,-0.02l0.61,-0.26l4.25,0.1l-0.02,0.44l-0.19,0.18l-0.08,0.29l0.17,0.66l-0.17,0.14l-0.44,0.0l-0.16,0.05l-0.57,0.37l-0.66,-0.04l-0.24,0.1l-0.92,1.03Z", "name": "Guinea Bissau"}, "GT": {"path": "M195.13,249.89l-1.05,-0.35l-1.5,-0.04l-1.06,-0.47l-1.19,-0.93l0.04,-0.53l0.27,-0.55l-0.03,-0.31l-0.24,-0.32l1.02,-1.77l3.04,-0.01l0.3,-0.28l0.06,-0.88l-0.19,-0.3l-0.3,-0.11l-0.23,-0.45l-0.11,-0.12l-0.9,-0.58l-0.35,-0.33l0.37,-0.0l0.3,-0.3l0.0,-1.15l4.05,0.02l-0.02,1.74l-0.2,2.89l0.3,0.32l0.67,-0.0l0.75,0.42l0.4,-0.11l-0.62,0.53l-1.17,0.7l-0.13,0.16l-0.18,0.49l0.0,0.21l0.14,0.34l-0.35,0.44l-0.49,0.13l-0.2,0.41l0.03,0.06l-0.27,0.16l-0.86,0.64l-0.12,0.22ZM199.35,245.38l0.07,-0.13l0.05,0.02l-0.13,0.11Z", "name": "Guatemala"}, "GR": {"path": "M487.2,174.55l-0.64,1.54l-0.43,0.24l-1.41,-0.08l-1.28,-0.28l-0.14,0.0l-3.03,0.77l-0.13,0.51l1.39,1.34l-0.78,0.29l-1.2,0.0l-1.23,-1.42l-0.47,0.02l-0.47,0.65l-0.04,0.27l0.56,1.76l0.06,0.11l1.02,1.12l-0.66,0.45l-0.04,0.46l1.39,1.35l1.15,0.79l0.02,1.06l-1.91,-0.63l-0.36,0.42l0.56,1.12l-1.2,0.23l-0.22,0.4l0.8,2.14l-1.15,0.02l-1.89,-1.15l-0.89,-2.19l-0.43,-1.91l-0.05,-0.11l-0.98,-1.35l-1.24,-1.62l-0.13,-0.63l1.07,-1.32l0.06,-0.14l0.13,-0.81l0.68,-0.36l0.16,-0.25l0.03,-0.54l1.4,-0.23l0.12,-0.05l0.87,-0.6l1.26,0.05l0.25,-0.11l0.34,-0.43l0.33,-0.07l1.81,0.08l0.13,-0.02l1.87,-0.77l1.64,0.97l0.19,0.04l2.28,-0.28l0.26,-0.29l0.02,-0.95l0.56,0.36ZM480.44,192.0l1.05,0.74l0.01,0.0l-1.26,-0.23l0.2,-0.51ZM481.76,192.79l1.86,-0.15l1.53,0.17l-0.02,0.19l0.34,0.3l-2.28,0.15l0.01,-0.13l-0.25,-0.31l-1.19,-0.22ZM485.65,193.28l0.65,-0.16l-0.05,0.12l-0.6,0.04Z", "name": "Greece"}, "GQ": {"path": "M444.81,282.04l-0.21,-0.17l0.74,-2.4l3.56,0.05l0.02,2.42l-3.34,-0.02l-0.76,0.13Z", "name": "Equatorial Guinea"}, "GY": {"path": "M271.34,264.25l1.43,0.81l1.44,1.53l0.06,1.19l0.28,0.28l0.84,0.05l2.13,1.92l-0.34,1.93l-1.37,0.59l-0.17,0.34l0.12,0.51l-0.43,1.21l0.03,0.26l1.11,1.82l0.26,0.14l0.56,0.0l0.32,1.29l1.25,1.78l-0.08,0.01l-1.34,-0.21l-0.24,0.06l-0.78,0.64l-1.06,0.41l-0.76,0.1l-0.22,0.15l-0.18,0.32l-0.95,-0.1l-1.38,-1.05l-0.19,-1.13l-0.6,-1.18l0.37,-1.96l0.65,-0.83l0.03,-0.32l-0.57,-1.17l-0.15,-0.14l-0.62,-0.27l0.25,-0.85l-0.08,-0.3l-0.58,-0.58l-0.24,-0.09l-1.15,0.1l-1.41,-1.58l0.48,-0.49l0.09,-0.22l-0.04,-0.92l1.31,-0.34l0.73,-0.52l0.04,-0.44l-0.75,-0.82l0.16,-0.66l1.74,-1.3Z", "name": "Guyana"}, "GE": {"path": "M525.41,174.19l0.26,-0.88l-0.0,-0.17l-0.63,-2.06l-0.1,-0.15l-1.45,-1.12l-0.11,-0.05l-1.31,-0.33l-0.66,-0.69l1.97,0.48l3.65,0.49l3.3,1.41l0.39,0.5l0.33,0.1l1.43,-0.45l2.14,0.58l0.7,1.14l0.13,0.12l1.06,0.47l-0.18,0.11l-0.08,0.43l1.08,1.41l-0.06,0.06l-1.16,-0.15l-1.82,-0.84l-0.31,0.04l-0.55,0.44l-3.29,0.44l-2.32,-1.41l-0.17,-0.04l-2.25,0.12Z", "name": "Georgia"}, "GB": {"path": "M412.82,118.6l-2.31,3.4l-0.0,0.33l0.31,0.13l2.52,-0.49l2.34,0.02l-0.56,2.51l-2.22,3.13l0.22,0.47l2.43,0.21l2.35,4.35l0.17,0.14l1.58,0.51l1.49,3.78l0.73,1.37l0.2,0.15l2.76,0.59l-0.25,1.75l-1.18,0.91l-0.08,0.39l0.87,1.49l-1.96,1.51l-3.31,-0.02l-4.15,0.88l-1.07,-0.59l-0.35,0.04l-1.55,1.44l-2.17,-0.35l-0.22,0.05l-1.61,1.15l-0.78,-0.38l3.31,-3.12l2.18,-0.7l0.21,-0.31l-0.26,-0.27l-3.78,-0.54l-0.48,-0.9l2.3,-0.92l0.13,-0.46l-1.29,-1.71l0.39,-1.83l3.46,0.29l0.32,-0.24l0.37,-1.99l-0.06,-0.24l-1.71,-2.17l-0.18,-0.11l-2.91,-0.58l-0.43,-0.68l0.82,-1.4l-0.03,-0.35l-0.82,-0.97l-0.46,0.01l-0.85,1.05l-0.11,-2.6l-0.05,-0.16l-1.19,-1.7l0.86,-3.53l1.81,-2.75l1.88,0.26l2.38,-0.24ZM406.39,132.84l-1.09,1.92l-1.65,-0.62l-1.26,0.02l0.41,-1.46l0.0,-0.16l-0.42,-1.51l1.62,-0.11l2.39,1.92Z", "name": "United Kingdom"}, "GA": {"path": "M448.76,294.47l-2.38,-2.34l-1.63,-2.04l-1.46,-2.48l0.06,-0.66l0.54,-0.81l0.61,-1.82l0.46,-1.69l0.63,-0.11l3.62,0.03l0.3,-0.3l-0.02,-2.75l0.88,-0.12l1.47,0.32l0.13,0.0l1.39,-0.3l-0.13,0.87l0.03,0.19l0.7,1.29l0.3,0.16l1.74,-0.19l0.36,0.29l-1.01,2.7l0.05,0.29l1.13,1.42l0.25,1.82l-0.3,1.56l-0.64,0.99l-1.93,-0.09l-1.26,-1.13l-0.5,0.17l-0.16,0.91l-1.48,0.27l-0.12,0.05l-0.86,0.63l-0.08,0.39l0.81,1.42l-1.48,1.08Z", "name": "Gabon"}, "GN": {"path": "M399.83,265.31l-0.69,-0.06l-0.3,0.16l-0.43,0.85l-0.39,-0.01l-0.3,-0.33l0.14,-0.87l-0.05,-0.22l-1.05,-1.54l-0.37,-0.11l-0.61,0.27l-0.84,0.12l0.02,-0.54l-0.04,-0.17l-0.35,-0.57l0.07,-0.63l-0.03,-0.17l-0.57,-1.11l-0.7,-0.9l-0.24,-0.12l-2.0,-0.0l-0.19,0.07l-0.51,0.42l-0.6,0.05l-0.21,0.11l-0.43,0.55l-0.3,0.7l-1.04,0.86l-0.91,-1.24l-1.0,-1.02l-0.69,-0.37l-0.52,-0.42l-0.3,-1.11l-0.37,-0.56l-0.1,-0.1l-0.4,-0.23l0.77,-0.85l0.62,0.04l0.18,-0.05l0.58,-0.38l0.46,-0.0l0.19,-0.07l0.39,-0.34l0.1,-0.3l-0.17,-0.67l0.15,-0.14l0.09,-0.2l0.03,-0.57l0.87,0.02l1.76,0.6l0.13,0.01l0.55,-0.06l0.22,-0.13l0.08,-0.12l1.18,0.17l0.17,-0.02l0.09,0.56l0.3,0.25l0.4,-0.0l0.14,-0.03l0.56,-0.29l0.23,0.05l0.63,0.59l0.15,0.07l1.07,0.2l0.24,-0.06l0.65,-0.52l0.77,-0.32l0.55,-0.32l0.3,0.04l0.44,0.45l0.34,0.74l0.84,0.87l-0.35,0.45l-0.06,0.15l-0.1,0.82l0.42,0.31l0.35,-0.16l0.05,0.04l-0.1,0.59l0.09,0.27l0.42,0.4l-0.06,0.02l-0.18,0.21l-0.2,0.86l0.03,0.21l0.56,1.02l0.52,1.71l-0.65,0.21l-0.15,0.12l-0.24,0.35l-0.03,0.28l0.16,0.41l-0.1,0.76l-0.12,0.0Z", "name": "Guinea"}, "GM": {"path": "M379.18,251.48l0.15,-0.55l2.51,-0.07l0.21,-0.09l0.48,-0.52l0.58,-0.03l0.91,0.58l0.16,0.05l0.78,0.01l0.14,-0.03l0.59,-0.31l0.16,0.24l-0.71,0.38l-0.94,-0.04l-1.02,-0.51l-0.3,0.01l-0.86,0.55l-0.37,0.02l-0.14,0.04l-0.53,0.31l-1.81,-0.04Z", "name": "Gambia"}, "GL": {"path": "M304.13,6.6l8.19,-3.63l8.72,0.28l0.19,-0.06l3.12,-2.28l8.75,-0.61l19.94,0.8l14.93,4.75l-3.92,2.01l-9.52,0.27l-13.48,0.6l-0.27,0.2l0.09,0.33l1.26,1.09l0.22,0.07l8.81,-0.67l7.49,2.07l0.19,-0.01l4.68,-1.78l1.76,1.84l-2.59,3.26l-0.01,0.36l0.34,0.11l6.35,-2.2l12.09,-2.32l7.31,1.14l1.17,2.13l-9.9,4.05l-1.43,1.32l-7.91,0.98l-0.26,0.31l0.29,0.29l5.25,0.25l-2.63,3.72l-2.02,3.61l-0.04,0.15l0.08,6.05l0.07,0.19l2.61,3.0l-3.4,0.2l-4.12,1.66l-0.04,0.54l4.5,2.67l0.53,3.9l-2.39,0.42l-0.19,0.48l2.91,3.83l-5.0,0.32l-0.27,0.22l0.12,0.33l2.69,1.84l-0.65,1.35l-3.36,0.71l-3.46,0.01l-0.21,0.51l3.05,3.15l0.02,1.53l-4.54,-1.79l-0.32,0.06l-1.29,1.26l0.11,0.5l3.33,1.15l3.17,2.74l0.85,3.29l-4.0,0.78l-1.83,-1.66l-3.1,-2.64l-0.36,-0.02l-0.13,0.33l0.8,2.92l-2.76,2.26l-0.09,0.33l0.28,0.2l6.59,0.19l2.47,0.18l-5.86,3.38l-6.76,3.43l-7.26,1.48l-2.73,0.02l-0.16,0.05l-2.67,1.72l-3.44,4.42l-5.28,2.86l-1.73,0.18l-3.33,1.01l-3.59,0.96l-0.15,0.1l-2.15,2.52l-0.07,0.19l-0.03,2.76l-1.21,2.49l-4.03,3.1l-0.1,0.33l0.98,2.94l-2.31,6.57l-3.21,0.21l-3.6,-3.0l-0.19,-0.07l-4.9,-0.02l-2.29,-1.97l-1.69,-3.78l-4.31,-4.86l-1.23,-2.52l-0.34,-3.58l-0.08,-0.17l-3.35,-3.67l0.85,-2.92l-0.09,-0.31l-1.5,-1.34l2.33,-4.7l3.67,-1.57l0.15,-0.13l1.02,-1.93l0.52,-3.47l-0.44,-0.31l-2.85,1.57l-1.33,0.64l-2.12,0.59l-2.81,-1.32l-0.15,-2.79l0.88,-2.17l2.09,-0.06l5.07,1.2l0.34,-0.17l-0.11,-0.37l-4.3,-2.9l-2.24,-1.58l-0.25,-0.05l-2.38,0.62l-1.7,-0.93l2.62,-4.1l-0.03,-0.36l-1.51,-1.75l-1.97,-3.3l-3.01,-5.21l-0.1,-0.11l-3.04,-1.85l0.03,-1.94l-0.18,-0.28l-6.82,-3.01l-5.35,-0.38l-6.69,0.21l-6.03,0.37l-2.81,-1.59l-3.84,-2.9l5.94,-1.5l5.01,-0.28l0.28,-0.29l-0.26,-0.31l-10.68,-1.38l-5.38,-2.1l0.27,-1.68l9.3,-2.6l9.18,-2.68l0.19,-0.16l0.97,-2.05l-0.18,-0.42l-6.29,-1.91l1.81,-1.9l8.58,-4.05l3.6,-0.63l0.23,-0.4l-0.92,-2.37l5.59,-1.5l7.66,-0.95l7.58,-0.05l2.65,1.84l0.31,0.02l6.52,-3.29l5.85,2.24l3.55,0.49l5.17,1.95l0.38,-0.16l-0.13,-0.39l-5.77,-3.16l0.29,-2.26Z", "name": "Greenland"}, "KW": {"path": "M540.87,207.81l0.41,0.94l-0.18,0.51l0.0,0.21l0.65,1.66l-1.15,0.05l-0.54,-1.12l-0.24,-0.17l-1.73,-0.2l1.44,-2.06l1.33,0.18Z", "name": "Kuwait"}, "GH": {"path": "M423.16,269.88l-3.58,1.34l-1.41,0.87l-2.13,0.69l-1.91,-0.61l0.09,-0.75l-0.03,-0.17l-1.04,-2.07l0.62,-2.7l1.04,-2.08l0.03,-0.19l-1.0,-5.46l0.05,-1.12l4.04,-0.11l1.08,0.18l0.18,-0.03l0.72,-0.36l0.75,0.13l-0.11,0.48l0.06,0.26l0.98,1.22l-0.0,1.77l0.24,1.99l0.05,0.13l0.55,0.81l-0.52,2.14l0.19,1.37l0.69,1.66l0.38,0.62Z", "name": "Ghana"}, "OM": {"path": "M568.16,231.0l-0.08,0.1l-0.84,1.61l-0.93,-0.11l-0.27,0.11l-0.58,0.73l-0.4,1.32l-0.01,0.14l0.29,1.61l-0.07,0.09l-1.0,-0.01l-0.16,0.04l-1.56,0.97l-0.14,0.2l-0.23,1.17l-0.41,0.4l-1.44,-0.02l-0.17,0.05l-0.98,0.65l-0.13,0.25l0.01,0.87l-0.97,0.57l-1.27,-0.22l-0.19,0.03l-1.63,0.84l-0.88,0.11l-2.55,-5.57l7.2,-2.49l0.19,-0.19l1.67,-5.23l-0.03,-0.25l-1.1,-1.78l0.05,-0.89l0.68,-1.03l0.05,-0.16l0.01,-0.89l0.96,-0.44l0.07,-0.5l-0.32,-0.26l0.16,-1.31l0.85,-0.01l1.03,1.67l0.09,0.09l1.4,0.96l0.11,0.05l1.82,0.34l1.37,0.45l1.75,2.32l0.13,0.1l0.7,0.26l-0.0,0.3l-1.25,2.19l-1.01,0.8ZM561.88,218.47l-0.01,0.02l-0.15,-0.29l0.3,-0.38l-0.14,0.65Z", "name": "Oman"}, "_3": {"path": "M543.2,261.06l-1.07,1.46l-1.65,1.99l-1.91,0.01l-8.08,-2.95l-0.89,-0.84l-0.9,-1.19l-0.81,-1.23l0.44,-0.73l0.76,-1.12l0.49,0.28l0.52,1.05l1.13,1.06l0.2,0.08l1.24,0.01l2.42,-0.65l2.77,-0.31l2.17,-0.78l1.31,-0.19l0.84,-0.43l1.03,-0.06l-0.01,4.54Z", "name": "Somaliland"}, "_2": {"path": "M384.23,230.37l0.07,-0.06l0.28,-0.89l0.99,-1.13l0.07,-0.13l0.8,-3.54l3.4,-2.8l0.09,-0.13l0.76,-2.17l0.07,5.5l-2.07,0.21l-0.24,0.17l-0.61,1.36l-0.02,0.16l0.43,3.46l-4.01,-0.01ZM391.82,218.2l0.07,-0.06l0.75,-1.93l1.86,-0.25l0.94,0.34l1.14,0.0l0.18,-0.06l0.73,-0.56l1.41,-0.08l-0.0,2.72l-7.08,-0.12Z", "name": "Western Sahara"}, "_1": {"path": "M472.71,172.84l-0.07,-0.43l-0.16,-0.22l-0.53,-0.27l-0.38,-0.58l0.3,-0.43l0.51,-0.19l0.18,-0.18l0.3,-0.87l0.12,-0.04l0.22,0.26l0.12,0.09l0.38,0.15l0.28,0.41l0.15,0.12l0.34,0.12l0.43,0.5l0.15,0.07l-0.12,0.3l-0.27,0.32l-0.03,0.18l-0.31,0.06l-1.48,0.47l-0.15,0.17Z", "name": "Kosovo"}, "_0": {"path": "M503.54,192.92l0.09,-0.17l0.41,0.01l-0.08,0.01l-0.42,0.15ZM504.23,192.76l1.02,0.02l0.4,-0.13l-0.09,0.29l0.03,0.08l-0.35,0.16l-0.24,-0.04l-0.06,-0.1l-0.18,-0.17l-0.19,-0.08l-0.33,-0.02Z", "name": "Northern Cyprus"}, "JO": {"path": "M510.26,200.93l0.28,-0.57l2.53,1.0l0.27,-0.02l4.57,-2.77l0.84,2.84l-0.28,0.25l-4.95,1.37l-0.14,0.49l2.24,2.48l-0.5,0.28l-0.13,0.14l-0.35,0.78l-1.76,0.35l-0.2,0.14l-0.57,0.94l-0.94,0.73l-2.45,-0.38l-0.03,-0.12l1.23,-4.32l-0.04,-1.1l0.34,-0.75l0.03,-0.12l0.0,-1.63Z", "name": "Jordan"}, "HR": {"path": "M455.49,162.73l1.53,0.09l0.24,-0.1l0.29,-0.34l0.64,0.38l0.14,0.04l0.98,0.06l0.32,-0.3l-0.01,-0.66l0.67,-0.25l0.19,-0.22l0.21,-1.11l1.72,-0.72l0.65,0.32l1.94,1.37l2.07,0.6l0.22,-0.02l0.67,-0.33l0.47,0.94l0.67,0.76l-0.63,0.77l-0.91,-0.55l-0.16,-0.04l-1.69,0.04l-2.2,-0.51l-1.17,0.07l-0.21,0.11l-0.36,0.42l-0.67,-0.53l-0.46,0.12l-0.52,1.29l0.05,0.31l1.21,1.42l0.58,0.99l1.15,1.14l0.95,0.68l0.92,1.23l0.1,0.09l1.75,0.91l-1.87,-0.89l-1.5,-1.11l-2.23,-0.88l-1.77,-1.9l0.12,-0.06l0.1,-0.47l-1.07,-1.22l-0.04,-0.94l-0.21,-0.27l-1.61,-0.49l-0.35,0.14l-0.53,0.93l-0.41,-0.57l0.04,-0.73Z", "name": "Croatia"}, "HT": {"path": "M237.82,234.68l1.35,0.1l1.95,0.37l0.18,1.15l-0.16,0.83l-0.51,0.37l-0.06,0.44l0.57,0.68l-0.02,0.22l-1.31,-0.35l-1.26,0.17l-1.49,-0.18l-0.15,0.02l-1.03,0.43l-1.02,-0.61l0.09,-0.36l2.04,0.32l1.9,0.21l0.19,-0.05l0.9,-0.58l0.05,-0.47l-1.05,-1.03l0.02,-0.86l-0.23,-0.3l-1.13,-0.29l0.18,-0.23Z", "name": "Haiti"}, "HU": {"path": "M461.96,157.92l0.68,-1.66l-0.03,-0.29l-0.15,-0.22l0.84,-0.0l0.3,-0.26l0.12,-0.84l0.88,0.57l0.98,0.38l0.16,0.01l2.1,-0.39l0.23,-0.21l0.14,-0.45l0.88,-0.1l1.06,-0.43l0.13,0.1l0.28,0.04l1.18,-0.4l0.14,-0.1l0.52,-0.67l0.63,-0.15l2.6,0.95l0.26,-0.03l0.38,-0.23l1.12,0.7l0.1,0.49l-1.31,0.57l-0.14,0.13l-1.18,2.14l-1.44,2.04l-1.85,0.55l-1.51,-0.13l-0.14,0.02l-1.92,0.82l-0.85,0.42l-1.91,-0.55l-1.83,-1.31l-0.74,-0.37l-0.44,-0.97l-0.26,-0.18Z", "name": "Hungary"}, "HN": {"path": "M202.48,251.87l-0.33,-0.62l-0.18,-0.14l-0.5,-0.15l0.13,-0.76l-0.11,-0.28l-0.34,-0.28l-0.6,-0.23l-0.18,-0.01l-0.81,0.22l-0.16,-0.24l-0.72,-0.39l-0.51,-0.48l-0.12,-0.07l-0.31,-0.09l0.24,-0.3l0.04,-0.3l-0.16,-0.4l0.1,-0.28l1.14,-0.69l1.0,-0.86l0.09,0.04l0.3,-0.05l0.47,-0.39l0.49,-0.03l0.14,0.13l0.29,0.06l0.31,-0.1l1.16,0.22l1.24,-0.08l0.81,-0.28l0.29,-0.25l0.63,0.1l0.69,0.18l0.65,-0.06l0.49,-0.2l1.04,0.32l0.38,0.06l0.7,0.44l0.71,0.56l0.92,0.41l0.1,0.11l-0.11,-0.01l-0.23,0.09l-0.3,0.3l-0.76,0.29l-0.58,0.0l-0.15,0.04l-0.45,0.26l-0.31,-0.07l-0.37,-0.34l-0.28,-0.07l-0.26,0.07l-0.18,0.15l-0.23,0.43l-0.04,-0.0l-0.33,0.28l-0.03,0.4l-0.76,0.61l-0.45,0.3l-0.15,0.16l-0.51,-0.36l-0.41,0.06l-0.45,0.56l-0.41,-0.01l-0.59,0.06l-0.27,0.31l0.04,0.96l-0.07,0.0l-0.25,0.16l-0.24,0.45l-0.42,0.06Z", "name": "Honduras"}, "PR": {"path": "M254.95,238.31l1.15,0.21l0.2,0.23l-0.36,0.36l-1.76,-0.01l-1.2,0.07l-0.09,-0.69l0.17,-0.18l1.89,0.01Z", "name": "Puerto Rico"}, "PS": {"path": "M509.66,201.06l-0.0,1.44l-0.29,0.63l-0.59,0.19l0.02,-0.11l0.52,-0.31l-0.02,-0.53l-0.41,-0.2l0.36,-1.28l0.41,0.17Z", "name": "West Bank"}, "PT": {"path": "M398.65,173.6l0.75,-0.63l0.7,-0.3l0.51,1.2l0.28,0.18l1.48,-0.0l0.2,-0.08l0.33,-0.3l1.16,0.08l0.52,1.11l-0.95,0.66l-0.13,0.24l-0.03,2.2l-0.33,0.35l-0.08,0.18l-0.08,1.17l-0.86,0.19l-0.2,0.44l0.93,1.64l-0.64,1.79l0.07,0.31l0.72,0.72l-0.24,0.56l-0.9,1.05l-0.07,0.26l0.17,0.77l-0.73,0.54l-1.18,-0.36l-0.16,-0.0l-0.85,0.21l0.31,-1.81l-0.23,-1.87l-0.23,-0.25l-0.99,-0.24l-0.49,-0.91l0.18,-1.72l0.93,-0.99l0.08,-0.16l0.17,-1.17l0.52,-1.76l-0.04,-1.36l-0.51,-1.14l-0.09,-0.8Z", "name": "Portugal"}, "PY": {"path": "M264.33,341.43l0.93,-2.96l0.07,-1.42l1.1,-2.1l4.19,-0.73l2.22,0.04l2.12,1.21l0.07,0.76l0.7,1.38l-0.16,3.48l0.24,0.31l2.64,0.5l0.19,-0.03l0.9,-0.45l1.47,0.62l0.38,0.64l0.23,2.35l0.3,1.07l0.25,0.21l0.93,0.12l0.16,-0.02l0.8,-0.37l0.61,0.33l-0.0,1.25l-0.33,1.53l-0.5,1.57l-0.39,2.26l-2.14,1.94l-1.85,0.4l-2.74,-0.4l-2.13,-0.62l2.26,-3.75l0.03,-0.24l-0.36,-1.18l-0.17,-0.19l-2.55,-1.03l-3.04,-1.95l-2.07,-0.43l-4.4,-4.12Z", "name": "Paraguay"}, "PA": {"path": "M213.65,263.79l0.18,-0.43l0.02,-0.18l-0.06,-0.28l0.23,-0.18l-0.01,-0.48l-0.4,-0.29l-0.01,-0.62l0.57,-0.13l0.68,0.69l-0.04,0.39l0.26,0.33l1.0,0.11l0.27,-0.1l0.49,0.44l0.24,0.07l1.34,-0.22l1.04,-0.62l1.49,-0.5l0.86,-0.73l0.99,0.11l0.18,0.28l1.35,0.08l1.02,0.4l0.78,0.72l0.71,0.53l-0.1,0.12l-0.05,0.3l0.53,1.34l-0.28,0.44l-0.6,-0.13l-0.36,0.22l-0.2,0.76l-0.41,-0.36l-0.44,-1.12l0.49,-0.53l-0.14,-0.49l-0.51,-0.14l-0.41,-0.72l-0.11,-0.11l-1.25,-0.7l-0.19,-0.04l-1.1,0.16l-0.22,0.15l-0.47,0.81l-0.9,0.56l-0.49,0.08l-0.22,0.17l-0.25,0.52l0.05,0.32l0.93,1.07l-0.41,0.21l-0.29,0.3l-0.81,0.09l-0.36,-1.26l-0.53,-0.1l-0.21,0.28l-0.5,-0.09l-0.44,-0.88l-0.22,-0.16l-0.99,-0.16l-0.61,-0.28l-0.13,-0.03l-1.0,0.0Z", "name": "Panama"}, "PG": {"path": "M808.4,298.6l0.62,0.46l1.19,1.56l1.04,0.77l-0.18,0.37l-0.42,0.15l-0.92,-0.82l-1.05,-1.53l-0.27,-0.96ZM804.09,296.06l-0.3,0.26l-0.36,-1.11l-0.66,-1.06l-2.55,-1.89l-1.42,-0.59l0.17,-0.15l1.16,0.6l0.85,0.55l1.01,0.58l0.97,1.02l0.9,0.76l0.24,1.03ZM796.71,297.99l0.15,0.82l0.34,0.24l1.43,-0.19l0.19,-0.11l0.68,-0.82l1.36,-0.87l0.13,-0.31l-0.21,-1.13l1.04,-0.03l0.3,0.25l-0.04,1.17l-0.74,1.34l-1.17,0.18l-0.22,0.15l-0.35,0.62l-2.51,1.13l-1.21,-0.0l-1.99,-0.71l-1.19,-0.58l0.07,-0.28l1.98,0.32l1.46,-0.2l0.24,-0.21l0.25,-0.79ZM789.24,303.52l0.11,0.15l2.19,1.62l1.6,2.62l0.27,0.14l1.09,-0.06l-0.07,0.77l0.23,0.32l1.23,0.27l-0.14,0.09l0.05,0.53l2.39,0.95l-0.11,0.28l-1.33,0.14l-0.51,-0.55l-0.18,-0.09l-4.59,-0.65l-1.87,-1.55l-1.38,-1.35l-1.28,-2.17l-0.16,-0.13l-3.27,-1.1l-0.19,0.0l-2.12,0.72l-1.58,0.85l-0.15,0.31l0.28,1.63l-1.65,0.73l-1.37,-0.4l-2.3,-0.09l-0.08,-15.65l3.95,1.57l4.58,1.42l1.67,1.25l1.32,1.19l0.36,1.39l0.19,0.21l4.06,1.51l0.39,0.85l-1.9,0.22l-0.25,0.39l0.55,1.68Z", "name": "Papua New Guinea"}, "PE": {"path": "M246.44,329.21l-0.63,1.25l-1.05,0.54l-2.25,-1.33l-0.19,-0.93l-0.16,-0.21l-4.95,-2.58l-4.46,-2.79l-1.87,-1.52l-0.94,-1.91l0.33,-0.6l-0.01,-0.31l-2.11,-3.33l-2.46,-4.66l-2.36,-5.02l-1.04,-1.18l-0.77,-1.81l-0.08,-0.11l-1.95,-1.64l-1.54,-0.88l0.61,-0.85l0.02,-0.31l-1.15,-2.27l0.69,-1.56l1.59,-1.26l0.12,0.42l-0.56,0.47l-0.11,0.25l0.07,0.92l0.36,0.27l0.97,-0.19l0.85,0.23l0.99,1.19l0.41,0.05l1.42,-1.03l0.11,-0.16l0.46,-1.64l1.45,-2.06l2.92,-0.96l0.11,-0.07l2.73,-2.62l0.84,-1.72l0.02,-0.18l-0.3,-1.65l0.28,-0.1l1.49,1.06l0.77,1.14l0.1,0.09l1.08,0.6l1.43,2.55l0.21,0.15l1.86,0.31l0.18,-0.03l1.25,-0.6l0.77,0.37l0.17,0.03l1.4,-0.2l1.57,0.96l-1.45,2.29l0.23,0.46l0.63,0.05l0.66,0.7l-1.51,-0.08l-0.24,0.1l-0.27,0.31l-1.96,0.46l-2.95,1.74l-0.14,0.21l-0.17,1.1l-0.6,0.82l-0.05,0.23l0.21,1.13l-1.31,0.63l-0.17,0.27l0.0,0.91l-0.53,0.37l-0.1,0.37l1.04,2.27l1.31,1.46l-0.44,0.9l0.24,0.43l1.52,0.13l0.87,1.23l0.24,0.13l2.21,0.07l0.18,-0.06l1.55,-1.13l-0.14,3.22l0.23,0.3l1.14,0.29l0.16,-0.0l1.18,-0.36l1.97,3.71l-0.45,0.71l-0.04,0.14l-0.12,1.8l-0.05,2.07l-0.92,1.2l-0.03,0.31l0.38,0.8l-0.48,0.72l-0.02,0.3l1.01,2.02l-1.5,2.64Z", "name": "Peru"}, "PK": {"path": "M609.08,187.76l1.66,1.21l0.71,2.11l0.2,0.19l3.62,1.01l-1.98,1.95l-2.65,0.4l-3.75,-0.68l-0.26,0.08l-1.23,1.22l-0.07,0.31l0.89,2.46l0.88,1.92l0.1,0.12l1.67,1.14l-1.8,1.35l-0.12,0.25l0.04,1.85l-2.35,2.67l-1.59,2.79l-2.5,2.72l-2.76,-0.2l-0.24,0.09l-2.76,2.83l0.04,0.45l1.54,1.13l0.27,1.94l0.09,0.17l1.34,1.29l0.4,1.83l-5.14,-0.01l-0.22,0.09l-1.53,1.63l-1.52,-0.56l-0.76,-1.88l-1.93,-2.03l-0.25,-0.09l-4.6,0.5l-4.05,0.05l-3.1,0.33l0.77,-2.53l3.48,-1.33l0.19,-0.33l-0.21,-1.24l-0.19,-0.23l-1.01,-0.37l-0.06,-2.18l-0.17,-0.26l-2.32,-1.16l-0.96,-1.57l-0.56,-0.65l3.16,1.05l0.14,0.01l2.45,-0.4l1.44,0.33l0.3,-0.1l0.4,-0.47l1.58,0.22l0.14,-0.01l3.25,-1.14l0.2,-0.27l0.08,-2.23l1.23,-1.38l1.73,0.0l0.28,-0.2l0.22,-0.61l1.68,-0.32l0.86,0.24l0.27,-0.05l0.98,-0.78l0.11,-0.26l-0.13,-1.57l0.96,-1.52l1.51,-0.67l0.14,-0.41l-0.74,-1.4l1.86,0.07l0.26,-0.13l0.69,-1.01l0.05,-0.2l-0.09,-0.94l1.14,-1.09l0.09,-0.28l-0.29,-1.41l-0.51,-1.07l1.23,-1.05l2.6,-0.58l2.86,-0.33l1.33,-0.54l1.3,-0.29Z", "name": "Pakistan"}, "PH": {"path": "M737.11,263.82l0.25,1.66l0.14,1.34l-0.54,1.46l-0.64,-1.79l-0.5,-0.1l-1.17,1.28l-0.05,0.32l0.74,1.71l-0.49,0.81l-2.6,-1.28l-0.61,-1.57l0.68,-1.07l-0.07,-0.4l-1.59,-1.19l-0.42,0.06l-0.69,0.91l-1.01,-0.08l-0.21,0.06l-1.58,1.2l-0.17,-0.3l0.87,-1.88l1.48,-0.66l1.18,-0.81l0.71,0.92l0.34,0.1l1.9,-0.69l0.18,-0.18l0.34,-0.94l1.57,-0.06l0.29,-0.32l-0.1,-1.38l1.41,0.83l0.36,2.06ZM734.94,254.42l0.56,2.24l-1.41,-0.49l-0.4,0.3l0.07,0.94l0.51,1.3l-0.54,0.26l-0.08,-1.34l-0.25,-0.28l-0.56,-0.1l-0.23,-0.91l1.03,0.14l0.34,-0.31l-0.03,-0.96l-0.06,-0.18l-1.14,-1.44l1.62,0.04l0.57,0.78ZM724.68,238.33l1.48,0.71l0.33,-0.04l0.44,-0.38l0.05,0.13l-0.37,0.97l0.01,0.23l0.81,1.75l-0.59,1.92l-1.37,0.79l-0.14,0.2l-0.39,2.07l0.01,0.14l0.56,2.04l0.23,0.21l1.33,0.28l0.14,-0.0l1.0,-0.27l2.82,1.28l-0.2,1.16l0.12,0.29l0.66,0.5l-0.13,0.56l-1.54,-0.99l-0.89,-1.29l-0.49,0.0l-0.44,0.65l-1.34,-1.28l-0.26,-0.08l-2.18,0.36l-0.96,-0.44l0.09,-0.72l0.69,-0.57l-0.01,-0.47l-0.75,-0.59l-0.47,0.14l-0.15,0.43l-0.86,-1.02l-0.34,-1.02l-0.07,-1.74l0.49,0.41l0.49,-0.21l0.26,-3.99l0.73,-2.1l1.23,0.0ZM731.12,258.92l-0.82,0.75l-0.83,1.64l-0.52,0.5l-1.17,-1.33l0.36,-0.47l0.62,-0.7l0.07,-0.15l0.24,-1.35l0.73,-0.08l-0.31,1.29l0.16,0.34l0.37,-0.09l1.21,-1.6l-0.12,1.24ZM726.66,255.58l0.85,0.45l0.14,0.03l1.28,-0.0l-0.03,0.62l-1.04,0.96l-1.15,0.55l-0.05,-0.71l0.17,-1.26l-0.01,-0.13l-0.16,-0.51ZM724.92,252.06l-0.45,1.5l-0.7,-0.83l-0.95,-1.43l1.44,0.06l0.67,0.7ZM717.48,261.28l-1.87,1.35l0.21,-0.3l1.81,-1.57l1.5,-1.75l0.97,-1.84l0.23,1.08l-1.56,1.33l-1.29,1.7Z", "name": "Philippines"}, "PL": {"path": "M458.8,144.25l-0.96,-1.98l0.18,-1.06l-0.01,-0.15l-0.62,-1.8l-0.82,-1.11l0.56,-0.73l0.05,-0.28l-0.51,-1.51l1.48,-0.87l3.88,-1.58l3.06,-1.14l2.23,0.52l0.15,0.66l0.29,0.23l2.4,0.04l3.11,0.39l4.56,-0.05l1.12,0.32l0.51,0.89l0.1,1.45l0.03,0.12l0.66,1.23l-0.01,1.08l-1.33,0.61l-0.14,0.41l0.74,1.5l0.07,1.53l1.22,2.79l-0.19,0.66l-1.09,0.33l-0.14,0.09l-2.27,2.72l-0.04,0.31l0.35,0.8l-2.22,-1.16l-0.21,-0.02l-1.72,0.44l-1.1,-0.31l-0.21,0.02l-1.3,0.61l-1.11,-1.02l-0.32,-0.05l-0.81,0.35l-1.15,-1.61l-0.21,-0.12l-1.65,-0.17l-0.19,-0.82l-0.23,-0.23l-1.72,-0.37l-0.34,0.17l-0.25,0.56l-0.88,-0.44l0.12,-0.69l-0.25,-0.35l-1.78,-0.27l-1.08,-0.97Z", "name": "Poland"}, "ZM": {"path": "M502.81,308.32l1.09,1.04l0.58,1.94l-0.39,0.66l-0.5,2.05l-0.0,0.14l0.45,1.95l-0.69,0.77l-0.06,0.11l-0.76,2.37l0.15,0.36l0.62,0.31l-6.85,1.9l-0.22,0.33l0.2,1.54l-1.62,0.3l-0.12,0.05l-1.43,1.02l-0.11,0.15l-0.25,0.73l-0.73,0.17l-0.14,0.08l-2.18,2.12l-1.33,1.6l-0.65,0.05l-0.83,-0.29l-2.75,-0.28l-0.24,-0.1l-0.15,-0.27l-0.99,-0.58l-0.12,-0.04l-1.73,-0.14l-1.88,0.54l-1.5,-1.48l-1.61,-2.01l0.11,-7.73l4.92,0.03l0.29,-0.37l-0.19,-0.79l0.34,-0.86l0.0,-0.21l-0.41,-1.11l0.26,-1.14l-0.01,-0.16l-0.12,-0.36l0.18,0.01l0.1,0.56l0.31,0.25l1.14,-0.06l1.44,0.21l0.76,1.05l0.19,0.12l2.01,0.35l0.19,-0.03l1.24,-0.65l0.44,1.03l0.22,0.18l1.81,0.34l0.85,0.99l1.02,1.39l0.24,0.12l1.92,0.02l0.3,-0.32l-0.21,-2.74l-0.47,-0.23l-0.53,0.36l-1.58,-0.89l-0.51,-0.34l0.29,-2.36l0.44,-2.99l-0.03,-0.18l-0.5,-0.99l0.61,-1.38l0.53,-0.24l3.26,-0.41l0.89,0.23l1.01,0.62l1.04,0.44l1.6,0.43l1.35,0.72Z", "name": "Zambia"}, "EE": {"path": "M482.19,120.88l0.23,-1.68l-0.43,-0.31l-0.75,0.37l-1.34,-1.1l-0.18,-1.75l2.92,-0.95l3.07,-0.53l2.66,0.6l2.48,-0.1l0.18,0.31l-1.65,1.96l-0.06,0.26l0.71,3.25l-0.88,0.94l-1.85,-0.01l-2.08,-1.3l-1.14,-0.47l-0.2,-0.01l-1.69,0.51Z", "name": "Estonia"}, "EG": {"path": "M508.07,208.8l-0.66,1.06l-0.53,2.03l-0.64,1.32l-0.32,0.26l-1.74,-1.85l-1.77,-3.86l-0.48,-0.09l-0.26,0.25l-0.07,0.32l1.04,2.88l1.55,2.76l1.89,4.18l0.94,1.48l0.83,1.54l2.08,2.73l-0.3,0.28l-0.1,0.23l0.08,1.72l0.11,0.22l2.91,2.37l-28.78,0.0l0.0,-19.06l-0.73,-2.2l0.61,-1.59l0.0,-0.2l-0.34,-1.04l0.73,-1.08l3.13,-0.04l2.36,0.72l2.48,0.81l1.15,0.43l0.23,-0.01l1.93,-0.87l1.02,-0.78l2.08,-0.21l1.59,0.31l0.62,1.24l0.52,0.03l0.46,-0.71l1.86,0.59l1.95,0.16l0.17,-0.04l0.92,-0.52l1.48,4.24Z", "name": "Egypt"}, "ZA": {"path": "M467.06,373.27l-0.13,-0.29l0.01,-1.58l-0.02,-0.12l-0.71,-1.64l0.59,-0.37l0.14,-0.26l-0.07,-2.13l-0.05,-0.15l-1.63,-2.58l-1.25,-2.31l-1.71,-3.37l0.88,-0.98l0.7,0.52l0.39,1.08l0.23,0.19l1.1,0.19l1.55,0.51l0.14,0.01l1.35,-0.2l0.11,-0.04l2.24,-1.39l0.14,-0.25l0.0,-9.4l0.16,0.09l1.39,2.38l-0.22,1.53l0.04,0.19l0.56,0.94l0.3,0.14l1.79,-0.27l0.16,-0.08l1.23,-1.18l1.17,-0.79l0.1,-0.12l0.57,-1.19l1.02,-0.52l0.9,0.28l1.16,0.73l0.14,0.05l2.04,0.13l0.13,-0.02l1.6,-0.62l0.18,-0.19l0.63,-1.93l1.18,-0.19l0.19,-0.12l0.78,-1.05l0.81,-1.71l2.18,-1.91l3.44,-1.88l0.89,0.02l1.17,0.43l0.21,-0.0l0.76,-0.29l1.07,0.21l1.15,3.55l0.63,1.82l-0.44,2.9l0.1,0.52l-0.74,-0.29l-0.18,-0.01l-0.72,0.19l-0.21,0.2l-0.22,0.74l-0.66,0.97l-0.05,0.18l0.02,0.93l0.09,0.21l1.49,1.46l0.27,0.08l1.47,-0.29l0.22,-0.18l0.43,-1.01l1.29,0.02l-0.51,1.63l-0.29,2.2l-0.59,1.12l-2.2,1.78l-1.06,1.39l-0.72,1.44l-1.39,1.93l-2.81,2.84l-1.75,1.65l-1.85,1.24l-2.55,1.06l-1.23,0.14l-0.24,0.18l-0.22,0.54l-1.27,-0.35l-0.2,0.01l-1.15,0.5l-2.62,-0.52l-0.12,0.0l-1.46,0.33l-0.98,-0.14l-0.16,0.02l-2.55,1.1l-2.11,0.44l-1.59,1.07l-0.93,0.06l-0.97,-0.92l-0.19,-0.08l-0.72,-0.04l-1.0,-1.16l-0.25,0.05ZM493.72,359.24l-1.12,-0.86l-0.31,-0.03l-1.23,0.59l-1.36,1.07l-1.39,1.78l0.01,0.38l1.88,2.11l0.31,0.09l0.9,-0.27l0.18,-0.15l0.4,-0.77l1.28,-0.39l0.18,-0.16l0.42,-0.88l0.76,-1.32l-0.05,-0.37l-0.87,-0.82Z", "name": "South Africa"}, "EC": {"path": "M220.2,293.48l1.25,-1.76l0.02,-0.31l-0.54,-1.09l-0.5,-0.06l-0.78,0.94l-1.03,-0.75l0.33,-0.46l0.05,-0.23l-0.38,-2.04l0.66,-0.28l0.17,-0.19l0.45,-1.52l0.93,-1.58l0.04,-0.2l-0.13,-0.78l1.19,-0.47l1.57,-0.91l2.35,1.34l0.17,0.04l0.28,-0.02l0.52,0.91l0.21,0.15l2.12,0.35l0.2,-0.03l0.55,-0.31l1.08,0.73l0.97,0.54l0.31,1.67l-0.71,1.49l-2.64,2.54l-2.95,0.97l-0.15,0.11l-1.53,2.18l-0.49,1.68l-1.1,0.8l-0.87,-1.05l-0.15,-0.1l-1.01,-0.27l-0.13,-0.0l-0.7,0.14l-0.03,-0.43l0.6,-0.5l0.1,-0.31l-0.26,-0.91Z", "name": "Ecuador"}, "AL": {"path": "M470.27,171.7l0.38,0.19l0.45,-0.18l0.4,0.61l0.11,0.1l0.46,0.24l0.13,0.87l-0.3,0.95l-0.0,0.17l0.36,1.28l0.12,0.17l0.9,0.63l-0.03,0.44l-0.67,0.35l-0.16,0.22l-0.14,0.88l-0.96,1.18l-0.06,-0.03l-0.04,-0.48l-0.12,-0.22l-1.28,-0.92l-0.19,-1.25l0.2,-1.96l0.33,-0.89l-0.06,-0.3l-0.36,-0.41l-0.13,-0.75l0.66,-0.9Z", "name": "Albania"}, "AO": {"path": "M461.62,299.93l0.55,1.67l0.73,1.54l1.56,2.18l0.28,0.12l1.66,-0.2l0.81,-0.34l1.28,0.33l0.33,-0.14l0.39,-0.67l0.56,-1.3l1.37,-0.09l0.27,-0.21l0.07,-0.23l0.67,-0.01l-0.13,0.53l0.29,0.37l2.74,-0.02l0.04,1.29l0.03,0.13l0.46,0.87l-0.35,1.52l0.18,1.55l0.07,0.16l0.75,0.85l-0.13,2.89l0.41,0.29l0.56,-0.21l1.11,0.05l1.5,-0.37l0.9,0.12l0.18,0.53l-0.27,1.15l0.01,0.17l0.4,1.08l-0.33,0.85l-0.01,0.18l0.12,0.51l-4.83,-0.03l-0.3,0.3l-0.12,8.13l0.07,0.19l1.69,2.1l1.27,1.25l-4.03,0.92l-5.93,-0.36l-1.66,-1.19l-0.18,-0.06l-10.15,0.11l-0.34,0.13l-1.35,-1.05l-0.17,-0.06l-1.62,-0.08l-1.6,0.45l-0.88,0.36l-0.17,-1.2l0.34,-2.19l0.85,-2.32l0.14,-1.13l0.79,-2.24l0.57,-1.0l1.42,-1.64l0.82,-1.15l0.05,-0.13l0.26,-1.88l-0.13,-1.51l-0.07,-0.16l-0.72,-0.87l-1.23,-2.91l0.09,-0.37l0.73,-0.95l0.05,-0.27l-1.27,-4.12l-1.19,-1.54l0.1,-0.2l0.86,-0.28l0.78,0.03l0.83,-0.29l7.12,0.03ZM451.81,298.94l-0.17,0.07l-0.5,-1.42l0.85,-0.92l0.53,-0.29l0.48,0.44l-0.56,0.32l-0.1,0.1l-0.41,0.65l-0.05,0.14l-0.07,0.91Z", "name": "Angola"}, "KZ": {"path": "M598.42,172.08l-1.37,0.54l-3.3,2.09l-0.11,0.12l-1.01,1.97l-0.56,0.01l-0.6,-1.24l-0.26,-0.17l-2.95,-0.09l-0.46,-2.22l-0.29,-0.24l-0.91,-0.02l0.17,-2.72l-0.12,-0.26l-3.0,-2.22l-0.2,-0.06l-4.29,0.24l-2.8,0.42l-2.36,-2.7l-6.4,-3.65l-0.23,-0.03l-6.45,1.83l-0.22,0.29l0.1,10.94l-0.84,0.1l-1.65,-2.21l-0.11,-0.09l-1.69,-0.84l-0.2,-0.02l-2.84,0.63l-0.14,0.07l-0.71,0.64l-0.02,-0.11l0.57,-1.17l0.0,-0.26l-0.48,-1.05l-0.17,-0.16l-2.78,-0.99l-1.08,-2.62l-0.13,-0.15l-1.24,-0.7l-0.04,-0.48l2.07,0.25l0.34,-0.29l0.09,-2.03l1.84,-0.44l2.12,0.45l0.36,-0.25l0.45,-3.04l-0.45,-2.06l-0.31,-0.23l-2.44,0.15l-2.07,-0.75l-0.23,0.01l-2.88,1.38l-2.21,0.62l-0.96,-0.38l0.22,-1.39l-0.06,-0.23l-1.6,-2.12l-0.25,-0.12l-1.72,0.08l-1.87,-1.91l1.33,-2.24l-0.06,-0.38l-0.55,-0.5l1.72,-3.08l2.3,1.7l0.48,-0.2l0.29,-2.26l4.99,-3.48l3.76,-0.08l5.46,2.27l2.96,1.33l0.26,-0.01l2.59,-1.36l3.82,-0.06l3.13,1.67l0.38,-0.09l0.63,-0.85l3.36,0.14l0.29,-0.19l0.63,-1.57l-0.13,-0.37l-3.64,-2.05l2.0,-1.36l0.1,-0.38l-0.32,-0.62l2.09,-0.76l0.13,-0.47l-1.65,-2.13l0.89,-0.91l9.27,-1.18l0.13,-0.05l1.17,-0.82l6.2,-1.27l2.26,-1.43l4.19,0.7l0.74,3.39l0.38,0.22l2.52,-0.81l2.9,1.06l-0.18,1.63l0.32,0.33l2.52,-0.23l5.0,-2.58l0.03,0.39l3.16,2.62l5.57,8.48l0.49,0.02l1.18,-1.53l3.22,1.78l0.21,0.03l3.5,-0.83l1.21,0.52l1.16,1.82l0.15,0.12l1.67,0.61l1.01,1.32l0.28,0.11l3.04,-0.41l1.1,1.64l-1.68,1.89l-1.97,0.28l-0.26,0.29l-0.12,3.09l-1.2,1.23l-4.81,-1.01l-0.35,0.2l-1.77,5.51l-1.14,0.62l-4.92,1.23l-0.2,0.41l2.14,5.06l-1.45,0.67l-0.17,0.31l0.15,1.28l-1.05,-0.3l-1.21,-1.04l-0.17,-0.07l-3.73,-0.32l-4.15,-0.08l-0.92,0.31l-3.46,-1.24l-0.22,0.01l-1.42,0.63l-0.17,0.21l-0.32,1.49l-3.82,-0.97l-0.15,0.0l-1.65,0.43l-0.2,0.17l-0.51,1.21Z", "name": "Kazakhstan"}, "ET": {"path": "M516.0,247.63l1.21,0.92l0.3,0.04l1.3,-0.53l0.46,0.41l0.19,0.08l1.65,0.03l2.05,0.96l0.67,0.88l1.07,0.79l1.0,1.45l0.7,0.68l-0.72,0.92l-0.85,1.19l-0.04,0.25l0.19,0.67l0.04,0.74l0.29,0.28l1.4,0.04l0.55,-0.15l0.23,0.19l-0.41,0.67l0.01,0.32l0.92,1.39l0.93,1.23l0.99,0.94l0.1,0.06l8.19,2.99l1.51,0.01l-6.51,6.95l-3.14,0.11l-0.18,0.06l-2.15,1.71l-1.51,0.04l-0.22,0.1l-0.6,0.69l-1.46,-0.0l-0.93,-0.78l-0.32,-0.04l-2.29,1.05l-0.12,0.1l-0.64,0.9l-1.44,-0.17l-0.51,-0.26l-0.17,-0.03l-0.56,0.07l-0.68,-0.02l-3.1,-2.08l-0.17,-0.05l-1.62,0.0l-0.68,-0.65l0.0,-1.28l-0.21,-0.29l-1.19,-0.38l-1.42,-2.63l-0.13,-0.12l-1.05,-0.53l-0.46,-1.0l-1.27,-1.23l-0.17,-0.08l-1.08,-0.13l0.53,-0.9l1.17,-0.05l0.26,-0.17l0.37,-0.77l0.03,-0.14l-0.03,-2.23l0.7,-2.49l1.08,-0.65l0.14,-0.19l0.24,-1.0l1.03,-1.85l1.47,-1.22l0.09,-0.12l1.02,-2.51l0.36,-1.96l2.62,0.48l0.33,-0.18l0.63,-1.55Z", "name": "Ethiopia"}, "ZW": {"path": "M498.95,341.2l-1.16,-0.23l-0.16,0.01l-0.74,0.28l-1.11,-0.41l-1.02,-0.04l-1.52,-1.13l-0.12,-0.05l-1.79,-0.37l-0.65,-1.46l-0.01,-0.86l-0.22,-0.29l-0.99,-0.26l-2.74,-2.77l-0.77,-1.46l-0.52,-0.5l-0.72,-1.54l2.24,0.23l0.78,0.28l0.12,0.02l0.85,-0.06l0.21,-0.11l1.38,-1.66l2.11,-2.05l0.81,-0.18l0.22,-0.2l0.27,-0.8l1.29,-0.93l1.53,-0.28l0.11,0.66l0.3,0.25l2.02,-0.05l1.04,0.48l0.5,0.59l0.18,0.1l1.13,0.18l1.11,0.7l0.01,3.06l-0.49,1.82l-0.11,1.94l0.03,0.16l0.35,0.68l-0.24,1.3l-0.27,0.17l-0.12,0.15l-0.64,1.83l-2.49,2.8Z", "name": "Zimbabwe"}, "ES": {"path": "M398.67,172.8l0.09,-1.45l-0.06,-0.2l-0.82,-1.05l3.16,-1.96l3.01,0.54l3.33,-0.02l2.64,0.52l2.14,-0.15l3.9,0.1l0.91,1.08l0.14,0.09l4.61,1.38l0.26,-0.04l0.77,-0.55l2.66,1.29l0.17,0.03l2.59,-0.35l0.1,1.28l-2.2,1.85l-3.13,0.62l-0.23,0.23l-0.21,0.92l-1.54,1.68l-0.97,2.4l0.02,0.26l0.85,1.46l-1.27,1.14l-0.09,0.14l-0.5,1.73l-1.73,0.53l-0.15,0.1l-1.68,2.1l-3.03,0.04l-2.38,-0.05l-0.17,0.05l-1.57,1.01l-0.9,1.01l-0.96,-0.19l-0.82,-0.86l-0.69,-1.6l-0.22,-0.18l-2.14,-0.41l-0.13,-0.62l0.83,-0.97l0.39,-0.86l-0.06,-0.33l-0.73,-0.73l0.63,-1.74l-0.02,-0.25l-0.8,-1.41l0.69,-0.15l0.23,-0.27l0.09,-1.29l0.33,-0.36l0.08,-0.2l0.03,-2.16l1.03,-0.72l0.1,-0.37l-0.7,-1.5l-0.25,-0.17l-1.46,-0.11l-0.22,0.07l-0.34,0.3l-1.17,0.0l-0.55,-1.29l-0.39,-0.16l-1.02,0.44l-0.45,0.36Z", "name": "Spain"}, "ER": {"path": "M527.15,253.05l-0.77,-0.74l-1.01,-1.47l-1.14,-0.86l-0.62,-0.84l-0.11,-0.09l-2.18,-1.02l-0.12,-0.03l-1.61,-0.03l-0.52,-0.46l-0.31,-0.05l-1.31,0.54l-1.38,-1.06l-0.46,0.12l-0.69,1.68l-2.49,-0.46l-0.2,-0.76l1.06,-3.69l0.24,-1.65l0.66,-0.66l1.76,-0.4l0.16,-0.1l0.97,-1.13l1.24,2.55l0.68,2.34l0.09,0.14l1.4,1.27l3.39,2.4l1.37,1.43l2.14,2.34l0.94,0.6l-0.32,0.26l-0.85,-0.17Z", "name": "Eritrea"}, "ME": {"path": "M469.05,172.9l-0.57,-0.8l-0.1,-0.09l-0.82,-0.46l0.16,-0.33l0.35,-1.57l0.72,-0.62l0.27,-0.16l0.48,0.38l0.35,0.4l0.12,0.08l0.79,0.32l0.66,0.43l-0.43,0.62l-0.28,0.11l-0.07,-0.25l-0.53,-0.1l-1.09,1.49l-0.05,0.23l0.06,0.32Z", "name": "Montenegro"}, "MD": {"path": "M488.2,153.75l0.14,-0.11l1.49,-0.28l1.75,0.95l1.06,0.14l0.92,0.7l-0.15,0.9l0.15,0.31l0.8,0.46l0.33,1.2l0.09,0.14l0.72,0.66l-0.11,0.28l0.1,0.33l-0.06,0.02l-1.25,-0.08l-0.17,-0.29l-0.39,-0.12l-0.52,0.25l-0.16,0.36l0.13,0.42l-0.6,0.88l-0.43,1.03l-0.22,0.12l-0.32,-1.0l0.25,-1.34l-0.08,-1.38l-0.06,-0.17l-1.43,-1.87l-0.81,-1.36l-0.78,-0.95l-0.12,-0.09l-0.29,-0.12Z", "name": "Moldova"}, "MG": {"path": "M544.77,316.45l0.64,1.04l0.6,1.62l0.4,3.04l0.63,1.21l-0.22,1.07l-0.15,0.26l-0.59,-1.05l-0.52,-0.01l-0.47,0.76l-0.04,0.23l0.46,1.84l-0.19,0.92l-0.61,0.53l-0.1,0.21l-0.16,2.15l-0.97,2.98l-1.24,3.59l-1.55,4.97l-0.96,3.67l-1.08,2.93l-1.94,0.61l-2.05,1.06l-3.2,-1.53l-0.62,-1.26l-0.18,-2.39l-0.87,-2.07l-0.22,-1.8l0.4,-1.69l1.01,-0.4l0.19,-0.28l0.01,-0.79l1.15,-1.91l0.04,-0.11l0.23,-1.66l-0.03,-0.17l-0.57,-1.21l-0.46,-1.58l-0.19,-2.25l0.82,-1.36l0.33,-1.51l1.11,-0.1l1.4,-0.53l0.9,-0.45l1.03,-0.03l0.21,-0.09l1.41,-1.45l2.12,-1.65l0.75,-1.29l0.03,-0.24l-0.17,-0.56l0.53,0.15l0.32,-0.1l1.38,-1.77l0.06,-0.18l0.04,-1.44l0.54,-0.74l0.62,0.77Z", "name": "Madagascar"}, "MA": {"path": "M378.66,230.13l0.07,-0.75l0.93,-0.72l0.82,-1.37l0.04,-0.21l-0.14,-0.8l0.8,-1.74l1.33,-1.61l0.79,-0.4l0.14,-0.15l0.66,-1.55l0.08,-1.46l0.83,-1.52l1.6,-0.94l0.11,-0.11l1.56,-2.71l1.2,-0.99l2.24,-0.29l0.17,-0.08l1.95,-1.83l1.3,-0.77l2.09,-2.28l0.07,-0.26l-0.61,-3.34l0.92,-2.3l0.33,-1.44l1.52,-1.79l2.48,-1.27l1.86,-1.16l0.1,-0.11l1.67,-2.93l0.72,-1.59l1.54,0.01l1.43,1.14l0.21,0.06l2.33,-0.19l2.55,0.62l0.97,0.03l0.83,1.6l0.15,1.71l0.86,2.96l0.09,0.14l0.5,0.45l-0.31,0.73l-3.11,0.44l-0.16,0.07l-1.07,0.97l-1.36,0.23l-0.25,0.28l-0.1,1.85l-2.74,1.02l-0.14,0.11l-0.9,1.3l-1.93,0.69l-2.56,0.44l-4.04,2.01l-0.17,0.27l0.02,2.91l-0.08,0.0l-0.3,0.31l0.05,1.15l-1.25,0.07l-0.16,0.06l-0.73,0.55l-0.98,0.0l-0.85,-0.33l-0.15,-0.02l-2.11,0.29l-0.24,0.19l-0.76,1.95l-0.63,0.16l-0.21,0.19l-1.15,3.29l-3.42,2.81l-0.1,0.17l-0.81,3.57l-0.98,1.12l-0.3,0.85l-5.13,0.19Z", "name": "Morocco"}, "UZ": {"path": "M587.83,186.48l0.06,-1.46l-0.19,-0.29l-3.31,-1.24l-2.57,-1.4l-1.63,-1.38l-2.79,-1.98l-1.2,-2.98l-0.12,-0.14l-0.84,-0.54l-0.18,-0.05l-2.61,0.13l-0.76,-0.48l-0.25,-2.25l-0.17,-0.24l-3.37,-1.6l-0.32,0.04l-2.08,1.73l-2.11,1.02l-0.16,0.35l0.31,1.14l-2.14,0.03l-0.09,-10.68l6.1,-1.74l6.25,3.57l2.36,2.72l0.27,0.1l2.92,-0.44l4.17,-0.23l2.78,2.06l-0.18,2.87l0.29,0.32l0.98,0.02l0.46,2.22l0.28,0.24l3.0,0.09l0.61,1.25l0.28,0.17l0.93,-0.02l0.26,-0.16l1.06,-2.06l3.21,-2.03l1.3,-0.5l0.19,0.08l-1.75,1.62l0.05,0.48l1.85,1.12l0.27,0.02l1.65,-0.69l2.4,1.27l-2.69,1.79l-1.79,-0.27l-0.89,0.06l-0.22,-0.52l0.48,-1.26l-0.34,-0.4l-3.35,0.69l-0.22,0.18l-0.78,1.87l-1.07,1.47l-1.93,-0.13l-0.29,0.16l-0.65,1.29l0.16,0.42l1.69,0.64l0.48,1.91l-1.25,2.6l-1.64,-0.53l-1.18,-0.03Z", "name": "Uzbekistan"}, "MM": {"path": "M670.1,233.39l-1.46,1.11l-1.68,0.11l-0.26,0.19l-1.1,2.7l-0.95,0.42l-0.14,0.42l1.21,2.27l1.61,1.92l0.94,1.55l-0.82,1.99l-0.77,0.42l-0.13,0.39l0.64,1.35l1.62,1.97l0.26,1.32l-0.04,1.15l0.02,0.13l0.92,2.18l-1.3,2.23l-0.79,1.69l-0.1,-0.77l0.74,-1.87l-0.02,-0.26l-0.8,-1.42l0.2,-2.68l-0.06,-0.2l-0.98,-1.27l-0.8,-2.98l-0.45,-3.22l-1.11,-2.22l-0.45,-0.1l-1.64,1.28l-2.74,1.76l-1.26,-0.2l-1.27,-0.49l0.79,-2.93l0.0,-0.14l-0.52,-2.42l-1.93,-2.97l0.26,-0.8l-0.22,-0.39l-1.37,-0.31l-1.65,-1.98l-0.12,-1.5l0.41,0.19l0.42,-0.26l0.05,-1.7l1.08,-0.54l0.16,-0.34l-0.24,-1.0l0.5,-0.79l0.05,-0.15l0.08,-2.35l1.58,0.49l0.36,-0.15l1.12,-2.19l0.15,-1.34l1.35,-2.18l0.04,-0.17l-0.07,-1.35l2.97,-1.71l1.67,0.45l0.38,-0.33l-0.18,-1.46l0.7,-0.4l0.15,-0.32l-0.13,-0.72l0.94,-0.13l0.74,1.41l0.11,0.12l0.95,0.56l0.07,1.89l-0.09,2.08l-2.28,2.15l-0.09,0.19l-0.3,3.15l0.35,0.32l2.37,-0.39l0.53,2.17l0.2,0.21l1.3,0.42l-0.63,1.9l0.14,0.36l1.86,0.99l1.1,0.49l0.24,0.0l1.45,-0.6l0.04,0.51l-2.01,1.6l-0.56,0.96l-1.34,0.56Z", "name": "Myanmar"}, "ML": {"path": "M390.79,248.2l0.67,-0.37l0.14,-0.18l0.36,-1.31l0.51,-0.04l1.68,0.69l0.21,0.0l1.34,-0.48l0.89,0.16l0.3,-0.13l0.29,-0.44l9.89,-0.04l0.29,-0.21l0.56,-1.8l-0.11,-0.33l-0.33,-0.24l-2.37,-22.1l3.41,-0.04l8.37,5.73l8.38,5.68l0.56,1.15l0.14,0.14l1.56,0.75l0.99,0.36l0.03,1.45l0.33,0.29l2.45,-0.22l0.01,5.52l-1.3,1.64l-0.06,0.15l-0.18,1.37l-1.99,0.36l-3.4,0.22l-0.19,0.09l-0.85,0.83l-1.48,0.09l-1.49,0.01l-0.54,-0.43l-0.26,-0.05l-1.38,0.36l-2.39,1.08l-0.13,0.12l-0.44,0.73l-1.88,1.11l-0.11,0.12l-0.3,0.57l-0.86,0.42l-1.1,-0.31l-0.28,0.07l-0.69,0.62l-0.09,0.16l-0.35,1.66l-1.93,2.04l-0.08,0.23l0.05,0.76l-0.63,0.99l-0.04,0.19l0.14,1.23l-0.81,0.29l-0.32,0.17l-0.27,-0.75l-0.39,-0.18l-0.65,0.26l-0.36,-0.04l-0.29,0.14l-0.37,0.6l-1.69,-0.02l-0.63,-0.34l-0.32,0.02l-0.12,0.09l-0.47,-0.45l0.1,-0.6l-0.09,-0.27l-0.31,-0.3l-0.33,-0.05l-0.05,0.02l0.02,-0.21l0.46,-0.59l-0.02,-0.39l-0.99,-1.02l-0.34,-0.74l-0.56,-0.56l-0.17,-0.09l-0.5,-0.07l-0.19,0.04l-0.58,0.35l-0.79,0.33l-0.65,0.51l-0.85,-0.16l-0.63,-0.59l-0.14,-0.07l-0.41,-0.08l-0.2,0.03l-0.59,0.31l-0.07,0.0l-0.1,-0.63l0.11,-0.85l-0.21,-0.98l-0.11,-0.17l-0.86,-0.66l-0.45,-1.34l-0.1,-1.36Z", "name": "Mali"}, "MN": {"path": "M641.06,150.59l2.41,-0.53l4.76,-2.8l3.67,-1.49l2.06,0.96l0.12,0.03l2.5,0.05l1.59,1.45l0.19,0.08l2.47,0.12l3.59,0.81l0.27,-0.07l2.43,-2.28l0.06,-0.36l-0.93,-1.77l2.33,-3.1l2.66,1.3l2.26,0.39l2.75,0.8l0.44,2.3l0.19,0.22l3.56,1.38l0.18,0.01l2.35,-0.6l3.1,-0.42l2.4,0.41l2.37,1.52l1.49,1.63l0.23,0.1l2.29,-0.03l3.13,0.52l0.15,-0.01l2.28,-0.79l3.27,-0.53l0.11,-0.04l3.56,-2.23l1.31,0.31l1.26,1.05l0.22,0.07l2.45,-0.22l-0.98,1.96l-1.77,3.21l-0.01,0.28l0.64,1.31l0.35,0.16l1.35,-0.38l2.4,0.48l0.22,-0.04l1.78,-1.09l1.82,0.92l2.11,2.07l-0.17,0.68l-1.79,-0.31l-3.74,0.45l-1.85,0.96l-1.78,2.01l-3.74,1.18l-2.46,1.61l-2.45,-0.6l-1.42,-0.28l-0.31,0.13l-1.31,1.99l0.0,0.33l0.78,1.15l0.3,0.74l-1.58,0.93l-1.75,1.59l-2.83,1.03l-3.77,0.12l-4.05,1.05l-2.81,1.54l-0.95,-0.8l-0.19,-0.07l-2.96,0.0l-3.64,-1.8l-2.55,-0.48l-3.38,0.41l-5.13,-0.67l-2.66,0.06l-1.35,-1.65l-1.12,-2.78l-0.21,-0.18l-1.5,-0.33l-2.98,-1.89l-0.12,-0.04l-3.37,-0.43l-2.84,-0.51l-0.75,-1.13l0.93,-3.54l-0.04,-0.24l-1.73,-2.55l-0.15,-0.12l-3.52,-1.18l-1.99,-1.61l-0.54,-1.85Z", "name": "Mongolia"}, "MK": {"path": "M472.73,173.87l0.08,0.01l0.32,-0.25l0.08,-0.44l1.29,-0.41l1.37,-0.28l1.03,-0.04l1.06,0.82l0.14,1.59l-0.22,0.04l-0.17,0.11l-0.32,0.4l-1.2,-0.05l-0.18,0.05l-0.9,0.61l-1.45,0.23l-0.85,-0.59l-0.3,-1.09l0.22,-0.71Z", "name": "Macedonia"}, "MW": {"path": "M507.18,313.84l-0.67,1.85l-0.01,0.16l0.7,3.31l0.31,0.24l0.75,-0.03l0.78,0.71l0.99,1.75l0.2,3.03l-0.91,0.45l-0.14,0.15l-0.59,1.38l-1.24,-1.21l-0.17,-1.62l0.49,-1.12l0.02,-0.16l-0.15,-1.03l-0.13,-0.21l-0.99,-0.65l-0.26,-0.03l-0.53,0.18l-1.31,-1.12l-1.15,-0.59l0.66,-2.06l0.75,-0.84l0.07,-0.27l-0.47,-2.04l0.48,-1.94l0.4,-0.65l0.03,-0.24l-0.64,-2.15l-0.08,-0.13l-0.44,-0.42l1.34,0.26l1.25,1.73l0.67,3.3Z", "name": "Malawi"}, "MR": {"path": "M390.54,247.66l-1.48,-1.58l-1.51,-1.88l-0.12,-0.09l-1.64,-0.67l-1.17,-0.74l-0.17,-0.05l-1.4,0.03l-0.12,0.03l-1.14,0.52l-1.15,-0.21l-0.26,0.08l-0.44,0.43l-0.11,-0.72l0.68,-1.29l0.31,-2.43l-0.28,-2.63l-0.29,-1.27l0.24,-1.24l-0.03,-0.2l-0.65,-1.24l-1.19,-1.05l0.32,-0.51l9.64,0.02l0.3,-0.34l-0.46,-3.71l0.51,-1.12l2.17,-0.22l0.27,-0.3l-0.08,-6.5l7.91,0.13l0.31,-0.3l0.01,-3.5l8.17,5.63l-2.89,0.04l-0.29,0.33l2.42,22.56l0.12,0.21l0.26,0.19l-0.43,1.38l-9.83,0.04l-0.25,0.13l-0.27,0.41l-0.77,-0.14l-0.15,0.01l-1.3,0.47l-1.64,-0.67l-0.14,-0.02l-0.79,0.06l-0.27,0.22l-0.39,1.39l-0.53,0.29Z", "name": "Mauritania"}, "UG": {"path": "M500.74,287.17l-2.84,-0.02l-0.92,0.32l-1.37,0.71l-0.29,-0.12l0.02,-1.6l0.54,-0.89l0.04,-0.13l0.14,-1.96l0.49,-1.09l0.91,-1.24l0.97,-0.68l0.8,-0.89l-0.13,-0.49l-0.79,-0.27l0.13,-2.55l0.78,-0.52l1.45,0.51l0.18,0.01l1.97,-0.57l1.72,0.01l0.18,-0.06l1.29,-0.97l0.98,1.44l0.29,1.24l1.05,2.75l-0.84,1.68l-1.94,2.66l-0.06,0.18l0.02,2.36l-4.8,0.18Z", "name": "Uganda"}, "MY": {"path": "M717.6,273.52l-1.51,0.7l-2.13,-0.41l-2.88,-0.0l-0.29,0.21l-0.84,2.77l-0.9,0.82l-0.08,0.12l-1.23,3.34l-1.81,0.47l-2.29,-0.68l-0.14,-0.01l-1.2,0.22l-0.14,0.07l-1.36,1.18l-1.47,-0.17l-0.12,0.01l-1.46,0.46l-1.51,-1.25l-0.24,-0.97l1.26,0.59l0.2,0.02l1.93,-0.47l0.22,-0.22l0.47,-1.98l0.9,-0.4l2.97,-0.54l0.17,-0.09l1.8,-1.98l1.02,-1.32l0.9,1.03l0.48,-0.04l0.43,-0.7l1.02,0.07l0.32,-0.27l0.25,-2.72l1.84,-1.67l1.23,-1.89l0.73,-0.01l1.12,1.11l0.1,0.99l0.18,0.24l1.66,0.71l1.85,0.67l-0.09,0.51l-1.45,0.11l-0.26,0.4l0.35,0.97ZM673.78,269.53l0.17,1.14l0.35,0.25l1.65,-0.3l0.18,-0.11l0.68,-0.86l0.31,0.13l1.41,1.45l0.99,1.59l0.13,1.57l-0.26,1.09l0.0,0.15l0.24,0.84l0.18,1.46l0.11,0.2l0.82,0.64l0.92,2.08l-0.03,0.52l-1.4,0.13l-2.29,-1.79l-2.86,-1.92l-0.27,-1.16l-0.07,-0.13l-1.39,-1.61l-0.33,-1.99l-0.05,-0.12l-0.84,-1.27l0.26,-1.72l-0.03,-0.18l-0.45,-0.87l0.13,-0.13l1.71,0.92Z", "name": "Malaysia"}, "MX": {"path": "M133.41,213.83l0.61,0.09l0.27,-0.09l0.93,-1.01l0.08,-0.18l0.09,-1.22l-0.09,-0.23l-1.93,-1.94l-1.46,-0.77l-2.96,-5.62l-0.86,-2.1l2.44,-0.18l2.68,-0.25l-0.03,0.08l0.17,0.4l3.79,1.35l5.81,1.97l6.96,-0.02l0.3,-0.3l0.0,-0.84l3.91,0.0l0.87,0.93l1.27,0.87l1.44,1.17l0.79,1.37l0.62,1.49l0.12,0.14l1.35,0.85l2.08,0.82l0.35,-0.1l1.49,-2.04l1.81,-0.05l1.63,1.01l1.21,1.8l0.86,1.58l1.47,1.55l0.53,1.82l0.73,1.32l0.14,0.13l1.98,0.84l1.78,0.59l0.61,-0.03l-0.78,1.89l-0.45,1.96l-0.19,3.58l-0.24,1.27l0.01,0.14l0.43,1.43l0.78,1.31l0.49,1.98l0.06,0.12l1.63,1.9l0.61,1.51l0.98,1.28l0.16,0.11l2.58,0.67l0.98,1.02l0.31,0.08l2.17,-0.71l1.91,-0.26l1.87,-0.47l1.67,-0.49l1.59,-1.06l0.11,-0.14l0.6,-1.52l0.22,-2.21l0.35,-0.62l1.58,-0.64l2.59,-0.59l2.18,0.09l1.43,-0.2l0.39,0.36l-0.07,1.02l-1.28,1.48l-0.65,1.68l0.07,0.32l0.33,0.32l-0.79,2.49l-0.28,-0.3l-0.24,-0.09l-1.0,0.08l-0.24,0.15l-0.74,1.28l-0.19,-0.13l-0.28,-0.03l-0.3,0.12l-0.19,0.29l0.0,0.06l-4.34,-0.02l-0.3,0.3l-0.0,1.16l-0.83,0.0l-0.28,0.19l0.08,0.33l0.93,0.86l0.9,0.58l0.24,0.48l0.16,0.15l0.2,0.08l-0.03,0.38l-2.94,0.01l-0.26,0.15l-1.21,2.09l0.02,0.33l0.25,0.33l-0.21,0.44l-0.04,0.22l-2.42,-2.35l-1.36,-0.87l-2.04,-0.67l-0.13,-0.01l-1.4,0.19l-2.07,0.98l-1.14,0.23l-1.72,-0.66l-1.85,-0.48l-2.31,-1.16l-1.92,-0.38l-2.79,-1.18l-2.04,-1.2l-0.6,-0.66l-0.19,-0.1l-1.37,-0.15l-2.45,-0.78l-1.07,-1.18l-2.63,-1.44l-1.2,-1.56l-0.44,-0.93l0.5,-0.15l0.2,-0.39l-0.2,-0.58l0.46,-0.55l0.07,-0.19l0.01,-0.91l-0.06,-0.18l-0.81,-1.13l-0.25,-1.08l-0.86,-1.36l-2.21,-2.63l-2.53,-2.09l-1.2,-1.63l-0.11,-0.09l-2.08,-1.06l-0.34,-0.48l0.35,-1.53l-0.16,-0.34l-1.24,-0.61l-1.39,-1.23l-0.6,-1.81l-0.24,-0.2l-1.25,-0.2l-1.38,-1.35l-1.11,-1.25l-0.1,-0.76l-0.05,-0.13l-1.33,-2.04l-0.85,-2.02l0.04,-0.99l-0.14,-0.27l-1.81,-1.1l-0.2,-0.04l-0.74,0.11l-1.34,-0.72l-0.42,0.16l-0.4,1.12l-0.0,0.19l0.41,1.3l0.24,2.04l0.06,0.15l0.88,1.16l1.84,1.86l0.4,0.61l0.12,0.1l0.27,0.14l0.29,0.82l0.31,0.2l0.2,-0.02l0.43,1.51l0.09,0.14l0.72,0.65l0.51,0.91l1.58,1.4l0.8,2.42l0.77,1.23l0.66,1.19l0.13,1.34l0.28,0.27l1.08,0.08l0.92,1.1l0.83,1.08l-0.03,0.24l-0.88,0.81l-0.13,-0.0l-0.59,-1.42l-0.07,-0.11l-1.67,-1.53l-1.81,-1.28l-1.15,-0.61l0.07,-1.85l-0.38,-1.45l-0.12,-0.17l-2.91,-2.03l-0.39,0.04l-0.11,0.11l-0.42,-0.46l-0.11,-0.08l-1.49,-0.63l-1.09,-1.16Z", "name": "Mexico"}, "VU": {"path": "M839.92,325.66l0.78,0.73l-0.18,0.07l-0.6,-0.8ZM839.13,322.74l0.27,1.36l-0.13,-0.06l-0.21,-0.02l-0.29,0.08l-0.22,-0.43l-0.03,-1.32l0.61,0.4Z", "name": "Vanuatu"}, "FR": {"path": "M444.58,172.63l-0.68,1.92l-0.72,-0.38l-0.51,-1.79l0.43,-0.95l1.15,-0.83l0.33,2.04ZM429.71,147.03l1.77,1.57l0.26,0.07l1.16,-0.23l2.12,1.44l0.56,0.28l0.16,0.03l0.61,-0.06l1.09,0.78l0.13,0.05l3.18,0.53l-1.09,1.94l-0.3,2.16l-0.48,0.38l-1.0,-0.26l-0.37,0.32l0.07,0.66l-1.73,1.68l-0.09,0.21l-0.04,1.42l0.41,0.29l0.96,-0.4l0.67,1.07l-0.09,0.78l0.04,0.19l0.61,0.97l-0.71,0.78l-0.07,0.28l0.65,2.39l0.21,0.21l1.09,0.31l-0.2,0.95l-2.08,1.58l-4.81,-0.8l-0.13,0.01l-3.65,0.99l-0.22,0.24l-0.25,1.6l-2.59,0.35l-2.74,-1.33l-0.31,0.03l-0.79,0.57l-4.38,-1.31l-0.79,-0.94l1.16,-1.64l0.05,-0.15l0.48,-6.17l-0.06,-0.21l-2.58,-3.3l-1.89,-1.65l-0.11,-0.06l-3.64,-1.17l-0.2,-1.88l2.92,-0.63l4.14,0.82l0.35,-0.36l-0.65,-3.0l1.77,1.05l0.27,0.02l5.83,-2.54l0.17,-0.19l0.71,-2.54l1.75,-0.53l0.27,0.88l0.27,0.21l1.04,0.05l1.08,1.23ZM289.1,278.45l-0.85,0.84l-0.88,0.13l-0.25,-0.51l-0.21,-0.16l-0.56,-0.1l-0.25,0.07l-0.63,0.55l-0.62,-0.29l0.5,-0.88l0.21,-1.11l0.42,-1.05l-0.03,-0.28l-0.93,-1.42l-0.18,-1.54l1.13,-1.87l2.42,0.78l2.55,2.04l0.33,0.81l-1.4,2.16l-0.77,1.84Z", "name": "France"}, "FI": {"path": "M492.26,76.42l-0.38,3.12l0.12,0.28l3.6,2.69l-2.14,2.96l-0.01,0.33l2.83,4.61l-1.61,3.36l0.03,0.31l2.15,2.87l-0.96,2.44l0.1,0.35l3.51,2.55l-0.81,1.72l-2.28,2.19l-5.28,4.79l-4.51,0.31l-4.39,1.37l-3.87,0.75l-1.34,-1.89l-0.11,-0.09l-2.23,-1.14l0.53,-3.54l-0.01,-0.14l-1.17,-3.37l1.12,-2.13l2.23,-2.44l5.69,-4.33l1.65,-0.84l0.16,-0.31l-0.26,-1.73l-0.15,-0.22l-3.4,-1.91l-0.77,-1.47l-0.07,-6.45l-0.12,-0.24l-3.91,-2.94l-3.0,-1.92l0.97,-0.76l2.6,2.17l0.21,0.07l3.2,-0.21l2.63,1.03l0.3,-0.05l2.39,-1.94l0.09,-0.13l1.18,-3.12l3.63,-1.42l2.87,1.59l-0.98,2.87Z", "name": "Finland"}, "FJ": {"path": "M869.98,327.07l-1.31,0.44l-0.14,-0.41l0.96,-0.41l0.85,-0.17l1.43,-0.78l-0.16,0.65l-1.64,0.67ZM867.58,329.12l0.54,0.47l-0.31,1.0l-1.32,0.3l-1.13,-0.26l-0.17,-0.78l0.72,-0.66l0.98,0.27l0.25,-0.04l0.43,-0.29Z", "name": "Fiji"}, "FK": {"path": "M268.15,427.89l2.6,-1.73l1.98,0.77l0.31,-0.05l1.32,-1.17l1.58,1.18l-0.54,0.84l-3.1,0.92l-1.0,-1.04l-0.39,-0.04l-1.9,1.35l-0.86,-1.04Z", "name": "Falkland Islands"}, "NI": {"path": "M202.1,252.6l0.23,-0.0l0.12,-0.11l0.68,-0.09l0.22,-0.15l0.23,-0.43l0.2,-0.01l0.28,-0.31l-0.04,-0.97l0.29,-0.03l0.5,0.02l0.25,-0.11l0.37,-0.46l0.51,0.35l0.4,-0.06l0.23,-0.28l0.45,-0.29l0.87,-0.7l0.11,-0.21l0.02,-0.26l0.23,-0.12l0.25,-0.48l0.29,0.27l0.14,0.07l0.5,0.12l0.22,-0.03l0.48,-0.28l0.66,-0.02l0.87,-0.33l0.36,-0.32l0.21,0.01l-0.11,0.48l0.0,0.14l0.22,0.8l-0.54,0.85l-0.27,1.03l-0.09,1.18l0.14,0.72l0.05,0.95l-0.24,0.15l-0.13,0.19l-0.23,1.09l0.0,0.14l0.14,0.53l-0.42,0.53l-0.06,0.24l0.12,0.69l0.08,0.15l0.18,0.19l-0.26,0.23l-0.49,-0.11l-0.35,-0.44l-0.16,-0.1l-0.79,-0.21l-0.23,0.03l-0.45,0.26l-1.51,-0.62l-0.31,0.05l-0.17,0.15l-1.81,-1.62l-0.6,-0.9l-1.04,-0.79l-0.77,-0.71Z", "name": "Nicaragua"}, "NL": {"path": "M436.22,136.65l1.82,0.08l0.36,0.89l-0.6,2.96l-0.53,1.06l-1.32,0.0l-0.3,0.34l0.35,2.89l-0.83,-0.47l-1.56,-1.43l-0.29,-0.07l-2.26,0.67l-1.02,-0.15l0.68,-0.48l0.1,-0.12l2.14,-4.84l3.25,-1.35Z", "name": "Netherlands"}, "NO": {"path": "M491.45,67.31l7.06,3.0l-2.52,0.94l-0.11,0.49l2.43,2.49l-3.82,1.59l-1.48,0.3l0.89,-2.61l-0.14,-0.36l-3.21,-1.78l-0.25,-0.02l-3.89,1.52l-0.17,0.17l-1.2,3.17l-2.19,1.78l-2.53,-0.99l-0.13,-0.02l-3.15,0.21l-2.69,-2.25l-0.38,-0.01l-1.43,1.11l-1.47,0.17l-0.26,0.26l-0.33,2.57l-4.42,-0.65l-0.33,0.22l-0.6,2.19l-2.17,-0.01l-0.27,0.16l-4.15,7.68l-3.88,5.76l-0.0,0.33l0.81,1.23l-0.7,1.27l-2.3,-0.06l-0.28,0.18l-1.63,3.72l-0.02,0.13l0.15,5.17l0.07,0.18l1.51,1.84l-0.79,4.24l-2.04,2.5l-0.92,1.75l-1.39,-1.88l-0.44,-0.05l-4.89,4.21l-3.16,0.81l-3.24,-1.74l-0.86,-3.82l-0.78,-8.6l2.18,-2.36l6.56,-3.28l5.0,-4.16l4.63,-5.74l5.99,-8.09l4.17,-3.23l6.84,-5.49l5.39,-1.92l4.06,0.24l0.23,-0.09l3.72,-3.67l4.51,0.19l4.4,-0.89ZM484.58,19.95l4.42,1.82l-3.25,2.68l-7.14,0.65l-7.16,-0.91l-0.39,-1.37l-0.28,-0.22l-3.48,-0.1l-2.25,-2.15l7.09,-1.48l3.55,1.36l0.28,-0.03l2.42,-1.66l6.18,1.41ZM481.99,33.92l-4.73,1.85l-3.76,-1.06l1.27,-1.02l0.04,-0.43l-1.18,-1.35l4.46,-0.94l0.89,1.83l0.17,0.15l2.83,0.96ZM466.5,23.95l7.64,3.87l-5.63,1.94l-0.19,0.19l-1.35,3.88l-2.08,0.96l-0.16,0.19l-1.14,4.18l-2.71,0.18l-4.94,-2.95l1.95,-1.63l-0.08,-0.51l-3.7,-1.54l-4.79,-4.54l-1.78,-4.01l6.29,-1.88l1.25,1.81l0.25,0.13l3.57,-0.08l0.26,-0.17l0.87,-1.79l3.41,-0.18l3.08,1.94Z", "name": "Norway"}, "NA": {"path": "M461.88,357.98l-1.61,-1.77l-0.94,-1.9l-0.54,-2.58l-0.62,-1.95l-0.83,-4.05l-0.06,-3.13l-0.33,-1.5l-0.07,-0.14l-0.95,-1.06l-1.27,-2.12l-1.3,-3.1l-0.59,-1.71l-1.98,-2.46l-0.13,-1.67l0.99,-0.4l1.44,-0.42l1.48,0.07l1.42,1.11l0.31,0.03l0.32,-0.15l9.99,-0.11l1.66,1.18l0.16,0.06l6.06,0.37l4.69,-1.06l2.01,-0.57l1.5,0.14l0.63,0.37l-1.0,0.41l-0.7,0.01l-0.16,0.05l-1.38,0.88l-0.79,-0.88l-0.29,-0.09l-3.83,0.9l-1.84,0.08l-0.29,0.3l-0.07,8.99l-2.18,0.08l-0.29,0.3l-0.0,17.47l-2.04,1.27l-1.21,0.18l-1.51,-0.49l-0.99,-0.18l-0.36,-1.0l-0.1,-0.14l-0.99,-0.74l-0.4,0.04l-0.98,1.09Z", "name": "Namibia"}, "NC": {"path": "M835.87,338.68l2.06,1.63l1.01,0.94l-0.49,0.32l-1.21,-0.62l-1.76,-1.16l-1.58,-1.36l-1.61,-1.79l-0.16,-0.41l0.54,0.02l1.32,0.83l1.08,0.87l0.79,0.73Z", "name": "New Caledonia"}, "NE": {"path": "M426.67,254.17l0.03,-1.04l-0.24,-0.3l-2.66,-0.53l-0.06,-1.0l-0.07,-0.17l-1.37,-1.62l-0.3,-1.04l0.15,-0.94l1.37,-0.09l0.19,-0.09l0.85,-0.83l3.34,-0.22l2.22,-0.41l0.24,-0.26l0.2,-1.5l1.32,-1.65l0.07,-0.19l-0.01,-5.74l3.4,-1.13l7.24,-5.12l8.46,-4.95l3.76,1.08l1.35,1.39l0.36,0.05l1.39,-0.77l0.55,3.66l0.12,0.2l0.82,0.6l0.03,0.69l0.1,0.21l0.87,0.74l-0.47,0.99l-0.96,5.26l-0.13,3.25l-3.08,2.34l-0.1,0.15l-1.08,3.37l0.08,0.31l0.94,0.86l-0.01,1.51l0.29,0.3l1.25,0.05l-0.14,0.66l-0.51,0.11l-0.24,0.26l-0.06,0.57l-0.04,0.0l-1.59,-2.62l-0.21,-0.14l-0.59,-0.1l-0.23,0.05l-1.83,1.33l-1.79,-0.68l-1.42,-0.17l-0.17,0.03l-0.65,0.32l-1.39,-0.07l-0.19,0.06l-1.4,1.03l-1.12,0.05l-2.97,-1.29l-0.26,0.01l-1.12,0.59l-1.08,-0.04l-0.85,-0.88l-0.11,-0.07l-2.51,-0.95l-0.14,-0.02l-2.69,0.3l-0.16,0.07l-0.65,0.55l-0.1,0.16l-0.34,1.41l-0.69,0.98l-0.05,0.15l-0.13,1.72l-1.47,-1.13l-0.18,-0.06l-0.9,0.01l-0.2,0.08l-0.32,0.28Z", "name": "Niger"}, "NG": {"path": "M442.0,272.7l-2.4,0.83l-0.88,-0.12l-0.19,0.04l-0.89,0.52l-1.78,-0.05l-1.23,-1.44l-0.88,-1.87l-1.77,-1.66l-0.21,-0.08l-3.78,0.03l0.13,-3.75l-0.06,-1.58l0.44,-1.47l0.74,-0.75l1.21,-1.56l0.04,-0.29l-0.22,-0.56l0.44,-0.9l0.01,-0.24l-0.54,-1.44l0.26,-2.97l0.72,-1.06l0.33,-1.37l0.51,-0.43l2.53,-0.28l2.38,0.9l0.89,0.91l0.2,0.09l1.28,0.04l0.15,-0.03l1.06,-0.56l2.9,1.26l0.13,0.02l1.28,-0.06l0.16,-0.06l1.39,-1.02l1.36,0.07l0.15,-0.03l0.64,-0.32l1.22,0.13l1.9,0.73l0.28,-0.04l1.86,-1.35l0.33,0.06l1.62,2.67l0.29,0.14l0.32,-0.04l0.73,0.74l-0.19,0.37l-0.12,0.74l-2.03,1.89l-0.07,0.11l-0.66,1.62l-0.35,1.28l-0.48,0.51l-0.07,0.12l-0.48,1.67l-1.26,0.98l-0.1,0.15l-0.38,1.24l-0.58,1.07l-0.2,0.91l-1.43,0.7l-1.26,-0.93l-0.19,-0.06l-0.95,0.04l-0.2,0.09l-1.41,1.39l-0.61,0.02l-0.26,0.17l-1.19,2.42l-0.61,1.67Z", "name": "Nigeria"}, "NZ": {"path": "M857.9,379.62l1.85,3.1l0.33,0.14l0.22,-0.28l0.04,-1.41l0.57,0.4l0.35,2.06l0.17,0.22l2.02,0.94l1.78,0.26l0.22,-0.06l1.31,-1.01l0.84,0.22l-0.53,2.27l-0.67,1.5l-1.71,-0.05l-0.25,0.12l-0.67,0.89l-0.05,0.23l0.21,1.15l-0.31,0.46l-2.15,3.57l-1.6,0.99l-0.28,-0.51l-0.15,-0.13l-0.72,-0.3l1.27,-2.15l0.01,-0.29l-0.82,-1.63l-0.15,-0.14l-2.5,-1.09l0.05,-0.69l1.67,-0.94l0.15,-0.21l0.42,-2.24l-0.11,-1.95l-0.03,-0.12l-0.97,-1.85l0.05,-0.41l-0.09,-0.25l-1.18,-1.17l-1.94,-2.49l-0.86,-1.64l0.38,-0.09l1.24,1.43l0.12,0.08l1.81,0.68l0.67,2.39ZM853.93,393.55l0.57,1.24l0.44,0.12l1.51,-1.03l0.52,0.91l0.0,1.09l-0.88,1.31l-1.62,2.2l-1.26,1.2l-0.05,0.38l0.64,1.02l-1.4,0.03l-0.14,0.04l-2.14,1.16l-0.14,0.17l-0.67,2.0l-1.38,3.06l-3.07,2.19l-2.12,-0.06l-1.55,-0.99l-0.14,-0.05l-2.53,-0.2l-0.31,-0.84l1.25,-2.15l3.07,-2.97l1.62,-0.59l1.81,-1.17l2.18,-1.63l1.55,-1.65l1.08,-2.18l0.9,-0.72l0.11,-0.17l0.35,-1.56l1.37,-1.07l0.4,0.91Z", "name": "New Zealand"}, "NP": {"path": "M641.26,213.53l-0.14,0.95l0.32,1.64l-0.21,0.78l-1.83,0.04l-2.98,-0.62l-1.86,-0.25l-1.37,-1.3l-0.18,-0.08l-3.38,-0.34l-3.21,-1.49l-2.38,-1.34l-2.16,-0.92l0.84,-2.2l1.51,-1.18l0.89,-0.57l1.83,0.77l2.5,1.76l1.39,0.41l0.78,1.21l0.17,0.13l1.91,0.53l2.0,1.17l2.92,0.66l2.63,0.24Z", "name": "Nepal"}, "CI": {"path": "M413.53,272.08l-0.83,0.02l-1.79,-0.49l-1.64,0.03l-3.04,0.46l-1.73,0.72l-2.4,0.89l-0.12,-0.02l0.16,-1.7l0.19,-0.25l0.06,-0.2l-0.08,-0.99l-0.09,-0.19l-1.06,-1.05l-0.15,-0.08l-0.71,-0.15l-0.51,-0.48l0.45,-0.92l0.02,-0.19l-0.24,-1.16l0.07,-0.43l0.14,-0.0l0.3,-0.26l0.15,-1.1l-0.02,-0.15l-0.13,-0.34l0.09,-0.13l0.83,-0.27l0.19,-0.37l-0.62,-2.02l-0.55,-1.0l0.14,-0.59l0.35,-0.14l0.24,-0.16l0.53,0.29l0.14,0.04l1.93,0.02l0.26,-0.14l0.36,-0.58l0.39,0.01l0.43,-0.17l0.28,0.79l0.43,0.16l0.56,-0.31l0.89,-0.32l0.92,0.45l0.39,0.75l0.14,0.13l1.13,0.53l0.3,-0.03l0.81,-0.59l1.02,-0.08l1.49,0.57l0.62,3.33l-1.03,2.09l-0.65,2.84l0.02,0.2l1.05,2.08l-0.07,0.64Z", "name": "Ivory Coast"}, "CH": {"path": "M444.71,156.27l0.05,0.3l-0.34,0.69l0.13,0.4l1.13,0.58l1.07,0.1l-0.12,0.81l-0.87,0.42l-1.75,-0.37l-0.34,0.18l-0.47,1.1l-0.86,0.07l-0.33,-0.38l-0.41,-0.04l-1.34,1.01l-1.02,0.13l-0.93,-0.58l-0.82,-1.32l-0.37,-0.12l-0.77,0.32l0.02,-0.84l1.74,-1.69l0.09,-0.25l-0.04,-0.38l0.73,0.19l0.26,-0.06l0.6,-0.48l2.02,0.02l0.24,-0.12l0.38,-0.51l2.31,0.84Z", "name": "Switzerland"}, "CO": {"path": "M232.24,284.95l-0.94,-0.52l-1.22,-0.82l-0.31,-0.01l-0.62,0.35l-1.88,-0.31l-0.54,-0.95l-0.29,-0.15l-0.37,0.03l-2.34,-1.33l-0.15,-0.35l0.57,-0.11l0.24,-0.32l-0.1,-1.15l0.46,-0.71l1.11,-0.15l0.21,-0.13l1.05,-1.57l0.95,-1.31l-0.08,-0.43l-0.73,-0.47l0.4,-1.24l0.01,-0.16l-0.53,-2.15l0.44,-0.54l0.06,-0.24l-0.4,-2.13l-0.06,-0.13l-0.93,-1.22l0.21,-0.8l0.52,0.12l0.32,-0.13l0.47,-0.75l0.03,-0.27l-0.52,-1.32l0.09,-0.11l1.14,0.07l0.22,-0.08l1.82,-1.71l0.96,-0.25l0.22,-0.28l0.02,-0.81l0.43,-2.01l1.28,-1.04l1.48,-0.05l0.27,-0.19l0.12,-0.31l1.73,0.19l0.2,-0.05l1.96,-1.28l0.97,-0.56l1.16,-1.16l0.64,0.11l0.43,0.44l-0.31,0.55l-1.49,0.39l-0.19,0.16l-0.6,1.2l-0.97,0.74l-0.73,0.94l-0.06,0.13l-0.3,1.76l-0.68,1.44l0.23,0.43l1.1,0.14l0.27,0.97l0.08,0.13l0.49,0.49l0.17,0.85l-0.27,0.86l-0.01,0.14l0.09,0.53l0.2,0.23l0.52,0.18l0.54,0.79l0.27,0.13l3.18,-0.24l1.31,0.29l1.7,2.08l0.31,0.1l0.96,-0.26l1.75,0.13l1.41,-0.27l0.56,0.27l-0.36,1.07l-0.54,0.81l-0.05,0.13l-0.2,1.8l0.51,1.79l0.07,0.12l0.65,0.68l0.05,0.32l-1.16,1.14l0.05,0.47l0.86,0.52l0.6,0.79l0.31,1.01l-0.7,-0.81l-0.44,-0.01l-0.74,0.77l-4.75,-0.05l-0.3,0.31l0.03,1.57l0.25,0.29l1.2,0.21l-0.02,0.24l-0.1,-0.05l-0.22,-0.02l-1.41,0.41l-0.22,0.29l-0.01,1.82l0.11,0.23l1.04,0.85l0.35,1.3l-0.06,1.02l-1.02,6.26l-0.84,-0.89l-0.19,-0.09l-0.25,-0.02l1.35,-2.13l-0.1,-0.42l-1.92,-1.17l-0.2,-0.04l-1.41,0.2l-0.82,-0.39l-0.26,0.0l-1.29,0.62l-1.63,-0.27l-1.4,-2.5l-0.12,-0.12l-1.1,-0.61l-0.83,-1.2l-1.67,-1.19l-0.27,-0.04l-0.54,0.19Z", "name": "Colombia"}, "CN": {"path": "M740.32,148.94l0.22,0.21l4.3,1.03l2.84,2.2l0.99,2.92l0.28,0.2l3.8,0.0l0.15,-0.04l2.13,-1.24l3.5,-0.8l-1.05,2.29l-0.95,1.13l-0.06,0.12l-0.85,3.41l-1.56,2.81l-2.83,-0.51l-0.19,0.03l-2.15,1.09l-0.15,0.34l0.65,2.59l-0.33,3.3l-1.03,0.07l-0.28,0.3l0.01,0.75l-1.09,-1.2l-0.48,0.05l-0.94,1.6l-3.76,1.26l-0.2,0.36l0.29,1.19l-1.67,-0.08l-1.11,-0.88l-0.42,0.05l-1.69,2.08l-2.71,1.57l-2.04,1.88l-3.42,0.84l-0.11,0.05l-1.8,1.34l-1.54,0.46l0.52,-0.53l0.06,-0.33l-0.44,-0.96l1.84,-1.84l0.02,-0.41l-1.32,-1.56l-0.36,-0.08l-2.23,1.08l-2.83,2.06l-1.52,1.85l-2.32,0.13l-0.2,0.09l-1.28,1.37l-0.03,0.37l1.32,1.97l0.18,0.13l1.83,0.43l0.07,1.08l0.18,0.26l1.98,0.84l0.3,-0.03l2.66,-1.96l2.06,1.04l0.12,0.03l1.4,0.07l0.27,1.0l-3.24,0.73l-0.17,0.11l-1.13,1.5l-2.38,1.4l-0.1,0.1l-1.29,1.99l0.1,0.42l2.6,1.5l0.97,2.72l1.52,2.56l1.66,2.08l-0.03,1.76l-1.4,0.67l-0.15,0.38l0.6,1.47l0.13,0.15l1.29,0.75l-0.35,2.0l-0.58,1.96l-1.22,0.21l-0.2,0.14l-1.83,2.93l-2.02,3.51l-2.29,3.13l-3.4,2.42l-3.42,2.18l-2.75,0.3l-0.15,0.06l-1.32,1.01l-0.68,-0.67l-0.41,-0.01l-1.37,1.27l-3.42,1.28l-2.62,0.4l-0.24,0.21l-0.8,2.57l-0.95,0.11l-0.53,-1.54l0.52,-0.89l-0.19,-0.44l-3.36,-0.84l-0.17,0.01l-1.09,0.4l-2.36,-0.64l-1.0,-0.9l0.35,-1.34l-0.23,-0.37l-2.22,-0.47l-1.15,-0.94l-0.36,-0.02l-2.08,1.37l-2.35,0.29l-1.98,-0.01l-0.13,0.03l-1.32,0.63l-1.28,0.38l-0.21,0.33l0.33,2.65l-0.78,-0.04l-0.14,-0.39l-0.07,-1.04l-0.41,-0.26l-1.72,0.71l-0.96,-0.43l-1.63,-0.86l0.65,-1.95l-0.19,-0.38l-1.43,-0.46l-0.56,-2.27l-0.34,-0.22l-2.26,0.38l0.25,-2.65l2.29,-2.15l0.09,-0.2l0.1,-2.21l-0.07,-2.09l-0.15,-0.25l-1.02,-0.6l-0.8,-1.52l-0.31,-0.16l-1.42,0.2l-2.16,-0.32l0.55,-0.74l0.01,-0.35l-1.17,-1.7l-0.41,-0.08l-1.67,1.07l-1.97,-0.63l-0.25,0.03l-2.89,1.73l-2.26,1.99l-1.82,0.3l-1.0,-0.66l-0.15,-0.05l-1.28,-0.06l-1.75,-0.61l-0.24,0.02l-1.35,0.69l-0.1,0.08l-1.2,1.45l-0.14,-1.41l-0.4,-0.25l-1.46,0.55l-2.83,-0.26l-2.77,-0.61l-1.99,-1.17l-1.91,-0.54l-0.78,-1.21l-0.17,-0.13l-1.36,-0.38l-2.54,-1.79l-2.01,-0.84l-0.28,0.02l-0.89,0.56l-3.31,-1.83l-2.35,-1.67l-0.57,-2.49l1.34,0.28l0.36,-0.28l0.08,-1.42l-0.05,-0.19l-0.93,-1.34l0.24,-2.18l-0.07,-0.22l-2.69,-3.32l-0.15,-0.1l-3.97,-1.11l-0.69,-2.05l-0.11,-0.15l-1.79,-1.3l-0.39,-0.73l-0.36,-1.57l0.08,-1.09l-0.18,-0.3l-1.52,-0.66l-0.22,-0.01l-0.51,0.18l-0.52,-2.21l0.59,-0.55l0.06,-0.35l-0.22,-0.44l2.12,-1.24l1.63,-0.55l2.58,0.39l0.31,-0.16l0.87,-1.75l3.05,-0.34l0.21,-0.12l0.84,-1.12l3.87,-1.59l0.15,-0.14l0.35,-0.68l0.03,-0.17l-0.17,-1.51l1.52,-0.7l0.15,-0.39l-2.12,-5.0l4.62,-1.15l1.35,-0.72l0.14,-0.17l1.72,-5.37l4.7,0.99l0.28,-0.08l1.39,-1.43l0.08,-0.2l0.11,-2.95l1.83,-0.26l0.18,-0.1l1.85,-2.08l0.61,-0.17l0.57,1.97l0.1,0.15l2.2,1.75l3.48,1.17l1.59,2.36l-0.93,3.53l0.04,0.24l0.9,1.35l0.2,0.13l2.98,0.53l3.32,0.43l2.97,1.89l1.49,0.35l1.08,2.67l1.52,1.88l0.24,0.11l2.74,-0.07l5.15,0.67l3.36,-0.41l2.39,0.43l3.67,1.81l0.13,0.03l2.92,-0.0l1.02,0.86l0.34,0.03l2.88,-1.59l3.98,-1.03l3.81,-0.13l3.02,-1.12l1.77,-1.61l1.73,-1.01l0.13,-0.37l-0.41,-1.01l-0.72,-1.07l1.09,-1.66l1.21,0.24l2.57,0.63l0.24,-0.04l2.46,-1.62l3.78,-1.19l0.13,-0.09l1.8,-2.03l1.66,-0.84l3.54,-0.41l1.93,0.35l0.34,-0.22l0.27,-1.12l-0.08,-0.29l-2.27,-2.22l-2.08,-1.07l-0.29,0.01l-1.82,1.12l-2.36,-0.47l-0.14,0.01l-1.18,0.34l-0.46,-0.94l1.69,-3.08l1.1,-2.21l2.75,1.12l0.26,-0.02l3.53,-2.06l0.15,-0.26l-0.02,-1.35l2.18,-3.39l1.35,-1.04l0.12,-0.24l-0.03,-1.85l-0.15,-0.25l-1.0,-0.58l1.68,-1.37l3.01,-0.59l3.25,-0.09l3.67,0.99l2.08,1.18l1.51,3.3l0.95,1.45l0.85,1.99l0.92,3.19ZM697.0,237.37l-1.95,1.12l-1.74,-0.68l-0.06,-1.9l1.08,-1.03l2.62,-0.7l1.23,0.05l0.37,0.65l-1.01,1.08l-0.54,1.4Z", "name": "China"}, "CM": {"path": "M453.76,278.92l-0.26,-0.11l-0.18,-0.02l-1.42,0.31l-1.56,-0.33l-1.17,0.16l-3.7,-0.05l0.3,-1.63l-0.04,-0.21l-0.98,-1.66l-0.15,-0.13l-1.03,-0.38l-0.46,-1.01l-0.13,-0.14l-0.48,-0.27l0.02,-0.46l0.62,-1.72l1.1,-2.25l0.54,-0.02l0.2,-0.09l1.41,-1.39l0.73,-0.03l1.32,0.97l0.31,0.03l1.72,-0.85l0.16,-0.2l0.22,-1.0l0.57,-1.03l0.36,-1.18l1.26,-0.98l0.1,-0.15l0.49,-1.7l0.48,-0.51l0.07,-0.13l0.35,-1.3l0.63,-1.54l2.06,-1.92l0.09,-0.17l0.12,-0.79l0.24,-0.41l-0.04,-0.36l-0.89,-0.91l0.04,-0.45l0.28,-0.06l0.85,1.39l0.16,1.59l-0.09,1.66l0.04,0.17l1.09,1.84l-0.86,-0.02l-0.72,0.17l-1.07,-0.24l-0.34,0.17l-0.54,1.19l0.06,0.34l1.48,1.47l1.06,0.44l0.32,0.94l0.73,1.6l-0.32,0.57l-1.23,2.49l-0.54,0.41l-0.12,0.21l-0.19,1.95l0.24,1.08l-0.18,0.67l0.07,0.28l1.13,1.25l0.24,0.93l0.92,1.29l1.1,0.8l0.1,1.01l0.26,0.73l-0.12,0.93l-1.65,-0.49l-2.02,-0.66l-3.19,-0.11Z", "name": "Cameroon"}, "CL": {"path": "M246.8,429.1l-1.14,0.78l-2.25,1.21l-0.16,0.23l-0.37,2.94l-0.75,0.06l-2.72,-1.07l-2.83,-2.34l-3.06,-1.9l-0.71,-1.92l0.67,-1.84l-0.02,-0.25l-1.22,-2.13l-0.31,-5.41l1.02,-2.95l2.59,-2.4l-0.13,-0.51l-3.32,-0.8l2.06,-2.4l0.07,-0.15l0.79,-4.77l2.44,0.95l0.4,-0.22l1.31,-6.31l-0.16,-0.33l-1.68,-0.8l-0.42,0.21l-0.72,3.47l-1.01,-0.27l0.74,-4.06l0.85,-5.46l1.12,-1.96l0.03,-0.22l-0.71,-2.82l-0.19,-2.94l0.76,-0.07l0.26,-0.2l1.53,-4.62l1.73,-4.52l1.07,-4.2l-0.56,-4.2l0.73,-2.2l0.01,-0.12l-0.29,-3.3l1.46,-3.34l0.45,-5.19l0.8,-5.52l0.78,-5.89l-0.18,-4.33l-0.49,-3.47l1.1,-0.56l0.13,-0.13l0.44,-0.88l0.9,1.29l0.32,1.8l0.1,0.18l1.16,0.97l-0.73,2.33l0.01,0.21l1.33,2.91l0.97,3.6l0.35,0.22l1.57,-0.31l0.16,0.34l-0.79,2.51l-2.61,1.25l-0.17,0.28l0.08,4.36l-0.48,0.79l0.01,0.33l0.6,0.84l-1.62,1.55l-1.67,2.6l-0.89,2.47l-0.02,0.13l0.23,2.56l-1.5,2.76l-0.03,0.21l1.15,4.8l0.11,0.17l0.54,0.42l-0.01,2.37l-1.4,2.7l-0.03,0.15l0.06,2.25l-1.8,1.78l-0.09,0.21l0.02,2.73l0.71,2.63l-1.33,0.94l-0.12,0.17l-0.67,2.64l-0.59,3.03l0.4,3.55l-0.84,0.51l-0.14,0.31l0.58,3.5l0.08,0.16l0.96,0.99l-0.7,1.08l0.11,0.43l1.04,0.55l0.19,0.8l-0.89,0.48l-0.16,0.31l0.26,1.77l-0.89,4.06l-1.31,2.67l-0.03,0.19l0.28,1.53l-0.73,1.88l-1.85,1.37l-0.12,0.26l0.22,3.46l0.06,0.16l0.88,1.19l0.28,0.12l1.32,-0.17l-0.04,2.13l0.04,0.15l1.04,1.95l0.24,0.16l5.94,0.44ZM248.79,430.71l0.0,7.41l0.3,0.3l2.67,0.0l1.01,0.06l-0.54,0.91l-1.99,1.01l-1.13,-0.1l-1.42,-0.27l-1.87,-1.06l-2.57,-0.49l-3.09,-1.9l-2.52,-1.83l-2.65,-2.93l0.93,0.32l3.54,2.29l3.32,1.23l0.34,-0.09l1.29,-1.57l0.83,-2.32l2.11,-1.28l1.43,0.32Z", "name": "Chile"}, "CA": {"path": "M280.14,145.66l-1.66,2.88l0.06,0.37l0.37,0.03l1.5,-1.01l1.17,0.49l-0.64,0.83l0.13,0.46l2.22,0.89l0.28,-0.03l1.02,-0.7l2.09,0.83l-0.69,2.1l0.37,0.38l1.43,-0.45l0.27,1.43l0.74,1.88l-0.95,2.5l-0.88,0.09l-1.34,-0.48l0.49,-2.34l-0.14,-0.32l-0.7,-0.4l-0.36,0.04l-2.81,2.66l-0.63,-0.05l1.2,-1.01l-0.1,-0.52l-2.4,-0.77l-2.79,0.18l-4.65,-0.09l-0.22,-0.54l1.37,-0.99l0.01,-0.48l-0.82,-0.65l1.91,-1.79l2.57,-5.17l1.49,-1.81l2.04,-1.07l0.63,0.08l-0.27,0.51l-1.33,2.07ZM193.92,74.85l-0.01,4.24l0.19,0.28l0.33,-0.07l3.14,-3.22l2.65,2.5l-0.71,3.04l0.06,0.26l2.42,2.88l0.46,0.0l2.66,-3.14l1.83,-3.74l0.03,-0.12l0.13,-4.53l3.23,0.31l3.63,0.64l3.18,2.08l0.13,1.91l-1.79,2.22l-0.0,0.37l1.69,2.2l-0.28,1.8l-4.74,2.84l-3.33,0.62l-2.5,-1.21l-0.41,0.17l-0.73,2.05l-2.39,3.44l-0.74,1.78l-2.78,2.61l-3.48,0.26l-0.17,0.07l-1.98,1.68l-0.1,0.21l-0.15,2.33l-2.68,0.45l-0.17,0.09l-3.1,3.2l-2.75,4.38l-0.99,3.06l-0.14,4.31l0.25,0.31l3.5,0.58l1.07,3.24l1.18,2.76l0.34,0.18l3.43,-0.69l4.55,1.52l2.45,1.32l1.76,1.65l0.12,0.07l3.11,0.96l2.63,1.46l0.13,0.04l4.12,0.2l2.41,0.3l-0.36,2.81l0.8,3.51l1.81,3.78l0.08,0.1l3.73,3.17l0.34,0.03l1.93,-1.08l0.13,-0.15l1.35,-3.44l0.01,-0.18l-1.31,-5.38l-0.08,-0.14l-1.46,-1.5l3.68,-1.51l2.84,-2.46l1.45,-2.55l0.04,-0.17l-0.2,-2.39l-0.04,-0.12l-1.7,-3.07l-2.9,-2.64l2.79,-3.66l0.05,-0.27l-1.08,-3.38l-0.8,-5.75l1.45,-0.75l4.18,1.03l2.6,0.38l0.18,-0.03l1.93,-0.95l2.18,1.23l3.01,2.18l0.73,1.42l0.25,0.16l4.18,0.27l-0.06,2.95l0.83,4.7l0.22,0.24l2.19,0.55l1.75,2.08l0.38,0.07l3.63,-2.03l0.11,-0.11l2.38,-4.06l1.36,-1.43l1.76,3.01l3.26,4.68l2.68,4.19l-0.94,2.09l0.12,0.38l3.31,1.98l2.23,1.98l0.13,0.07l3.94,0.89l1.48,1.02l0.96,2.82l0.22,0.2l1.85,0.43l0.88,1.13l0.17,3.53l-1.68,1.16l-1.76,1.14l-4.08,1.17l-0.11,0.06l-3.08,2.65l-4.11,0.52l-5.35,-0.69l-3.76,-0.02l-2.62,0.23l-0.2,0.1l-2.05,2.29l-3.13,1.41l-0.11,0.08l-3.6,4.24l-2.87,2.92l-0.05,0.36l0.33,0.14l2.13,-0.52l0.15,-0.08l3.98,-4.15l5.16,-2.63l3.58,-0.31l1.82,1.3l-2.09,1.91l-0.09,0.29l0.8,3.46l0.82,2.37l0.15,0.17l3.25,1.56l0.16,0.03l4.14,-0.45l0.21,-0.12l2.03,-2.86l0.11,1.46l0.13,0.22l1.26,0.88l-2.7,1.78l-5.51,1.83l-2.52,1.26l-2.75,2.16l-1.52,-0.18l-0.08,-2.16l4.19,-2.47l0.14,-0.34l-0.3,-0.22l-4.01,0.1l-2.66,0.36l-1.45,-1.56l0.0,-4.16l-0.11,-0.23l-1.11,-0.91l-0.28,-0.05l-1.5,0.48l-0.7,-0.7l-0.45,0.02l-1.91,2.39l-0.8,2.5l-0.82,1.31l-0.95,0.43l-0.77,0.15l-0.23,0.2l-0.18,0.56l-8.2,0.02l-0.13,0.03l-1.19,0.61l-2.95,2.45l-0.78,1.13l-4.6,0.01l-0.12,0.02l-1.13,0.48l-0.13,0.44l0.37,0.55l0.2,0.82l-0.01,0.09l-3.1,1.42l-2.63,0.5l-2.84,1.57l-0.47,0.0l-0.72,-0.4l-0.18,-0.27l0.03,-0.15l0.52,-1.0l1.2,-1.71l0.73,-1.8l0.02,-0.17l-1.03,-5.47l-0.15,-0.21l-2.35,-1.32l0.16,-0.29l-0.05,-0.35l-0.37,-0.38l-0.22,-0.09l-0.56,0.0l-0.35,-0.34l-0.11,-0.65l-0.46,-0.2l-0.39,0.26l-0.2,-0.03l-0.11,-0.33l-0.48,-0.25l-0.21,-0.71l-0.15,-0.18l-3.97,-2.07l-4.8,-2.39l-0.25,-0.01l-2.19,0.89l-0.72,0.03l-3.04,-0.82l-0.14,-0.0l-1.94,0.4l-2.4,-0.98l-2.56,-0.51l-1.7,-0.19l-0.62,-0.44l-0.42,-1.67l-0.3,-0.23l-0.85,0.02l-0.29,0.3l-0.01,0.95l-69.26,-0.01l-4.77,-3.14l-1.78,-1.41l-4.51,-1.38l-1.3,-2.73l0.34,-1.96l-0.17,-0.33l-3.06,-1.37l-0.41,-2.58l-0.11,-0.18l-2.92,-2.4l-0.05,-1.53l1.32,-1.59l0.07,-0.2l-0.07,-2.21l-0.16,-0.26l-4.19,-2.22l-2.52,-4.02l-1.56,-2.6l-0.08,-0.09l-2.28,-1.64l-1.65,-1.48l-1.31,-1.89l-0.38,-0.1l-2.51,1.21l-2.28,1.92l-2.03,-2.22l-1.85,-1.71l-2.44,-1.04l-2.28,-0.12l0.03,-37.72l4.27,0.98l4.0,2.13l2.61,0.4l0.24,-0.07l2.17,-1.81l2.92,-1.33l3.63,0.53l0.18,-0.03l3.72,-1.94l3.89,-1.06l1.6,1.72l0.37,0.06l1.87,-1.04l0.14,-0.19l0.48,-1.83l1.37,0.38l4.18,3.96l0.41,0.0l2.89,-2.62l0.28,2.79l0.37,0.26l3.08,-0.73l0.17,-0.12l0.85,-1.16l2.81,0.24l3.83,1.86l5.86,1.61l3.46,0.75l2.44,-0.26l2.89,1.89l-3.12,1.89l-0.14,0.31l0.24,0.24l4.53,0.92l6.84,-0.5l2.04,-0.71l2.54,2.44l0.39,0.02l2.72,-2.16l-0.01,-0.48l-2.26,-1.61l1.27,-1.16l2.94,-0.19l1.94,-0.42l1.89,0.97l2.49,2.32l0.24,0.08l2.71,-0.33l4.35,1.9l0.17,0.02l3.86,-0.67l3.62,0.1l0.31,-0.33l-0.26,-2.44l1.9,-0.65l3.58,1.36l-0.01,3.84l0.23,0.29l0.34,-0.17l1.51,-3.23l1.81,0.1l0.31,-0.22l1.13,-4.37l-0.08,-0.29l-2.68,-2.73l-2.83,-1.76l0.19,-4.73l2.77,-3.15l3.06,0.69l2.44,1.97l3.24,4.88l-2.05,2.02l0.15,0.51l4.41,0.85ZM265.85,150.7l-0.84,0.04l-3.15,-0.99l-1.77,-1.17l0.19,-0.06l3.17,0.79l2.39,1.27l0.01,0.12ZM249.41,3.71l6.68,0.49l5.34,0.79l4.34,1.6l-0.08,1.24l-5.91,2.56l-6.03,1.21l-2.36,1.38l-0.14,0.34l0.29,0.22l4.37,-0.02l-4.96,3.01l-4.06,1.64l-0.11,0.08l-4.21,4.62l-5.07,0.92l-0.12,0.05l-1.53,1.1l-7.5,0.59l-0.28,0.28l0.24,0.31l2.67,0.54l-1.04,0.6l-0.09,0.44l1.89,2.49l-2.11,1.66l-3.83,1.52l-0.15,0.13l-1.14,2.01l-3.41,1.55l-0.16,0.36l0.35,1.19l0.3,0.22l3.98,-0.19l0.03,0.78l-6.42,2.99l-6.44,-1.41l-7.41,0.79l-3.72,-0.62l-4.48,-0.26l-0.25,-2.0l4.37,-1.13l0.21,-0.38l-1.14,-3.55l1.13,-0.28l6.61,2.29l0.35,-0.12l-0.04,-0.37l-3.41,-3.45l-0.14,-0.08l-3.57,-0.92l1.62,-1.7l4.36,-1.3l0.2,-0.18l0.71,-1.94l-0.12,-0.36l-3.45,-2.15l-0.88,-2.43l6.36,0.23l1.94,0.61l0.23,-0.02l3.91,-2.1l0.15,-0.32l-0.26,-0.24l-5.69,-0.67l-8.69,0.37l-4.3,-1.92l-2.12,-2.39l-2.82,-1.68l-0.44,-1.65l3.41,-1.06l2.93,-0.2l4.91,-0.99l3.69,-2.28l2.93,0.31l2.64,1.68l0.42,-0.1l1.84,-3.23l3.17,-0.96l4.45,-0.69l7.56,-0.26l1.26,0.64l0.18,0.03l7.2,-1.06l10.81,0.8ZM203.94,57.59l0.01,0.32l1.97,2.97l0.51,-0.01l2.26,-3.75l6.05,-1.89l4.08,4.72l-0.36,2.95l0.38,0.33l4.95,-1.36l0.11,-0.05l2.23,-1.77l5.37,2.31l3.32,2.14l0.3,1.89l0.36,0.25l4.48,-1.01l2.49,2.8l0.14,0.09l5.99,1.78l2.09,1.74l2.18,3.83l-4.29,1.91l-0.01,0.54l5.9,2.83l3.95,0.94l3.54,3.84l0.2,0.1l3.58,0.25l-0.67,2.51l-4.18,4.54l-2.84,-1.61l-3.91,-3.95l-0.26,-0.09l-3.24,0.52l-0.25,0.26l-0.32,2.37l0.1,0.26l2.63,2.38l3.42,1.89l0.96,1.0l1.57,3.8l-0.74,2.43l-2.85,-0.96l-6.26,-3.15l-0.38,0.09l0.04,0.39l3.54,3.4l2.55,2.31l0.23,0.78l-6.26,-1.43l-5.33,-2.25l-2.73,-1.73l0.67,-0.86l-0.09,-0.45l-7.38,-4.01l-0.44,0.27l0.03,0.89l-6.85,0.61l-1.8,-1.17l1.43,-2.6l4.56,-0.07l5.15,-0.52l0.23,-0.45l-0.76,-1.34l0.8,-1.89l3.21,-4.06l0.05,-0.29l-0.72,-1.95l-0.97,-1.47l-0.11,-0.1l-3.84,-2.1l-4.53,-1.33l1.09,-0.75l0.05,-0.45l-2.65,-2.75l-0.18,-0.09l-2.12,-0.24l-1.91,-1.47l-0.39,0.02l-1.27,1.25l-4.4,0.56l-9.06,-0.99l-5.28,-1.31l-4.01,-0.67l-1.72,-1.31l2.32,-1.85l0.1,-0.33l-0.28,-0.2l-3.3,-0.02l-0.74,-4.36l1.86,-4.09l2.46,-1.88l5.74,-1.15l-1.5,2.55ZM261.28,159.28l0.19,0.14l1.82,0.42l1.66,-0.05l-0.66,0.68l-0.75,0.16l-3.0,-1.25l-0.46,-0.77l0.51,-0.52l0.68,1.19ZM230.87,84.48l-2.48,0.19l-0.52,-1.74l0.96,-2.17l2.03,-0.53l1.71,1.04l0.02,1.6l-0.22,0.46l-1.5,1.16ZM229.52,58.19l0.14,0.82l-4.99,-0.22l-2.73,0.63l-0.59,-0.23l-2.61,-2.4l0.08,-1.38l0.94,-0.25l5.61,0.51l4.14,2.54ZM222.12,105.0l-0.79,1.63l-0.75,-0.22l-0.52,-0.91l0.04,-0.09l0.84,-1.01l0.74,0.06l0.44,0.55ZM183.77,38.22l2.72,1.65l0.16,0.04l4.83,-0.01l1.92,1.52l-0.51,1.75l0.18,0.36l2.84,1.14l1.56,1.19l0.16,0.06l3.37,0.22l3.65,0.42l4.07,-1.1l5.05,-0.43l3.96,0.35l2.53,1.8l0.48,1.79l-1.37,1.16l-3.6,1.03l-3.22,-0.59l-7.17,0.76l-5.1,0.09l-4.0,-0.6l-6.48,-1.56l-0.81,-2.57l-0.3,-2.49l-0.1,-0.19l-2.51,-2.25l-0.16,-0.07l-5.12,-0.63l-2.61,-1.45l0.75,-1.71l4.88,0.32ZM207.46,91.26l0.42,1.62l0.42,0.19l1.12,-0.55l1.35,0.99l2.74,1.39l2.73,1.2l0.2,1.74l0.35,0.26l1.72,-0.29l1.31,0.97l-1.72,0.96l-3.68,-0.9l-1.34,-1.71l-0.43,-0.04l-2.46,2.1l-3.23,1.85l-0.74,-1.98l-0.31,-0.19l-2.47,0.28l1.49,-1.34l0.1,-0.19l0.32,-3.15l0.79,-3.45l1.34,0.25ZM215.59,102.66l-2.73,2.0l-1.49,-0.08l-0.37,-0.7l1.61,-1.56l3.0,0.03l-0.02,0.3ZM202.79,24.07l0.11,0.12l2.54,1.53l-3.01,1.47l-4.55,4.07l-4.3,0.38l-5.07,-0.68l-2.51,-2.09l0.03,-1.72l1.86,-1.4l0.1,-0.34l-0.29,-0.2l-4.49,0.04l-2.63,-1.79l-1.45,-2.36l1.61,-2.38l1.65,-1.69l2.47,-0.4l0.19,-0.48l-0.72,-0.89l5.1,-0.26l3.1,3.05l0.13,0.07l4.21,1.25l3.99,1.06l1.92,3.65ZM187.5,59.3l-0.15,0.1l-2.59,3.4l-2.5,-0.15l-1.47,-3.92l0.04,-2.24l1.22,-1.92l2.34,-1.26l5.11,0.17l4.28,1.06l-3.36,3.86l-2.9,0.9ZM186.19,48.8l-1.15,1.63l-3.42,-0.35l-2.68,-1.15l1.11,-1.88l3.34,-1.27l2.01,1.63l0.79,1.38ZM185.78,35.41l-0.95,0.13l-4.48,-0.33l-0.4,-0.91l4.5,0.07l1.45,0.82l-0.1,0.21ZM180.76,32.56l-3.43,1.03l-1.85,-1.14l-1.01,-1.92l-0.16,-1.87l2.87,0.2l1.39,0.35l2.75,1.75l-0.55,1.6ZM181.03,76.32l-1.21,1.2l-3.19,-1.26l-0.18,-0.01l-1.92,0.45l-2.88,-1.67l1.84,-1.16l1.6,-1.77l2.45,1.17l1.45,0.77l2.05,2.28ZM169.72,54.76l2.83,0.97l0.14,0.01l4.25,-0.58l0.47,1.01l-2.19,2.16l0.07,0.48l3.61,1.95l-0.41,3.84l-3.87,1.68l-2.23,-0.36l-1.73,-1.75l-6.07,-3.53l0.03,-1.01l4.79,0.55l0.3,-0.16l-0.04,-0.34l-2.55,-2.89l2.59,-2.05ZM174.44,40.56l1.49,1.87l0.07,2.48l-1.07,3.52l-3.87,0.48l-2.41,-0.72l0.05,-2.72l-0.33,-0.3l-3.79,0.36l-0.13,-3.31l2.36,0.14l0.15,-0.03l3.7,-1.74l3.44,0.29l0.31,-0.22l0.03,-0.12ZM170.14,31.5l0.75,1.74l-3.52,-0.52l-4.19,-1.77l-4.65,-0.17l1.65,-1.11l-0.05,-0.52l-2.86,-1.26l-0.13,-1.58l4.52,0.7l6.66,1.99l1.84,2.5ZM134.64,58.08l-1.08,1.93l0.34,0.44l5.44,-1.41l3.37,2.32l0.37,-0.02l2.66,-2.28l2.03,1.38l2.01,4.53l0.53,0.04l1.26,-1.93l0.03,-0.27l-1.67,-4.55l1.82,-0.58l2.36,0.73l2.69,1.84l1.53,4.46l0.77,3.24l0.15,0.19l4.22,2.26l4.32,2.04l-0.21,1.51l-3.87,0.34l-0.19,0.5l1.45,1.54l-0.65,1.23l-4.3,-0.65l-4.4,-1.19l-2.97,0.28l-4.67,1.48l-6.31,0.65l-4.27,0.39l-1.26,-1.91l-0.15,-0.12l-3.42,-1.2l-0.16,-0.01l-2.05,0.45l-2.66,-3.02l1.2,-0.34l3.82,-0.76l3.58,0.19l3.27,-0.78l0.23,-0.29l-0.24,-0.29l-4.84,-1.06l-5.42,0.35l-3.4,-0.09l-0.97,-1.22l5.39,-1.7l0.21,-0.33l-0.3,-0.25l-3.82,0.06l-3.95,-1.1l1.88,-3.13l1.68,-1.81l6.54,-2.84l2.11,0.77ZM158.85,56.58l-1.82,2.62l-3.38,-2.9l0.49,-0.39l3.17,-0.18l1.54,0.86ZM149.71,42.7l1.0,1.87l0.37,0.14l2.17,-0.83l2.33,0.2l0.38,2.16l-1.38,2.17l-8.33,0.76l-6.34,2.15l-3.51,0.1l-0.22,-1.13l4.98,-2.12l0.17,-0.34l-0.31,-0.23l-11.27,0.6l-3.04,-0.78l3.14,-4.57l2.2,-1.35l6.87,1.7l4.4,3.0l0.14,0.05l4.37,0.39l0.27,-0.48l-3.41,-4.68l1.96,-1.62l2.28,0.53l0.79,2.32ZM145.44,29.83l-2.18,0.77l-3.79,-0.0l0.02,-0.31l2.34,-1.5l1.2,0.23l2.42,0.83ZM144.83,34.5l-4.44,1.46l-3.18,-1.48l1.6,-1.36l3.51,-0.53l3.1,0.75l-0.6,1.16ZM119.02,65.87l-6.17,2.07l-1.19,-1.82l-0.13,-0.11l-5.48,-2.32l0.92,-1.7l1.73,-3.44l2.16,-3.15l-0.02,-0.36l-2.09,-2.56l7.84,-0.71l3.59,1.02l6.32,0.27l2.35,1.37l2.25,1.71l-2.68,1.04l-6.21,3.41l-3.1,3.28l-0.08,0.21l0.0,1.81ZM129.66,35.4l-0.3,3.55l-1.77,1.67l-2.34,0.27l-4.62,2.2l-3.89,0.76l-2.83,-0.93l3.85,-3.52l5.04,-3.36l3.75,0.07l3.11,-0.7ZM111.24,152.74l-0.82,0.29l-3.92,-1.39l-0.7,-1.06l-0.12,-0.1l-2.15,-1.09l-0.41,-0.84l-0.2,-0.16l-2.44,-0.56l-0.84,-1.56l0.1,-0.36l2.34,0.64l1.53,0.5l2.28,0.34l0.78,1.04l1.24,1.55l0.09,0.08l2.42,1.3l0.81,1.39ZM88.54,134.82l0.14,0.02l2.0,-0.23l-0.67,3.48l0.06,0.24l1.78,2.22l-0.24,-0.0l-1.4,-1.42l-0.91,-1.53l-1.26,-1.08l-0.42,-1.35l0.09,-0.66l0.82,0.31Z", "name": "Canada"}, "CG": {"path": "M453.66,296.61l-0.9,-0.82l-0.35,-0.04l-0.83,0.48l-0.77,0.83l-1.65,-2.13l1.66,-1.2l0.08,-0.39l-0.81,-1.43l0.59,-0.43l1.62,-0.29l0.24,-0.24l0.1,-0.58l0.94,0.84l0.19,0.08l2.21,0.11l0.27,-0.14l0.81,-1.29l0.32,-1.76l-0.27,-1.96l-0.06,-0.15l-1.08,-1.35l1.02,-2.74l-0.09,-0.34l-0.62,-0.5l-0.22,-0.06l-1.66,0.18l-0.55,-1.03l0.12,-0.73l2.85,0.09l1.98,0.65l2.0,0.59l0.38,-0.25l0.17,-1.3l1.26,-2.24l1.34,-1.19l1.54,0.38l1.35,0.12l-0.11,1.15l-0.74,1.34l-0.5,1.61l-0.31,2.22l0.12,1.41l-0.4,0.9l-0.06,0.88l-0.24,0.67l-1.57,1.15l-1.24,1.41l-1.09,2.43l-0.03,0.13l0.08,1.95l-0.55,0.69l-1.46,1.23l-1.32,1.41l-0.61,-0.29l-0.13,-0.57l-0.29,-0.23l-1.36,-0.02l-0.23,0.1l-0.72,0.81l-0.41,-0.16Z", "name": "Republic of the Congo"}, "CF": {"path": "M459.41,266.56l1.9,-0.17l0.22,-0.12l0.36,-0.5l0.14,0.02l0.55,0.51l0.29,0.07l3.15,-0.96l0.12,-0.07l1.05,-0.97l1.29,-0.87l0.12,-0.33l-0.17,-0.61l0.38,-0.12l2.36,0.15l0.15,-0.03l2.36,-1.17l0.12,-0.1l1.78,-2.72l1.18,-0.96l1.23,-0.34l0.21,0.79l0.07,0.13l1.37,1.5l0.01,0.86l-0.39,1.0l-0.01,0.17l0.16,0.78l0.1,0.17l0.91,0.76l1.89,1.09l1.24,0.92l0.02,0.67l0.12,0.23l1.67,1.3l0.99,1.03l0.61,1.46l0.14,0.15l1.79,0.95l0.2,0.4l-0.44,0.14l-1.54,-0.06l-1.98,-0.26l-0.93,0.22l-0.19,0.14l-0.3,0.48l-0.57,0.05l-0.91,-0.49l-0.26,-0.01l-2.7,1.21l-1.04,-0.23l-0.21,0.03l-0.34,0.19l-0.12,0.13l-0.64,1.3l-1.67,-0.43l-1.77,-0.24l-1.58,-0.91l-2.06,-0.85l-0.27,0.02l-1.42,0.88l-0.97,1.27l-0.06,0.14l-0.19,1.46l-1.3,-0.11l-1.67,-0.42l-0.27,0.07l-1.55,1.41l-0.99,1.76l-0.14,-1.18l-0.13,-0.22l-1.1,-0.78l-0.86,-1.2l-0.2,-0.84l-0.07,-0.13l-1.07,-1.19l0.16,-0.59l0.0,-0.15l-0.24,-1.01l0.18,-1.77l0.5,-0.38l0.09,-0.11l1.18,-2.4Z", "name": "Central African Republic"}, "CD": {"path": "M497.85,276.25l-0.14,2.77l0.2,0.3l0.57,0.19l-0.47,0.52l-1.0,0.71l-0.96,1.31l-0.56,1.22l-0.16,2.04l-0.54,0.89l-0.04,0.15l-0.02,1.76l-0.63,0.61l-0.09,0.2l-0.08,1.33l-0.2,0.11l-0.15,0.21l-0.23,1.37l0.03,0.2l0.6,1.08l0.16,2.96l0.44,2.29l-0.24,1.25l0.01,0.15l0.5,1.46l0.07,0.12l1.41,1.37l1.09,2.56l-0.51,-0.11l-3.45,0.45l-0.67,0.3l-0.15,0.15l-0.71,1.61l0.01,0.26l0.52,1.03l-0.43,2.9l-0.31,2.55l0.13,0.29l0.7,0.46l1.75,0.99l0.31,-0.01l0.26,-0.17l0.15,1.9l-1.44,-0.02l-0.94,-1.28l-0.94,-1.1l-0.17,-0.1l-1.76,-0.33l-0.5,-1.18l-0.42,-0.15l-1.44,0.75l-1.79,-0.32l-0.77,-1.05l-0.2,-0.12l-1.59,-0.23l-0.97,0.04l-0.1,-0.53l-0.27,-0.25l-0.86,-0.06l-1.13,-0.15l-1.62,0.37l-1.04,-0.06l-0.32,0.09l0.11,-2.56l-0.08,-0.21l-0.77,-0.87l-0.17,-1.41l0.36,-1.47l-0.03,-0.21l-0.48,-0.91l-0.04,-1.52l-0.3,-0.29l-2.65,0.02l0.13,-0.53l-0.29,-0.37l-1.28,0.01l-0.28,0.21l-0.07,0.24l-1.35,0.09l-0.26,0.18l-0.62,1.45l-0.25,0.42l-1.17,-0.3l-0.19,0.01l-0.79,0.34l-1.44,0.18l-1.41,-1.96l-0.7,-1.47l-0.61,-1.86l-0.28,-0.21l-7.39,-0.03l-0.92,0.3l-0.78,-0.03l-0.78,0.25l-0.11,-0.25l0.35,-0.15l0.18,-0.26l0.07,-1.02l0.33,-0.52l0.72,-0.42l0.52,0.2l0.33,-0.08l0.76,-0.86l0.99,0.02l0.11,0.48l0.16,0.2l0.94,0.44l0.35,-0.07l1.46,-1.56l1.44,-1.21l0.68,-0.85l0.06,-0.2l-0.08,-1.99l1.04,-2.33l1.1,-1.23l1.62,-1.19l0.11,-0.14l0.29,-0.8l0.08,-0.94l0.38,-0.82l0.03,-0.16l-0.13,-1.38l0.3,-2.16l0.47,-1.51l0.73,-1.31l0.04,-0.12l0.15,-1.51l0.21,-1.66l0.89,-1.16l1.16,-0.7l1.9,0.79l1.69,0.95l1.81,0.24l1.85,0.48l0.35,-0.16l0.71,-1.43l0.16,-0.09l1.03,0.23l0.19,-0.02l2.65,-1.19l0.86,0.46l0.17,0.03l0.81,-0.08l0.23,-0.14l0.31,-0.5l0.75,-0.17l1.83,0.26l1.64,0.06l0.72,-0.21l1.39,1.9l0.16,0.11l1.12,0.3l0.24,-0.04l0.58,-0.36l1.05,0.15l0.15,-0.02l1.15,-0.44l0.47,0.84l0.08,0.09l2.08,1.57Z", "name": "Democratic Republic of the Congo"}, "CZ": {"path": "M463.29,152.22l-0.88,-0.47l-0.18,-0.03l-1.08,0.15l-1.86,-0.94l-0.21,-0.02l-0.88,0.24l-0.13,0.07l-1.25,1.17l-1.63,-0.91l-1.38,-1.36l-1.22,-0.75l-0.24,-1.24l-0.33,-0.75l1.53,-0.6l0.98,-0.84l1.74,-0.62l0.11,-0.07l0.47,-0.47l0.46,0.27l0.24,0.03l0.96,-0.3l1.06,0.95l0.15,0.07l1.57,0.24l-0.1,0.6l0.16,0.32l1.36,0.68l0.41,-0.15l0.28,-0.62l1.29,0.28l0.19,0.84l0.26,0.23l1.73,0.18l0.74,1.02l-0.17,0.0l-0.25,0.13l-0.32,0.49l-0.46,0.11l-0.22,0.23l-0.13,0.57l-0.32,0.1l-0.2,0.22l-0.03,0.14l-0.65,0.25l-1.05,-0.05l-0.28,0.17l-0.22,0.43Z", "name": "Czech Republic"}, "CY": {"path": "M505.03,193.75l-1.51,0.68l-1.0,-0.3l-0.32,-0.63l0.69,-0.06l0.41,0.13l0.19,-0.0l0.62,-0.22l0.31,0.02l0.06,0.22l0.49,0.17l0.06,-0.01Z", "name": "Cyprus"}, "CR": {"path": "M213.0,263.84l-0.98,-0.4l-0.3,-0.31l0.16,-0.24l0.05,-0.21l-0.09,-0.56l-0.1,-0.18l-0.76,-0.65l-0.99,-0.5l-0.74,-0.28l-0.13,-0.58l-0.12,-0.18l-0.66,-0.45l-0.34,-0.0l-0.13,0.31l0.13,0.59l-0.17,0.21l-0.34,-0.42l-0.14,-0.1l-0.7,-0.22l-0.23,-0.34l0.01,-0.62l0.31,-0.74l-0.14,-0.38l-0.3,-0.15l0.47,-0.4l1.48,0.6l0.26,-0.02l0.47,-0.27l0.58,0.15l0.35,0.44l0.17,0.11l0.74,0.17l0.27,-0.07l0.3,-0.27l0.52,1.09l0.97,1.02l0.77,0.71l-0.41,0.1l-0.23,0.3l0.01,1.02l0.12,0.24l0.2,0.14l-0.07,0.05l-0.11,0.3l0.08,0.37l-0.23,0.63Z", "name": "Costa Rica"}, "CU": {"path": "M215.01,226.09l2.08,0.18l1.94,0.03l2.24,0.86l0.95,0.92l0.25,0.08l2.22,-0.28l0.79,0.55l3.68,2.81l0.19,0.06l0.77,-0.03l1.18,0.42l-0.12,0.47l0.27,0.37l1.78,0.1l1.59,0.9l-0.11,0.22l-1.5,0.3l-1.64,0.13l-1.75,-0.2l-2.69,0.19l1.0,-0.86l-0.03,-0.48l-1.02,-0.68l-0.13,-0.05l-1.52,-0.16l-0.74,-0.64l-0.57,-1.42l-0.3,-0.19l-1.36,0.1l-2.23,-0.67l-0.71,-0.52l-0.14,-0.06l-3.2,-0.4l-0.42,-0.25l0.56,-0.39l0.12,-0.33l-0.27,-0.22l-2.46,-0.13l-0.2,0.06l-1.72,1.31l-0.94,0.03l-0.25,0.15l-0.29,0.53l-1.04,0.24l-0.29,-0.07l0.7,-0.43l0.1,-0.11l0.5,-0.87l1.04,-0.54l1.23,-0.49l1.86,-0.25l0.62,-0.28Z", "name": "Cuba"}, "SZ": {"path": "M500.95,353.41l-0.41,0.97l-1.16,0.23l-1.29,-1.26l-0.02,-0.71l0.63,-0.93l0.23,-0.7l0.47,-0.12l1.04,0.4l0.32,1.05l0.2,1.08Z", "name": "Swaziland"}, "SY": {"path": "M510.84,199.83l0.09,-0.11l0.07,-0.2l-0.04,-1.08l0.56,-1.4l1.3,-1.01l0.1,-0.34l-0.41,-1.11l-0.24,-0.19l-0.89,-0.11l-0.2,-1.84l0.55,-1.05l1.3,-1.22l0.09,-0.19l0.09,-1.09l0.39,0.27l0.25,0.04l2.66,-0.77l1.35,0.52l2.06,-0.01l2.93,-1.08l1.35,0.04l2.14,-0.34l-0.83,1.16l-1.31,0.68l-0.16,0.3l0.23,2.03l-0.9,3.25l-5.43,2.87l-4.79,2.91l-2.32,-0.92Z", "name": "Syria"}, "KG": {"path": "M599.04,172.15l0.38,-0.9l1.43,-0.37l4.04,1.02l0.37,-0.23l0.36,-1.64l1.17,-0.52l3.45,1.24l0.2,-0.0l0.86,-0.31l4.09,0.08l3.61,0.31l1.18,1.02l0.11,0.06l1.19,0.34l-0.13,0.26l-3.84,1.58l-0.13,0.1l-0.81,1.08l-3.08,0.34l-0.24,0.16l-0.85,1.7l-2.43,-0.37l-0.14,0.01l-1.79,0.61l-2.39,1.4l-0.12,0.39l0.25,0.49l-0.48,0.45l-4.57,0.43l-3.04,-0.94l-2.45,0.18l0.14,-1.02l2.42,0.44l0.27,-0.08l0.81,-0.81l1.76,0.27l0.21,-0.05l3.21,-2.14l-0.03,-0.51l-2.97,-1.57l-0.26,-0.01l-1.64,0.69l-1.38,-0.84l1.81,-1.67l-0.09,-0.5l-0.46,-0.18Z", "name": "Kyrgyzstan"}, "KE": {"path": "M523.3,287.04l0.06,0.17l1.29,1.8l-1.46,0.84l-0.11,0.11l-0.55,0.93l-0.81,0.16l-0.24,0.24l-0.34,1.69l-0.81,1.06l-0.46,1.58l-0.76,0.63l-3.3,-2.3l-0.16,-1.32l-0.15,-0.23l-9.35,-5.28l-0.02,-2.4l1.92,-2.63l0.91,-1.83l0.01,-0.24l-1.09,-2.86l-0.29,-1.24l-1.09,-1.63l2.93,-2.85l0.92,0.3l0.0,1.19l0.09,0.22l0.86,0.83l0.21,0.08l1.65,0.0l3.09,2.08l0.16,0.05l0.79,0.03l0.54,-0.06l0.58,0.28l1.67,0.2l0.28,-0.12l0.69,-0.98l2.04,-0.94l0.86,0.73l0.19,0.07l1.1,0.0l-1.82,2.36l-0.06,0.18l0.03,9.12Z", "name": "Kenya"}, "SS": {"path": "M505.7,261.39l0.02,1.64l-0.27,0.55l-1.15,0.05l-0.24,0.15l-0.85,1.44l0.22,0.45l1.44,0.17l1.15,1.12l0.42,0.95l0.14,0.15l1.06,0.54l1.33,2.45l-3.06,2.98l-1.44,1.08l-1.75,0.01l-1.92,0.56l-1.5,-0.53l-0.27,0.03l-0.85,0.57l-1.98,-1.5l-0.56,-1.02l-0.37,-0.13l-1.32,0.5l-1.08,-0.15l-0.2,0.04l-0.56,0.35l-0.9,-0.24l-1.44,-1.97l-0.39,-0.77l-0.13,-0.13l-1.78,-0.94l-0.65,-1.5l-1.08,-1.12l-1.57,-1.22l-0.02,-0.68l-0.12,-0.23l-1.37,-1.02l-1.17,-0.68l0.2,-0.08l0.86,-0.48l0.14,-0.18l0.63,-2.22l0.6,-1.02l1.47,-0.28l0.35,0.56l1.29,1.48l0.14,0.09l0.69,0.22l0.22,-0.02l0.83,-0.4l1.58,0.08l0.26,0.39l0.25,0.13l2.49,0.0l0.3,-0.25l0.06,-0.35l1.13,-0.42l0.18,-0.18l0.22,-0.63l0.68,-0.38l1.95,1.37l0.23,0.05l1.29,-0.26l0.19,-0.12l1.23,-1.8l1.36,-1.37l0.08,-0.25l-0.21,-1.52l-0.06,-0.15l-0.25,-0.3l0.94,-0.08l0.26,-0.21l0.1,-0.32l0.6,0.09l-0.25,1.67l0.3,1.83l0.11,0.19l1.22,0.94l0.25,0.73l-0.04,1.2l0.26,0.31l0.09,0.01Z", "name": "South Sudan"}, "SR": {"path": "M278.1,270.26l2.71,0.45l0.31,-0.14l0.19,-0.32l1.82,-0.16l2.25,0.56l-1.09,1.81l-0.04,0.19l0.2,1.72l0.05,0.13l0.9,1.35l-0.39,0.99l-0.21,1.09l-0.48,0.8l-1.2,-0.44l-0.17,-0.01l-1.12,0.24l-0.95,-0.21l-0.35,0.2l-0.25,0.73l0.05,0.29l0.3,0.35l-0.06,0.13l-1.01,-0.15l-1.42,-2.03l-0.32,-1.36l-0.29,-0.23l-0.63,-0.0l-0.95,-1.56l0.41,-1.16l0.01,-0.17l-0.08,-0.35l1.29,-0.56l0.18,-0.22l0.35,-1.97Z", "name": "Suriname"}, "KH": {"path": "M680.28,257.89l-0.93,-1.2l-1.24,-2.56l-0.56,-2.9l1.45,-1.92l3.07,-0.46l2.26,0.35l2.03,0.98l0.38,-0.11l1.0,-1.55l1.86,0.79l0.52,1.51l-0.28,2.82l-4.05,1.88l-0.12,0.45l0.79,1.1l-2.2,0.17l-2.08,0.98l-1.89,-0.33Z", "name": "Cambodia"}, "SV": {"path": "M197.02,248.89l0.18,-0.05l0.59,0.17l0.55,0.51l0.64,0.35l0.06,0.22l0.37,0.21l1.01,-0.28l0.38,0.13l0.16,0.13l-0.14,0.81l-0.18,0.38l-1.22,-0.03l-0.84,-0.23l-1.11,-0.52l-1.31,-0.15l-0.49,-0.38l0.02,-0.08l0.76,-0.57l0.46,-0.27l0.11,-0.35Z", "name": "El Salvador"}, "SK": {"path": "M468.01,150.02l0.05,0.07l0.36,0.1l0.85,-0.37l1.12,1.02l0.33,0.05l1.38,-0.65l1.07,0.3l0.16,0.0l1.69,-0.43l1.95,1.02l-0.51,0.64l-0.45,1.2l-0.32,0.2l-2.55,-0.93l-0.17,-0.01l-0.82,0.2l-0.17,0.11l-0.53,0.68l-0.94,0.32l-0.14,-0.11l-0.29,-0.04l-1.18,0.48l-0.95,0.09l-0.26,0.21l-0.15,0.47l-1.84,0.34l-0.82,-0.31l-1.14,-0.73l-0.2,-0.89l0.42,-0.84l0.91,0.05l0.12,-0.02l0.86,-0.33l0.18,-0.21l0.03,-0.13l0.32,-0.1l0.2,-0.22l0.12,-0.55l0.39,-0.1l0.18,-0.13l0.3,-0.45l0.43,-0.0Z", "name": "Slovakia"}, "KR": {"path": "M737.31,185.72l0.84,0.08l0.27,-0.12l0.89,-1.2l1.63,-0.13l1.1,-0.2l0.21,-0.16l0.12,-0.24l1.86,2.95l0.59,1.79l0.02,3.17l-0.84,1.38l-2.23,0.55l-1.95,1.14l-1.91,0.21l-0.22,-1.21l0.45,-2.07l-0.01,-0.17l-0.99,-2.67l1.54,-0.4l0.17,-0.46l-1.55,-2.24Z", "name": "South Korea"}, "SI": {"path": "M455.77,159.59l1.79,0.21l0.18,-0.04l1.2,-0.68l2.12,-0.08l0.21,-0.1l0.38,-0.42l0.1,0.01l0.28,0.62l-1.71,0.71l-0.18,0.22l-0.21,1.1l-0.71,0.26l-0.2,0.28l0.01,0.55l-0.59,-0.04l-0.79,-0.47l-0.38,0.06l-0.36,0.41l-0.84,-0.05l0.05,-0.15l-0.56,-1.24l0.21,-1.17Z", "name": "Slovenia"}, "KP": {"path": "M747.76,172.02l-0.23,-0.04l-0.26,0.08l-1.09,1.02l-0.78,1.06l-0.06,0.19l0.09,1.95l-1.12,0.57l-0.53,0.58l-0.88,0.82l-1.69,0.51l-1.09,0.79l-0.12,0.22l-0.07,1.17l-0.22,0.25l0.09,0.47l0.96,0.46l1.22,1.1l-0.19,0.37l-0.91,0.16l-1.75,0.14l-0.22,0.12l-0.87,1.18l-0.95,-0.09l-0.3,0.18l-0.97,-0.44l-0.39,0.13l-0.25,0.44l-0.29,0.09l-0.03,-0.2l-0.18,-0.23l-0.62,-0.25l-0.43,-0.29l0.52,-0.97l0.52,-0.3l0.13,-0.38l-0.18,-0.42l0.59,-1.47l0.01,-0.21l-0.16,-0.48l-0.22,-0.2l-1.41,-0.31l-0.82,-0.55l1.74,-1.62l2.73,-1.58l1.62,-1.96l0.96,0.76l0.17,0.06l2.17,0.11l0.31,-0.37l-0.32,-1.31l3.61,-1.21l0.16,-0.13l0.79,-1.34l1.25,1.38Z", "name": "North Korea"}, "SO": {"path": "M543.8,256.48l0.61,-0.05l1.14,-0.37l1.31,-0.25l0.12,-0.05l1.11,-0.81l0.57,-0.0l0.03,0.39l-0.23,1.49l0.01,1.25l-0.52,0.92l-0.7,2.71l-1.19,2.79l-1.54,3.2l-2.13,3.66l-2.12,2.79l-2.92,3.39l-2.47,2.0l-3.76,2.5l-2.33,1.9l-2.77,3.06l-0.61,1.35l-0.28,0.29l-1.22,-1.69l-0.03,-8.92l2.12,-2.76l0.59,-0.68l1.47,-0.04l0.18,-0.06l2.15,-1.71l3.16,-0.11l0.21,-0.09l7.08,-7.55l1.76,-2.12l1.14,-1.57l0.06,-0.18l0.01,-4.67Z", "name": "Somalia"}, "SN": {"path": "M379.28,250.34l-0.95,-1.82l-0.09,-0.1l-0.83,-0.6l0.62,-0.28l0.13,-0.11l1.21,-1.8l0.6,-1.31l0.71,-0.68l1.09,0.2l0.18,-0.02l1.17,-0.53l1.25,-0.03l1.17,0.73l1.59,0.65l1.47,1.83l1.59,1.7l0.12,1.56l0.49,1.46l0.1,0.14l0.85,0.65l0.18,0.82l-0.08,0.57l-0.13,0.05l-1.29,-0.19l-0.29,0.13l-0.11,0.16l-0.35,0.04l-1.83,-0.61l-5.84,-0.13l-0.12,0.02l-0.6,0.26l-0.87,-0.06l-1.01,0.32l-0.26,-1.26l1.9,0.04l0.16,-0.04l0.54,-0.32l0.37,-0.02l0.15,-0.05l0.78,-0.5l0.92,0.46l0.12,0.03l1.09,0.04l0.15,-0.03l1.08,-0.57l0.11,-0.44l-0.51,-0.74l-0.39,-0.1l-0.76,0.39l-0.62,-0.01l-0.92,-0.58l-0.18,-0.05l-0.79,0.04l-0.2,0.09l-0.48,0.51l-2.41,0.06Z", "name": "Senegal"}, "SL": {"path": "M392.19,267.53l-0.44,-0.12l-1.73,-0.97l-1.24,-1.28l-0.4,-0.84l-0.27,-1.65l1.21,-1.0l0.09,-0.12l0.27,-0.66l0.32,-0.41l0.56,-0.05l0.16,-0.07l0.5,-0.41l1.75,0.0l0.59,0.77l0.49,0.96l-0.07,0.64l0.04,0.19l0.36,0.58l-0.03,0.84l0.24,0.2l-0.64,0.65l-1.13,1.37l-0.06,0.14l-0.12,0.66l-0.43,0.58Z", "name": "Sierra Leone"}, "SB": {"path": "M826.74,311.51l0.23,0.29l-0.95,-0.01l-0.39,-0.63l0.65,0.27l0.45,0.09ZM825.01,308.52l-1.18,-1.39l-0.37,-1.06l0.24,0.0l0.82,1.84l0.49,0.6ZM823.21,309.42l-0.44,0.03l-1.43,-0.24l-0.32,-0.24l0.08,-0.5l1.29,0.31l0.72,0.47l0.11,0.18ZM817.9,303.81l2.59,1.44l0.3,0.41l-1.21,-0.66l-1.34,-0.89l-0.34,-0.3ZM813.77,302.4l0.48,0.34l0.1,0.08l-0.33,-0.17l-0.25,-0.25Z", "name": "Solomon Islands"}, "SA": {"path": "M528.24,243.1l-0.2,-0.69l-0.07,-0.12l-0.69,-0.71l-0.18,-0.94l-0.12,-0.19l-1.24,-0.89l-1.28,-2.09l-0.7,-2.08l-0.07,-0.11l-1.73,-1.79l-0.11,-0.07l-1.03,-0.39l-1.57,-2.36l-0.27,-1.72l0.1,-1.53l-0.03,-0.15l-1.44,-2.93l-1.25,-1.13l-1.34,-0.56l-0.72,-1.33l0.11,-0.49l-0.02,-0.2l-0.7,-1.38l-0.08,-0.1l-0.68,-0.56l-0.97,-1.98l-2.8,-4.03l-0.25,-0.13l-0.85,0.01l0.29,-1.11l0.12,-0.97l0.23,-0.81l2.52,0.39l0.23,-0.06l1.08,-0.84l0.6,-0.95l1.78,-0.35l0.22,-0.17l0.37,-0.83l0.74,-0.42l0.08,-0.46l-2.17,-2.4l4.55,-1.26l0.12,-0.06l0.36,-0.32l2.83,0.71l3.67,1.91l7.04,5.5l0.17,0.06l4.64,0.22l2.06,0.24l0.55,1.15l0.28,0.17l1.56,-0.06l0.9,2.15l0.14,0.15l1.14,0.57l0.39,0.85l0.11,0.13l1.59,1.06l0.12,0.91l-0.23,0.83l0.01,0.18l0.32,0.9l0.07,0.11l0.68,0.7l0.33,0.86l0.37,0.65l0.09,0.1l0.76,0.53l0.25,0.04l0.45,-0.12l0.35,0.75l0.1,0.63l0.96,2.68l0.23,0.19l7.53,1.33l0.27,-0.09l0.24,-0.26l0.87,1.41l-1.58,4.96l-7.34,2.54l-7.28,1.02l-2.34,1.17l-0.12,0.1l-1.74,2.63l-0.86,0.32l-0.49,-0.68l-0.28,-0.12l-0.92,0.12l-2.32,-0.25l-0.41,-0.23l-0.15,-0.04l-2.89,0.06l-0.63,0.2l-0.91,-0.59l-0.43,0.11l-0.66,1.27l-0.03,0.21l0.21,0.89l-0.6,0.45Z", "name": "Saudi Arabia"}, "SE": {"path": "M476.42,90.44l-0.15,0.1l-2.43,2.86l-0.07,0.24l0.36,2.31l-3.84,3.1l-4.83,3.38l-0.11,0.15l-1.82,5.45l0.03,0.26l1.78,2.68l2.27,1.99l-2.13,3.88l-2.49,0.82l-0.2,0.24l-0.95,6.05l-1.32,3.09l-2.82,-0.32l-0.3,0.16l-1.34,2.64l-2.48,0.14l-0.76,-3.15l-2.09,-4.04l-1.85,-5.01l1.03,-1.98l2.06,-2.53l0.06,-0.13l0.83,-4.45l-0.06,-0.25l-1.54,-1.86l-0.15,-5.0l1.52,-3.48l2.28,0.06l0.27,-0.16l0.87,-1.59l-0.01,-0.31l-0.8,-1.21l3.79,-5.63l4.07,-7.54l2.23,0.01l0.29,-0.22l0.59,-2.15l4.46,0.66l0.34,-0.26l0.34,-2.64l1.21,-0.14l3.24,2.08l3.78,2.85l0.06,6.37l0.03,0.14l0.67,1.29l-3.95,1.07Z", "name": "Sweden"}, "SD": {"path": "M505.98,259.75l-0.31,-0.9l-0.1,-0.14l-1.2,-0.93l-0.27,-1.66l0.29,-1.83l-0.25,-0.34l-1.16,-0.17l-0.33,0.21l-0.11,0.37l-1.3,0.11l-0.21,0.49l0.55,0.68l0.18,1.29l-1.31,1.33l-1.18,1.72l-1.04,0.21l-2.0,-1.4l-0.32,-0.02l-0.95,0.52l-0.14,0.16l-0.21,0.6l-1.16,0.43l-0.19,0.23l-0.04,0.27l-2.08,0.0l-0.25,-0.39l-0.24,-0.13l-1.81,-0.09l-0.14,0.03l-0.8,0.38l-0.49,-0.16l-1.22,-1.39l-0.42,-0.67l-0.31,-0.14l-1.81,0.35l-0.2,0.14l-0.72,1.24l-0.61,2.14l-0.73,0.4l-0.62,0.22l-0.83,-0.68l-0.12,-0.6l0.38,-0.97l0.01,-1.14l-0.08,-0.2l-1.39,-1.53l-0.25,-0.97l0.03,-0.57l-0.11,-0.25l-0.81,-0.66l-0.03,-1.34l-0.04,-0.14l-0.52,-0.98l-0.31,-0.15l-0.42,0.07l0.12,-0.44l0.63,-1.03l0.03,-0.23l-0.24,-0.88l0.69,-0.66l0.02,-0.41l-0.4,-0.46l0.58,-1.39l1.04,-1.71l1.97,0.16l0.32,-0.3l-0.12,-10.24l0.02,-0.8l2.59,-0.01l0.3,-0.3l0.0,-4.92l29.19,0.0l0.68,2.17l-0.4,0.35l-0.1,0.27l0.36,2.69l0.93,3.15l0.12,0.16l2.05,1.4l-0.99,1.15l-1.75,0.4l-0.15,0.08l-0.79,0.79l-0.08,0.17l-0.24,1.69l-1.07,3.75l-0.0,0.16l0.25,0.96l-0.38,2.1l-0.98,2.41l-1.52,1.3l-1.07,1.94l-0.25,0.99l-1.08,0.64l-0.13,0.18l-0.46,1.65Z", "name": "Sudan"}, "DO": {"path": "M241.7,234.97l0.15,-0.22l1.73,0.01l1.43,0.64l0.15,0.03l0.45,-0.04l0.36,0.74l0.28,0.17l1.02,-0.04l-0.04,0.43l0.27,0.33l1.03,0.09l0.91,0.7l-0.57,0.64l-0.99,-0.47l-0.16,-0.03l-1.11,0.11l-0.79,-0.12l-0.26,0.09l-0.38,0.4l-0.66,0.11l-0.28,-0.45l-0.38,-0.12l-0.83,0.37l-0.14,0.13l-0.85,1.49l-0.27,-0.17l-0.1,-0.58l0.05,-0.67l-0.07,-0.21l-0.44,-0.53l0.35,-0.25l0.12,-0.19l0.19,-1.0l-0.2,-1.4Z", "name": "Dominican Republic"}, "DJ": {"path": "M528.78,253.36l0.34,0.45l-0.06,0.76l-1.26,0.54l-0.05,0.53l0.82,0.53l-0.57,0.83l-0.3,-0.25l-0.27,-0.05l-0.56,0.17l-1.07,-0.03l-0.04,-0.56l-0.16,-0.56l0.76,-1.07l0.76,-0.97l0.89,0.18l0.25,-0.06l0.51,-0.42Z", "name": "Djibouti"}, "DK": {"path": "M452.4,129.07l-1.27,2.39l-2.25,-1.69l-0.26,-1.08l3.15,-1.0l0.63,1.39ZM447.87,126.25l-0.35,0.76l-0.47,-0.24l-0.38,0.09l-1.8,2.53l-0.03,0.29l0.56,1.4l-1.22,0.4l-1.68,-0.41l-0.92,-1.76l-0.07,-3.47l0.38,-0.88l0.62,-0.93l2.07,-0.21l0.19,-0.1l0.84,-0.95l1.5,-0.76l-0.06,1.26l-0.7,1.1l-0.03,0.25l0.3,1.0l0.18,0.19l1.06,0.42Z", "name": "Denmark"}, "DE": {"path": "M445.51,131.69l0.03,0.94l0.21,0.28l2.32,0.74l-0.02,1.0l0.37,0.3l2.55,-0.65l1.36,-0.89l2.63,1.27l1.09,1.01l0.51,1.51l-0.6,0.78l-0.0,0.36l0.88,1.17l0.58,1.68l-0.18,1.08l0.03,0.18l0.87,1.81l-0.66,0.2l-0.55,-0.32l-0.36,0.05l-0.58,0.58l-1.73,0.62l-0.99,0.84l-1.77,0.7l-0.16,0.4l0.42,0.94l0.26,1.34l0.14,0.2l1.25,0.76l1.22,1.2l-0.71,1.2l-0.81,0.37l-0.17,0.32l0.34,1.99l-0.04,0.09l-0.47,-0.39l-0.17,-0.07l-1.2,-0.1l-1.85,0.57l-2.15,-0.13l-0.29,0.18l-0.21,0.5l-0.96,-0.67l-0.24,-0.05l-0.67,0.16l-2.6,-0.94l-0.34,0.1l-0.42,0.57l-1.64,-0.02l0.26,-1.88l1.24,-2.15l-0.21,-0.45l-3.54,-0.58l-0.98,-0.71l0.12,-1.26l-0.05,-0.2l-0.44,-0.64l0.27,-2.18l-0.38,-3.14l1.17,-0.0l0.27,-0.17l0.63,-1.26l0.65,-3.17l-0.02,-0.17l-0.41,-1.0l0.32,-0.47l1.77,-0.16l0.37,0.6l0.47,0.06l1.7,-1.69l0.06,-0.33l-0.55,-1.24l-0.09,-1.51l1.5,0.36l0.16,-0.01l1.22,-0.4Z", "name": "Germany"}, "YE": {"path": "M553.53,242.65l-1.51,0.58l-0.17,0.16l-0.48,1.14l-0.07,0.79l-2.31,1.0l-3.98,1.19l-2.28,1.8l-0.97,0.12l-0.7,-0.14l-0.23,0.05l-1.42,1.03l-1.51,0.47l-2.07,0.13l-0.68,0.15l-0.17,0.1l-0.49,0.6l-0.57,0.16l-0.18,0.13l-0.3,0.49l-1.06,-0.05l-0.13,0.02l-0.73,0.32l-1.48,-0.11l-0.55,-1.26l0.07,-1.32l-0.04,-0.16l-0.39,-0.72l-0.48,-1.85l-0.52,-0.79l0.08,-0.02l0.22,-0.36l-0.23,-1.05l0.24,-0.39l0.04,-0.19l-0.09,-0.95l0.96,-0.72l0.11,-0.31l-0.23,-0.98l0.46,-0.88l0.75,0.49l0.26,0.03l0.63,-0.22l2.76,-0.06l0.5,0.25l2.42,0.26l0.85,-0.11l0.52,0.71l0.35,0.1l1.17,-0.43l0.15,-0.12l1.75,-2.64l2.22,-1.11l6.95,-0.96l2.55,5.58Z", "name": "Yemen"}, "AT": {"path": "M463.17,154.15l-0.14,0.99l-1.15,0.01l-0.24,0.47l0.39,0.56l-0.75,1.84l-0.36,0.4l-2.06,0.07l-0.14,0.04l-1.18,0.67l-1.96,-0.23l-3.43,-0.78l-0.5,-0.97l-0.33,-0.16l-2.47,0.55l-0.2,0.16l-0.18,0.37l-1.27,-0.38l-1.28,-0.09l-0.81,-0.41l0.25,-0.51l0.03,-0.18l-0.05,-0.28l0.35,-0.08l1.16,0.81l0.45,-0.13l0.27,-0.64l2.0,0.12l1.84,-0.57l1.05,0.09l0.71,0.59l0.47,-0.11l0.23,-0.54l0.02,-0.17l-0.32,-1.85l0.69,-0.31l0.13,-0.12l0.73,-1.23l1.61,0.89l0.35,-0.04l1.35,-1.27l0.7,-0.19l1.84,0.93l0.18,0.03l1.08,-0.15l0.81,0.43l-0.07,0.15l-0.02,0.2l0.24,1.06Z", "name": "Austria"}, "DZ": {"path": "M450.58,224.94l-8.31,4.86l-7.23,5.12l-3.46,1.13l-2.42,0.22l-0.02,-1.33l-0.2,-0.28l-1.15,-0.42l-1.45,-0.69l-0.55,-1.13l-0.1,-0.12l-8.45,-5.72l-17.72,-12.17l0.03,-0.38l-0.02,-3.21l3.84,-1.91l2.46,-0.41l2.1,-0.75l0.14,-0.11l0.9,-1.3l2.84,-1.06l0.19,-0.27l0.09,-1.81l1.21,-0.2l0.15,-0.07l1.06,-0.96l3.19,-0.46l0.23,-0.18l0.46,-1.08l-0.08,-0.34l-0.6,-0.54l-0.83,-2.85l-0.18,-1.8l-0.82,-1.57l2.13,-1.37l2.65,-0.49l0.13,-0.05l1.55,-1.15l2.34,-0.85l4.2,-0.51l4.07,-0.23l1.21,0.41l0.23,-0.01l2.3,-1.11l2.52,-0.02l0.94,0.62l0.2,0.05l1.25,-0.13l-0.36,1.03l-0.01,0.14l0.39,2.66l-0.56,2.2l-1.49,1.52l-0.08,0.24l0.22,2.12l0.11,0.2l1.94,1.58l0.02,0.54l0.12,0.23l1.45,1.06l1.04,4.85l0.81,2.42l0.13,1.19l-0.43,2.17l0.17,1.28l-0.31,1.53l0.2,1.56l-0.9,1.02l-0.01,0.38l1.43,1.88l0.09,1.06l0.04,0.13l0.89,1.48l0.37,0.12l1.03,-0.43l1.79,1.12l0.89,1.34Z", "name": "Algeria"}, "US": {"path": "M892.64,99.05l1.16,0.57l0.21,0.02l1.45,-0.38l1.92,0.99l2.17,0.47l-1.65,0.72l-1.75,-0.79l-0.93,-0.7l-0.21,-0.06l-2.11,0.22l-0.35,-0.2l0.09,-0.87ZM183.29,150.37l0.39,1.54l0.12,0.17l0.78,0.55l0.14,0.05l1.74,0.2l2.52,0.5l2.4,0.98l0.17,0.02l1.96,-0.4l3.01,0.81l0.91,-0.02l2.22,-0.88l4.67,2.33l3.86,2.01l0.21,0.71l0.15,0.18l0.33,0.17l-0.02,0.05l0.23,0.43l0.67,0.1l0.21,-0.05l0.1,-0.07l0.05,0.29l0.09,0.16l0.5,0.5l0.21,0.09l0.56,0.0l0.13,0.13l-0.2,0.36l0.12,0.41l2.49,1.39l0.99,5.24l-0.69,1.68l-1.16,1.64l-0.6,1.18l-0.06,0.31l0.04,0.22l0.28,0.43l0.11,0.1l0.85,0.47l0.15,0.04l0.63,0.0l0.14,-0.04l2.87,-1.58l2.6,-0.49l3.28,-1.5l0.17,-0.23l0.04,-0.43l-0.23,-0.93l-0.24,-0.39l0.74,-0.32l4.7,-0.01l0.25,-0.13l0.77,-1.15l2.9,-2.41l1.04,-0.52l8.35,-0.02l0.28,-0.21l0.2,-0.6l0.7,-0.14l1.06,-0.48l0.13,-0.11l0.92,-1.49l0.75,-2.39l1.67,-2.08l0.59,0.6l0.3,0.07l1.52,-0.49l0.88,0.72l-0.0,4.14l0.08,0.2l1.6,1.72l0.31,0.72l-2.42,1.35l-2.55,1.05l-2.64,0.9l-0.14,0.11l-1.33,1.81l-0.44,0.7l-0.05,0.15l-0.03,1.6l0.03,0.14l0.83,1.59l0.24,0.16l0.78,0.06l-1.15,0.33l-1.25,-0.04l-1.83,0.52l-2.51,0.29l-2.17,0.88l-0.17,0.36l0.33,0.22l3.55,-0.54l0.15,0.11l-2.87,0.73l-1.19,0.0l-0.16,-0.33l-0.36,0.06l-0.76,0.82l0.17,0.5l0.42,0.08l-0.45,1.75l-1.4,1.74l-0.04,-0.17l-0.21,-0.22l-0.48,-0.13l-0.77,-0.69l-0.36,-0.03l-0.12,0.34l0.52,1.58l0.09,0.14l0.52,0.43l0.03,0.87l-0.74,1.05l-0.39,0.63l0.05,-0.12l-0.08,-0.34l-1.19,-1.03l-0.28,-2.31l-0.26,-0.26l-0.32,0.19l-0.48,1.27l-0.01,0.19l0.39,1.33l-1.14,-0.31l-0.36,0.18l0.14,0.38l1.57,0.85l0.1,2.58l0.22,0.28l0.55,0.15l0.21,0.81l0.33,2.72l-1.46,1.94l-2.5,0.81l-0.12,0.07l-1.58,1.58l-1.15,0.17l-0.15,0.06l-1.27,1.03l-0.09,0.13l-0.32,0.85l-2.71,1.79l-1.45,1.37l-1.18,1.64l-0.05,0.12l-0.39,1.96l0.0,0.13l0.44,1.91l0.85,2.37l1.1,1.91l0.03,1.2l1.16,3.07l-0.08,1.74l-0.1,0.99l-0.57,1.48l-0.54,0.24l-0.97,-0.26l-0.34,-1.02l-0.12,-0.16l-0.89,-0.58l-2.44,-4.28l-0.34,-0.94l0.49,-1.71l-0.02,-0.21l-0.7,-1.5l-2.0,-2.35l-0.11,-0.08l-0.98,-0.42l-0.25,0.01l-2.42,1.19l-0.26,-0.08l-1.26,-1.29l-1.57,-0.68l-0.16,-0.02l-2.79,0.34l-2.18,-0.3l-1.98,0.19l-1.12,0.45l-0.14,0.44l0.4,0.65l-0.04,1.02l0.09,0.22l0.29,0.3l-0.06,0.05l-0.77,-0.33l-0.26,0.01l-0.87,0.48l-1.64,-0.08l-1.79,-1.39l-0.23,-0.06l-2.11,0.33l-1.75,-0.61l-0.14,-0.01l-1.61,0.2l-2.11,0.64l-0.11,0.06l-2.25,1.99l-2.53,1.21l-1.43,1.38l-0.58,1.22l-0.03,0.12l-0.03,1.86l0.13,1.32l0.3,0.62l-0.46,0.04l-1.71,-0.57l-1.85,-0.79l-0.63,-1.14l-0.54,-1.85l-0.07,-0.12l-1.45,-1.51l-0.86,-1.58l-1.26,-1.87l-0.09,-0.09l-1.76,-1.09l-0.17,-0.04l-2.05,0.05l-0.23,0.12l-1.44,1.97l-1.84,-0.72l-1.19,-0.76l-0.6,-1.45l-0.9,-1.52l-1.49,-1.21l-1.27,-0.87l-0.89,-0.96l-0.22,-0.1l-4.34,-0.0l-0.3,0.3l-0.0,0.84l-6.62,0.02l-5.66,-1.93l-3.48,-1.24l0.11,-0.25l-0.3,-0.42l-3.18,0.3l-2.6,0.2l-0.35,-1.19l-0.08,-0.13l-1.62,-1.61l-0.13,-0.08l-1.02,-0.29l-0.22,-0.66l-0.25,-0.2l-1.31,-0.13l-0.82,-0.7l-0.16,-0.07l-2.25,-0.27l-0.48,-0.34l-0.28,-1.44l-0.07,-0.14l-2.41,-2.84l-2.03,-3.89l0.08,-0.58l-0.1,-0.27l-1.08,-0.94l-1.87,-2.36l-0.33,-2.31l-0.07,-0.15l-1.24,-1.5l0.52,-2.4l-0.09,-2.57l-0.78,-2.3l0.96,-2.83l0.61,-5.66l-0.46,-4.26l-0.79,-2.71l-0.68,-1.4l0.13,-0.26l3.24,0.97l1.28,2.88l0.52,0.06l0.62,-0.84l0.06,-0.22l-0.4,-2.61l-0.74,-2.29l68.9,-0.0l0.3,-0.3l0.01,-0.95l0.32,-0.01ZM32.5,67.43l1.75,1.99l0.41,0.04l1.02,-0.81l3.79,0.25l-0.1,0.72l0.24,0.34l3.83,0.77l2.6,-0.44l5.21,1.41l4.84,0.43l1.9,0.57l0.15,0.01l3.25,-0.71l3.72,1.32l2.52,0.58l-0.03,38.14l0.29,0.3l2.41,0.11l2.34,1.0l1.7,1.59l2.22,2.42l0.42,0.03l2.41,-2.04l2.25,-1.08l1.23,1.76l1.71,1.53l2.24,1.62l1.54,2.56l2.56,4.09l0.11,0.11l4.1,2.17l0.06,1.93l-1.12,1.35l-1.22,-1.14l-2.08,-1.05l-0.68,-2.94l-0.09,-0.16l-3.18,-2.84l-1.32,-3.35l-0.25,-0.19l-2.43,-0.24l-3.93,-0.09l-2.85,-1.02l-5.24,-3.85l-6.77,-2.04l-3.52,0.3l-4.84,-1.7l-2.96,-1.6l-0.23,-0.02l-2.78,0.8l-0.21,0.35l0.46,2.31l-1.11,0.19l-2.9,0.78l-2.24,1.26l-2.42,0.68l-0.29,-1.79l1.07,-3.49l2.54,-1.11l0.12,-0.45l-0.69,-0.96l-0.41,-0.07l-3.19,2.12l-1.76,2.54l-3.57,2.62l-0.03,0.46l1.63,1.59l-2.14,2.38l-2.64,1.49l-2.49,1.09l-0.16,0.17l-0.58,1.48l-3.8,1.79l-0.14,0.14l-0.75,1.57l-2.75,1.41l-1.62,-0.25l-0.16,0.02l-2.35,0.98l-2.54,1.19l-2.06,1.15l-4.05,0.93l-0.1,-0.15l2.45,-1.45l2.49,-1.1l2.61,-1.88l3.03,-0.39l0.19,-0.1l1.2,-1.41l3.43,-2.11l0.61,-0.75l1.81,-1.24l0.13,-0.2l0.42,-2.7l1.24,-2.12l-0.03,-0.35l-0.34,-0.09l-2.73,1.05l-0.67,-0.53l-0.39,0.02l-1.13,1.11l-1.43,-1.62l-0.49,0.06l-0.41,0.8l-0.67,-1.31l-0.42,-0.12l-2.43,1.43l-1.18,-0.0l-0.18,-1.86l0.43,-1.3l-0.09,-0.33l-1.61,-1.33l-0.26,-0.06l-3.11,0.68l-2.0,-1.66l-1.61,-0.85l-0.01,-1.97l-0.11,-0.23l-1.76,-1.48l0.86,-1.96l2.01,-2.13l0.88,-1.94l1.79,-0.25l1.65,0.6l0.31,-0.06l1.91,-1.8l1.67,0.31l0.22,-0.04l1.91,-1.23l0.13,-0.33l-0.47,-1.82l-0.15,-0.19l-1.0,-0.52l1.51,-1.27l0.09,-0.34l-0.29,-0.19l-1.62,0.06l-2.66,0.88l-0.13,0.09l-0.62,0.72l-1.77,-0.8l-0.16,-0.02l-3.48,0.44l-3.5,-0.92l-1.06,-1.61l-2.78,-2.09l3.07,-1.51l5.52,-2.01l1.65,0.0l-0.28,1.73l0.31,0.35l5.29,-0.16l0.23,-0.49l-2.03,-2.59l-0.1,-0.08l-3.03,-1.58l-1.79,-2.12l-2.4,-1.83l-3.18,-1.27l1.13,-1.84l4.28,-0.14l0.15,-0.05l3.16,-2.0l0.13,-0.17l0.57,-2.07l2.43,-2.02l2.42,-0.52l4.67,-1.98l2.22,0.29l0.2,-0.04l3.74,-2.37l3.57,0.91ZM37.66,123.49l-2.31,1.26l-1.04,-0.75l-0.31,-1.35l2.06,-1.16l1.24,-0.51l1.48,0.22l0.76,0.81l-1.89,1.49ZM30.89,233.84l1.2,0.57l0.35,0.3l0.48,0.69l-1.6,0.86l-0.3,0.31l-0.24,-0.14l0.05,-0.54l-0.02,-0.15l-0.36,-0.83l0.05,-0.12l0.39,-0.38l0.07,-0.31l-0.09,-0.27ZM29.06,231.89l0.5,0.14l0.31,0.19l-0.46,0.1l-0.34,-0.43ZM25.02,230.13l0.2,-0.11l0.4,0.47l-0.43,-0.05l-0.17,-0.31ZM21.29,228.68l0.1,-0.07l0.22,0.02l0.02,0.21l-0.02,0.02l-0.32,-0.18ZM6.0,113.33l-1.19,0.45l-1.5,-0.64l-0.94,-0.63l1.76,-0.46l1.71,0.29l0.16,0.98Z", "name": "United States of America"}, "LV": {"path": "M473.99,127.16l0.07,-2.15l1.15,-2.11l2.05,-1.07l1.84,2.48l0.25,0.12l2.01,-0.07l0.29,-0.25l0.45,-2.58l1.85,-0.56l0.98,0.4l2.13,1.33l0.16,0.05l1.97,0.01l1.02,0.7l0.21,1.67l0.71,1.84l-2.44,1.23l-1.36,0.53l-2.28,-1.62l-0.12,-0.05l-1.18,-0.2l-0.28,-0.6l-0.31,-0.17l-2.43,0.35l-4.17,-0.23l-0.12,0.02l-2.45,0.93Z", "name": "Latvia"}, "UY": {"path": "M276.9,363.17l1.3,-0.23l2.4,2.04l0.22,0.07l0.82,-0.07l2.48,1.7l1.93,1.5l1.28,1.67l-0.95,1.14l-0.04,0.31l0.63,1.45l-0.96,1.57l-2.65,1.47l-1.73,-0.53l-0.15,-0.01l-1.25,0.28l-2.22,-1.16l-0.16,-0.03l-1.56,0.08l-1.33,-1.36l0.17,-1.58l0.48,-0.55l0.07,-0.2l-0.02,-2.74l0.66,-2.8l0.57,-2.02Z", "name": "Uruguay"}, "LB": {"path": "M510.44,198.11l-0.48,0.03l-0.26,0.17l-0.15,0.32l-0.21,-0.0l0.72,-1.85l1.19,-1.9l0.74,0.09l0.27,0.73l-1.19,0.93l-0.09,0.13l-0.54,1.36Z", "name": "Lebanon"}, "LA": {"path": "M684.87,248.8l0.61,-0.86l0.05,-0.16l0.11,-2.17l-0.08,-0.22l-1.96,-2.16l-0.15,-2.44l-0.08,-0.18l-1.9,-2.1l-0.19,-0.1l-1.89,-0.18l-0.29,0.15l-0.42,0.76l-1.21,0.06l-0.67,-0.41l-0.31,-0.0l-2.2,1.29l-0.05,-1.77l0.61,-2.7l-0.27,-0.37l-1.44,-0.1l-0.12,-1.31l-0.12,-0.21l-0.87,-0.65l0.38,-0.68l1.76,-1.41l0.08,0.22l0.27,0.2l1.33,0.07l0.31,-0.34l-0.35,-2.75l0.85,-0.25l1.32,1.88l1.11,2.36l0.27,0.17l2.89,0.02l0.78,1.82l-1.32,0.56l-0.12,0.09l-0.72,0.93l0.1,0.45l2.93,1.52l3.62,5.27l1.88,1.78l0.58,1.67l-0.38,2.11l-1.87,-0.79l-0.37,0.11l-0.99,1.54l-1.51,-0.73Z", "name": "Laos"}, "TW": {"path": "M725.6,222.5l-1.5,4.22l-0.82,1.65l-1.01,-1.7l-0.26,-1.8l1.4,-2.48l1.8,-1.81l0.76,0.53l-0.38,1.39Z", "name": "Taiwan"}, "TT": {"path": "M266.35,259.46l0.41,-0.39l0.09,-0.23l-0.04,-0.75l1.14,-0.26l0.2,0.03l-0.07,1.37l-1.73,0.23Z", "name": "Trinidad and Tobago"}, "TR": {"path": "M513.25,175.38l3.63,1.17l0.14,0.01l2.88,-0.45l2.11,0.26l0.18,-0.03l2.9,-1.53l2.51,-0.13l2.25,1.37l0.36,0.88l-0.23,1.36l0.19,0.33l1.81,0.72l0.61,0.53l-1.31,0.64l-0.16,0.34l0.76,3.24l-0.44,0.8l0.01,0.3l1.19,2.02l-0.71,0.29l-0.74,-0.62l-0.15,-0.07l-2.91,-0.37l-0.15,0.02l-1.04,0.43l-2.78,0.44l-1.44,-0.03l-2.83,1.06l-1.95,0.01l-1.28,-0.52l-0.2,-0.01l-2.62,0.76l-0.7,-0.48l-0.47,0.22l-0.13,1.49l-1.01,0.94l-0.58,-0.82l0.79,-0.9l0.04,-0.34l-0.31,-0.15l-1.46,0.23l-2.03,-0.64l-0.3,0.07l-1.65,1.58l-3.58,0.3l-1.94,-1.47l-0.17,-0.06l-2.7,-0.1l-0.28,0.17l-0.51,1.06l-1.47,0.29l-2.32,-1.46l-0.17,-0.05l-2.55,0.05l-1.4,-2.7l-1.72,-1.54l1.11,-2.06l-0.07,-0.37l-1.35,-1.19l2.47,-2.51l3.74,-0.11l0.26,-0.17l0.96,-2.07l4.56,0.38l0.19,-0.05l2.97,-1.92l2.84,-0.83l4.03,-0.06l4.31,2.08ZM488.85,176.8l-1.81,1.38l-0.57,-1.01l0.02,-0.36l0.45,-0.25l0.13,-0.15l0.78,-1.87l-0.11,-0.37l-0.72,-0.47l1.91,-0.71l1.89,0.35l0.25,0.97l0.17,0.2l1.87,0.83l-0.19,0.31l-2.82,0.16l-0.18,0.07l-1.06,0.91Z", "name": "Turkey"}, "LK": {"path": "M625.44,266.07l-0.35,2.4l-0.9,0.61l-1.91,0.5l-1.04,-1.75l-0.43,-3.5l1.0,-3.6l1.34,1.09l1.13,1.72l1.16,2.52Z", "name": "Sri Lanka"}, "TN": {"path": "M444.91,206.18l-0.99,-4.57l-0.12,-0.18l-1.43,-1.04l-0.02,-0.53l-0.11,-0.22l-1.95,-1.59l-0.19,-1.85l1.44,-1.47l0.08,-0.14l0.59,-2.34l-0.38,-2.77l0.44,-1.28l2.52,-1.08l1.41,0.28l-0.06,1.2l0.43,0.28l1.81,-0.9l0.02,0.06l-1.14,1.28l-0.08,0.2l-0.02,1.32l0.11,0.24l0.74,0.6l-0.29,2.18l-1.56,1.35l-0.09,0.32l0.48,1.54l0.28,0.21l1.11,0.04l0.55,1.17l0.15,0.14l0.76,0.35l-0.12,1.79l-1.1,0.72l-0.8,0.91l-1.68,1.04l-0.13,0.32l0.25,1.08l-0.18,0.96l-0.74,0.39Z", "name": "Tunisia"}, "TL": {"path": "M734.21,307.22l0.17,-0.34l1.99,-0.52l1.72,-0.08l0.78,-0.3l0.29,0.1l-0.43,0.32l-2.57,1.09l-1.71,0.59l-0.05,-0.49l-0.19,-0.36Z", "name": "East Timor"}, "TM": {"path": "M553.16,173.51l-0.12,1.0l-0.26,-0.65l0.38,-0.34ZM553.54,173.16l0.13,-0.12l0.43,-0.09l-0.56,0.21ZM555.68,172.6l0.65,-0.14l1.53,0.76l1.71,2.29l0.27,0.12l1.27,-0.14l2.81,-0.04l0.29,-0.38l-0.35,-1.27l1.98,-0.97l1.96,-1.63l3.05,1.44l0.25,2.23l0.14,0.22l0.96,0.61l0.18,0.05l2.61,-0.13l0.68,0.44l1.2,2.97l0.1,0.13l2.85,2.03l1.67,1.41l2.66,1.45l3.13,1.17l-0.05,1.23l-0.36,-0.04l-1.12,-0.73l-0.44,0.14l-0.34,0.89l-1.96,0.52l-0.22,0.23l-0.47,2.17l-1.26,0.78l-1.93,0.42l-0.21,0.18l-0.46,1.14l-1.64,0.33l-2.3,-0.97l-0.2,-2.23l-0.28,-0.27l-1.76,-0.1l-2.78,-2.48l-0.15,-0.07l-1.95,-0.31l-2.82,-1.48l-1.78,-0.27l-0.18,0.03l-1.03,0.51l-1.6,-0.08l-0.22,0.08l-1.72,1.6l-1.83,0.46l-0.39,-1.7l0.36,-3.0l-0.16,-0.3l-1.73,-0.88l0.57,-1.77l-0.25,-0.39l-1.33,-0.14l0.41,-1.85l2.05,0.63l0.21,-0.01l2.2,-0.95l0.09,-0.49l-1.78,-1.75l-0.69,-1.66l-0.07,-0.03Z", "name": "Turkmenistan"}, "TJ": {"path": "M597.99,178.71l-0.23,0.23l-2.57,-0.47l-0.35,0.25l-0.24,1.7l0.32,0.34l2.66,-0.22l3.15,0.95l4.47,-0.42l0.58,2.45l0.39,0.21l0.71,-0.25l1.22,0.53l-0.06,1.01l0.29,1.28l-2.19,-0.0l-1.71,-0.21l-0.23,0.07l-1.51,1.25l-1.05,0.27l-0.77,0.51l-0.71,-0.67l0.22,-2.28l-0.24,-0.32l-0.43,-0.08l0.17,-0.57l-0.16,-0.36l-1.36,-0.66l-0.34,0.05l-1.08,1.01l-0.09,0.15l-0.25,1.09l-0.24,0.26l-1.36,-0.05l-0.27,0.14l-0.65,1.06l-0.58,-0.39l-0.3,-0.02l-1.68,0.86l-0.36,-0.16l1.28,-2.65l0.02,-0.2l-0.54,-2.17l-0.18,-0.21l-1.53,-0.58l0.41,-0.82l1.89,0.13l0.26,-0.12l1.19,-1.63l0.77,-1.82l2.66,-0.55l-0.33,0.87l0.01,0.23l0.36,0.82l0.3,0.18l0.23,-0.02Z", "name": "Tajikistan"}, "LS": {"path": "M493.32,359.69l0.69,0.65l-0.65,1.12l-0.38,0.8l-1.27,0.39l-0.18,0.15l-0.4,0.77l-0.59,0.18l-1.59,-1.78l1.16,-1.5l1.3,-1.02l0.97,-0.46l0.94,0.72Z", "name": "Lesotho"}, "TH": {"path": "M677.42,253.68l-1.7,-0.88l-0.14,-0.03l-1.77,0.04l0.3,-1.64l-0.3,-0.35l-2.21,0.01l-0.3,0.28l-0.2,2.76l-2.15,5.9l-0.02,0.13l0.17,1.83l0.28,0.27l1.45,0.07l0.93,2.1l0.44,2.15l0.08,0.15l1.4,1.44l0.16,0.09l1.43,0.27l1.04,1.05l-0.58,0.73l-1.24,0.22l-0.15,-0.99l-0.15,-0.22l-2.04,-1.1l-0.36,0.06l-0.23,0.23l-0.72,-0.71l-0.41,-1.18l-0.06,-0.11l-1.33,-1.42l-1.22,-1.2l-0.5,0.13l-0.15,0.54l-0.14,-0.41l0.26,-1.48l0.73,-2.38l1.2,-2.57l1.37,-2.35l0.02,-0.27l-0.95,-2.26l0.03,-1.19l-0.29,-1.42l-0.06,-0.13l-1.65,-2.0l-0.46,-0.99l0.62,-0.34l0.13,-0.15l0.92,-2.23l-0.02,-0.27l-1.05,-1.74l-1.57,-1.86l-1.04,-1.96l0.76,-0.34l0.16,-0.16l1.07,-2.63l1.58,-0.1l0.16,-0.06l1.43,-1.11l1.24,-0.52l0.84,0.62l0.13,1.43l0.28,0.27l1.34,0.09l-0.54,2.39l0.05,2.39l0.45,0.25l2.48,-1.45l0.6,0.36l0.17,0.04l1.47,-0.07l0.25,-0.15l0.41,-0.73l1.58,0.15l1.76,1.93l0.15,2.44l0.08,0.18l1.94,2.15l-0.1,1.96l-0.66,0.93l-2.25,-0.34l-3.24,0.49l-0.19,0.12l-1.6,2.12l-0.06,0.24l0.48,2.46Z", "name": "Thailand"}, "TF": {"path": "M593.76,417.73l1.38,0.84l2.15,0.37l0.04,0.31l-0.59,1.24l-3.36,0.19l-0.05,-1.38l0.43,-1.56Z", "name": "French Southern and Antarctic Lands"}, "TG": {"path": "M425.23,269.29l-1.49,0.4l-0.43,-0.68l-0.64,-1.54l-0.18,-1.16l0.54,-2.21l-0.04,-0.24l-0.59,-0.86l-0.23,-1.9l0.0,-1.82l-0.07,-0.19l-0.95,-1.19l0.1,-0.41l1.58,0.04l-0.23,0.97l0.08,0.28l1.55,1.55l0.09,1.13l0.08,0.19l0.42,0.43l-0.11,5.66l0.52,1.53Z", "name": "Togo"}, "TD": {"path": "M457.57,252.46l0.23,-1.08l-0.28,-0.36l-1.32,-0.05l0.0,-1.35l-0.1,-0.22l-0.9,-0.82l0.99,-3.1l3.12,-2.37l0.12,-0.23l0.13,-3.33l0.95,-5.2l0.53,-1.09l-0.07,-0.36l-0.94,-0.81l-0.03,-0.7l-0.12,-0.23l-0.84,-0.61l-0.57,-3.76l2.21,-1.26l19.67,9.88l0.12,9.74l-1.83,-0.15l-0.28,0.14l-1.14,1.89l-0.68,1.62l0.05,0.31l0.33,0.38l-0.61,0.58l-0.08,0.3l0.25,0.93l-0.58,0.95l-0.29,1.01l0.34,0.37l0.67,-0.11l0.39,0.73l0.03,1.4l0.11,0.23l0.8,0.65l-0.01,0.24l-1.38,0.37l-0.11,0.06l-1.27,1.03l-1.83,2.76l-2.21,1.1l-2.34,-0.15l-0.82,0.25l-0.2,0.37l0.19,0.68l-1.16,0.79l-1.01,0.94l-2.92,0.89l-0.5,-0.46l-0.17,-0.08l-0.41,-0.05l-0.28,0.12l-0.38,0.54l-1.36,0.12l0.1,-0.18l0.01,-0.27l-0.78,-1.72l-0.35,-1.03l-0.17,-0.18l-1.03,-0.41l-1.29,-1.28l0.36,-0.78l0.9,0.2l0.14,-0.0l0.67,-0.17l1.36,0.02l0.26,-0.45l-1.32,-2.22l0.09,-1.64l-0.17,-1.68l-0.04,-0.13l-0.93,-1.53Z", "name": "Chad"}, "LY": {"path": "M457.99,226.38l-1.57,0.87l-1.25,-1.28l-0.13,-0.08l-3.85,-1.11l-1.04,-1.57l-0.09,-0.09l-1.98,-1.23l-0.27,-0.02l-0.93,0.39l-0.72,-1.2l-0.09,-1.07l-0.06,-0.16l-1.33,-1.75l0.83,-0.94l0.07,-0.24l-0.21,-1.64l0.31,-1.43l-0.17,-1.29l0.43,-2.26l-0.15,-1.33l-0.73,-2.18l0.99,-0.52l0.16,-0.21l0.22,-1.16l-0.22,-1.06l1.54,-0.95l0.81,-0.92l1.19,-0.78l0.14,-0.23l0.12,-1.76l2.57,0.84l0.16,0.01l0.99,-0.23l2.01,0.45l3.19,1.2l1.12,2.36l0.2,0.16l2.24,0.53l3.5,1.14l2.65,1.36l0.29,-0.01l1.22,-0.71l1.27,-1.32l0.07,-0.29l-0.55,-2.0l0.69,-1.19l1.7,-1.23l1.61,-0.35l3.2,0.54l0.78,1.14l0.24,0.13l0.85,0.01l0.84,0.47l2.35,0.31l0.42,0.63l-0.79,1.16l-0.04,0.26l0.35,1.08l-0.61,1.6l-0.0,0.2l0.73,2.16l0.0,24.24l-2.58,0.01l-0.3,0.29l-0.02,0.62l-19.55,-9.83l-0.28,0.01l-2.53,1.44Z", "name": "Libya"}, "AE": {"path": "M550.59,223.8l0.12,0.08l1.92,-0.41l3.54,0.15l0.23,-0.09l1.71,-1.79l1.86,-1.7l1.31,-1.36l0.26,0.5l0.28,1.72l-0.93,0.01l-0.3,0.26l-0.21,1.73l0.11,0.27l0.08,0.06l-0.7,0.32l-0.17,0.27l-0.01,0.99l-0.68,1.02l-0.05,0.15l-0.06,0.96l-0.32,0.36l-7.19,-1.27l-0.79,-2.22Z", "name": "United Arab Emirates"}, "VE": {"path": "M240.66,256.5l0.65,0.91l-0.03,1.13l-1.05,1.39l-0.03,0.31l0.95,2.0l0.32,0.17l1.08,-0.16l0.24,-0.21l0.56,-1.83l-0.06,-0.29l-0.71,-0.81l-0.1,-1.58l2.9,-0.96l0.19,-0.37l-0.29,-1.02l0.45,-0.41l0.72,1.43l0.26,0.16l1.65,0.04l1.46,1.27l0.08,0.72l0.3,0.27l2.28,0.02l2.55,-0.25l1.34,1.06l0.14,0.06l1.92,0.31l0.2,-0.03l1.4,-0.79l0.15,-0.25l0.02,-0.36l2.82,-0.14l1.17,-0.01l-0.41,0.14l-0.14,0.46l0.86,1.19l0.22,0.12l1.93,0.18l1.73,1.13l0.37,1.9l0.31,0.24l1.21,-0.05l0.52,0.32l-1.63,1.21l-0.11,0.17l-0.22,0.92l0.07,0.27l0.63,0.69l-0.31,0.24l-1.48,0.39l-0.22,0.3l0.04,1.03l-0.59,0.6l-0.01,0.41l1.67,1.87l0.23,0.48l-0.72,0.76l-2.71,0.91l-1.78,0.39l-0.13,0.06l-0.6,0.49l-1.84,-0.58l-1.89,-0.33l-0.18,0.03l-0.47,0.23l-0.02,0.53l0.96,0.56l-0.08,1.58l0.35,1.58l0.26,0.23l1.91,0.19l0.02,0.07l-1.54,0.62l-0.18,0.2l-0.25,0.92l-0.88,0.35l-1.85,0.58l-0.16,0.13l-0.4,0.64l-1.66,0.14l-1.22,-1.18l-0.79,-2.52l-0.67,-0.88l-0.66,-0.43l0.99,-0.98l0.09,-0.26l-0.09,-0.56l-0.08,-0.16l-0.66,-0.69l-0.47,-1.54l0.18,-1.67l0.55,-0.85l0.45,-1.35l-0.15,-0.36l-0.89,-0.43l-0.19,-0.02l-1.39,0.28l-1.76,-0.13l-0.92,0.23l-1.64,-2.01l-0.17,-0.1l-1.54,-0.33l-3.05,0.23l-0.5,-0.73l-0.15,-0.12l-0.45,-0.15l-0.05,-0.28l0.28,-0.86l0.01,-0.15l-0.2,-1.01l-0.08,-0.15l-0.5,-0.5l-0.3,-1.08l-0.25,-0.22l-0.89,-0.12l0.54,-1.18l0.29,-1.73l0.66,-0.85l0.94,-0.7l0.09,-0.11l0.3,-0.6Z", "name": "Venezuela"}, "AF": {"path": "M574.42,192.1l2.24,0.95l0.18,0.02l1.89,-0.38l0.22,-0.18l0.46,-1.14l1.82,-0.4l1.5,-0.91l0.14,-0.19l0.46,-2.12l1.93,-0.51l0.2,-0.18l0.26,-0.68l0.87,0.57l0.13,0.05l0.79,0.09l1.35,0.02l1.83,0.59l0.75,0.34l0.26,-0.01l1.66,-0.85l0.7,0.46l0.42,-0.09l0.72,-1.17l1.32,0.05l0.23,-0.1l0.39,-0.43l0.07,-0.14l0.24,-1.08l0.86,-0.81l0.94,0.46l-0.2,0.64l0.23,0.38l0.49,0.09l-0.21,2.15l0.09,0.25l0.99,0.94l0.38,0.03l0.83,-0.57l1.06,-0.27l0.12,-0.06l1.46,-1.21l1.63,0.2l2.4,0.0l0.17,0.32l-1.12,0.25l-1.23,0.52l-2.86,0.33l-2.69,0.6l-0.13,0.06l-1.46,1.25l-0.07,0.36l0.58,1.18l0.25,1.21l-1.13,1.08l-0.09,0.25l0.09,0.98l-0.53,0.79l-2.22,-0.08l-0.28,0.44l0.83,1.57l-1.3,0.58l-0.13,0.11l-1.06,1.69l-0.05,0.18l0.13,1.51l-0.73,0.58l-0.78,-0.22l-0.14,-0.01l-1.91,0.36l-0.23,0.19l-0.2,0.57l-1.65,-0.0l-0.22,0.1l-1.4,1.56l-0.08,0.19l-0.08,2.13l-2.99,1.05l-1.67,-0.23l-0.27,0.1l-0.39,0.46l-1.43,-0.31l-2.43,0.4l-3.69,-1.23l1.96,-2.15l0.08,-0.24l-0.21,-1.78l-0.23,-0.26l-1.69,-0.42l-0.19,-1.62l-0.77,-2.08l0.98,-1.41l-0.14,-0.45l-0.82,-0.31l0.6,-1.79l0.93,-3.21Z", "name": "Afghanistan"}, "IQ": {"path": "M534.42,190.89l0.13,0.14l1.5,0.78l0.15,1.34l-1.13,0.87l-0.11,0.16l-0.58,2.2l0.04,0.24l1.73,2.67l0.12,0.1l2.99,1.49l1.18,1.94l-0.39,1.89l0.29,0.36l0.5,-0.0l0.02,1.17l0.08,0.2l0.83,0.86l-2.36,-0.29l-0.29,0.13l-1.74,2.49l-4.4,-0.21l-7.03,-5.49l-3.73,-1.94l-2.92,-0.74l-0.89,-3.0l5.33,-2.81l0.15,-0.19l0.95,-3.43l-0.2,-2.0l1.19,-0.61l0.11,-0.09l1.23,-1.73l0.92,-0.38l2.75,0.35l0.81,0.68l0.31,0.05l0.94,-0.38l1.5,3.17Z", "name": "Iraq"}, "IS": {"path": "M384.26,87.96l-0.51,2.35l0.08,0.28l2.61,2.58l-2.99,2.83l-7.16,2.72l-2.08,0.7l-9.51,-1.71l1.89,-1.36l-0.07,-0.53l-4.4,-1.59l3.33,-0.59l0.25,-0.32l-0.11,-1.2l-0.25,-0.27l-4.82,-0.88l1.38,-2.2l3.54,-0.57l3.8,2.74l0.33,0.01l3.68,-2.18l3.02,1.12l0.25,-0.02l4.01,-2.18l3.72,0.27Z", "name": "Iceland"}, "IR": {"path": "M556.2,187.5l2.05,-0.52l0.13,-0.07l1.69,-1.57l1.55,0.08l0.15,-0.03l1.02,-0.5l1.64,0.25l2.82,1.48l1.91,0.3l2.8,2.49l0.18,0.08l1.61,0.09l0.19,2.09l-1.0,3.47l-0.69,2.04l0.18,0.38l0.73,0.28l-0.85,1.22l-0.04,0.28l0.81,2.19l0.19,1.72l0.23,0.26l1.69,0.42l0.17,1.43l-2.18,2.39l-0.01,0.4l1.22,1.42l1.0,1.62l0.12,0.11l2.23,1.11l0.06,2.2l0.2,0.27l1.03,0.38l0.14,0.83l-3.38,1.3l-0.18,0.19l-0.87,2.85l-4.44,-0.76l-2.75,-0.62l-2.64,-0.32l-1.01,-3.11l-0.17,-0.19l-1.2,-0.48l-0.18,-0.01l-1.99,0.51l-2.42,1.25l-2.89,-0.84l-2.48,-2.03l-2.41,-0.79l-1.61,-2.47l-1.84,-3.63l-0.36,-0.15l-1.22,0.4l-1.48,-0.84l-0.37,0.06l-0.72,0.82l-1.08,-1.12l-0.02,-1.35l-0.3,-0.29l-0.43,0.0l0.34,-1.64l-0.04,-0.22l-1.29,-2.11l-0.12,-0.11l-3.0,-1.49l-1.62,-2.49l0.52,-1.98l1.18,-0.92l0.11,-0.27l-0.19,-1.66l-0.16,-0.23l-1.55,-0.81l-1.58,-3.33l-1.3,-2.2l0.41,-0.75l0.03,-0.21l-0.73,-3.12l1.2,-0.59l0.35,0.9l1.26,1.35l0.15,0.09l1.81,0.39l0.91,-0.09l0.15,-0.06l2.9,-2.13l0.7,-0.16l0.48,0.56l-0.75,1.26l0.05,0.37l1.56,1.53l0.28,0.08l0.37,-0.09l0.7,1.89l0.21,0.19l2.31,0.59l1.69,1.4l0.15,0.07l3.66,0.49l3.91,-0.76l0.23,-0.19l0.19,-0.52Z", "name": "Iran"}, "AM": {"path": "M530.51,176.08l2.91,-0.39l0.41,0.63l0.11,0.1l0.66,0.36l-0.32,0.47l0.07,0.41l1.1,0.84l-0.53,0.7l0.06,0.42l1.06,0.8l1.01,0.44l0.04,1.56l-0.44,0.04l-0.88,-1.46l0.01,-0.37l-0.3,-0.31l-0.98,0.01l-0.65,-0.69l-0.26,-0.09l-0.38,0.06l-0.97,-0.82l-1.64,-0.65l0.2,-1.2l-0.02,-0.16l-0.28,-0.69Z", "name": "Armenia"}, "IT": {"path": "M451.68,158.58l0.2,0.16l3.3,0.75l-0.22,1.26l0.02,0.18l0.35,0.78l-1.4,-0.32l-0.21,0.03l-2.04,1.1l-0.16,0.29l0.13,1.47l-0.29,0.82l0.02,0.24l0.82,1.57l0.1,0.11l2.28,1.5l1.29,2.53l2.79,2.43l0.2,0.07l1.83,-0.02l0.31,0.34l-0.46,0.39l0.06,0.5l4.06,1.97l2.06,1.49l0.17,0.36l-0.24,0.53l-1.08,-1.07l-0.15,-0.08l-2.18,-0.49l-0.33,0.15l-1.05,1.91l0.11,0.4l1.63,0.98l-0.22,1.12l-0.84,0.14l-0.22,0.15l-1.27,2.38l-0.54,0.12l0.01,-0.47l0.48,-1.46l0.5,-0.58l0.03,-0.35l-0.97,-1.69l-0.76,-1.48l-0.17,-0.15l-0.94,-0.33l-0.68,-1.18l-0.16,-0.13l-1.53,-0.52l-1.03,-1.14l-0.19,-0.1l-1.78,-0.19l-1.88,-1.3l-2.27,-1.94l-1.64,-1.68l-0.76,-2.94l-0.21,-0.21l-1.22,-0.35l-2.01,-1.0l-0.24,-0.01l-1.15,0.42l-0.11,0.07l-1.38,1.36l-0.5,0.11l0.19,-0.87l-0.21,-0.35l-1.19,-0.34l-0.56,-2.06l0.76,-0.82l0.03,-0.36l-0.68,-1.08l0.04,-0.31l0.68,0.42l0.19,0.04l1.21,-0.15l0.14,-0.06l1.18,-0.89l0.25,0.29l0.25,0.1l1.19,-0.1l0.25,-0.18l0.45,-1.04l1.61,0.34l0.19,-0.02l1.1,-0.53l0.17,-0.22l0.15,-0.95l1.19,0.35l0.35,-0.16l0.23,-0.47l2.11,-0.47l0.45,0.89ZM459.35,184.63l-0.71,1.81l0.0,0.23l0.33,0.79l-0.37,1.03l-1.6,-0.91l-1.33,-0.34l-3.24,-1.36l0.23,-0.99l2.73,0.24l3.95,-0.5ZM443.95,175.91l1.26,1.77l-0.31,3.47l-0.82,-0.13l-0.26,0.08l-0.83,0.79l-0.64,-0.52l-0.1,-3.42l-0.44,-1.34l0.91,0.1l0.21,-0.06l1.01,-0.74Z", "name": "Italy"}, "VN": {"path": "M690.8,230.21l-2.86,1.93l-2.09,2.46l-0.06,0.11l-0.55,1.8l0.04,0.26l4.26,6.1l2.31,1.63l1.46,1.97l1.12,4.62l-0.32,4.3l-1.97,1.57l-2.85,1.62l-2.09,2.14l-2.83,2.13l-0.67,-1.19l0.65,-1.58l-0.09,-0.35l-1.47,-1.14l1.67,-0.79l2.57,-0.18l0.22,-0.47l-0.89,-1.24l3.88,-1.8l0.17,-0.24l0.31,-3.05l-0.01,-0.13l-0.56,-1.63l0.44,-2.48l-0.01,-0.15l-0.63,-1.81l-0.08,-0.12l-1.87,-1.77l-3.64,-5.3l-0.11,-0.1l-2.68,-1.39l0.45,-0.59l1.53,-0.65l0.16,-0.39l-0.97,-2.27l-0.27,-0.18l-2.89,-0.02l-1.04,-2.21l-1.28,-1.83l0.96,-0.46l1.97,0.01l2.43,-0.3l0.13,-0.05l1.95,-1.29l1.04,0.85l0.13,0.06l1.98,0.42l-0.32,1.21l0.09,0.3l1.19,1.07l0.12,0.07l1.88,0.51Z", "name": "Vietnam"}, "AR": {"path": "M258.11,341.34l1.4,1.81l0.51,-0.06l0.89,-1.94l2.51,0.1l0.36,0.49l4.6,4.31l0.15,0.08l1.99,0.39l3.01,1.93l2.5,1.01l0.28,0.91l-2.4,3.97l0.17,0.44l2.57,0.74l2.81,0.41l2.09,-0.44l0.14,-0.07l2.27,-2.06l0.09,-0.17l0.38,-2.2l0.88,-0.36l1.05,1.29l-0.04,1.88l-1.98,1.4l-1.72,1.13l-2.84,2.65l-3.34,3.73l-0.07,0.12l-0.63,2.22l-0.67,2.85l0.02,2.73l-0.47,0.54l-0.07,0.17l-0.36,3.28l0.12,0.27l3.03,2.32l-0.31,1.78l0.11,0.29l1.44,1.15l-0.11,1.17l-2.32,3.57l-3.59,1.51l-4.95,0.6l-2.72,-0.29l-0.32,0.38l0.5,1.67l-0.49,2.13l0.01,0.16l0.4,1.29l-1.27,0.88l-2.41,0.39l-2.33,-1.05l-0.31,0.04l-0.97,0.78l-0.11,0.27l0.35,2.98l0.16,0.23l1.69,0.91l0.31,-0.02l1.08,-0.75l0.46,0.96l-2.1,0.88l-2.01,1.89l-0.09,0.18l-0.36,3.05l-0.51,1.42l-2.16,0.01l-0.19,0.07l-1.96,1.59l-0.1,0.15l-0.72,2.34l0.08,0.31l2.46,2.31l0.13,0.07l2.09,0.56l-0.74,2.45l-2.86,1.75l-0.12,0.14l-1.59,3.71l-2.2,1.24l-0.1,0.09l-1.03,1.54l-0.04,0.23l0.81,3.45l0.06,0.13l1.13,1.32l-2.59,-0.57l-5.89,-0.44l-0.92,-1.73l0.05,-2.4l-0.34,-0.3l-1.49,0.19l-0.72,-0.98l-0.2,-3.21l1.79,-1.33l0.1,-0.13l0.79,-2.04l0.02,-0.16l-0.27,-1.52l1.31,-2.69l0.91,-4.15l-0.23,-1.72l0.91,-0.49l0.15,-0.33l-0.27,-1.16l-0.15,-0.2l-0.87,-0.46l0.65,-1.01l-0.04,-0.37l-1.06,-1.09l-0.54,-3.2l0.83,-0.51l0.14,-0.29l-0.42,-3.6l0.58,-2.98l0.64,-2.5l1.41,-1.0l0.12,-0.32l-0.75,-2.8l-0.01,-2.48l1.81,-1.78l0.09,-0.22l-0.06,-2.3l1.39,-2.69l0.03,-0.14l0.01,-2.58l-0.11,-0.24l-0.57,-0.45l-1.1,-4.59l1.49,-2.73l0.04,-0.17l-0.23,-2.59l0.86,-2.38l1.6,-2.48l1.74,-1.65l0.04,-0.39l-0.64,-0.89l0.42,-0.7l0.04,-0.16l-0.08,-4.26l2.55,-1.23l0.16,-0.18l0.86,-2.75l-0.01,-0.22l-0.22,-0.48l1.84,-2.1l3.0,0.59ZM256.77,438.98l-2.1,0.15l-1.18,-1.14l-0.19,-0.08l-1.53,-0.09l-2.38,-0.0l-0.0,-6.28l0.4,0.65l1.25,2.55l0.11,0.12l3.26,2.07l3.19,0.8l-0.82,1.26Z", "name": "Argentina"}, "AU": {"path": "M705.55,353.06l0.09,0.09l0.37,0.05l0.13,-0.35l-0.57,-1.69l0.48,0.3l0.71,0.99l0.34,0.11l0.2,-0.29l-0.04,-1.37l-0.04,-0.14l-1.22,-2.07l-0.28,-0.9l-0.51,-0.69l0.24,-1.33l0.52,-0.7l0.34,-1.32l0.01,-0.13l-0.25,-1.44l0.51,-0.94l0.1,1.03l0.23,0.26l0.32,-0.14l1.01,-1.72l1.94,-0.84l1.27,-1.14l1.84,-0.92l1.0,-0.18l0.6,0.28l0.26,-0.0l1.94,-0.96l1.48,-0.28l0.19,-0.13l0.32,-0.49l0.51,-0.18l1.42,0.05l2.63,-0.76l0.11,-0.06l1.36,-1.15l0.08,-0.1l0.61,-1.33l1.42,-1.27l0.1,-0.19l0.11,-1.03l0.06,-1.32l1.39,-1.74l0.85,1.79l0.4,0.14l1.07,-0.51l0.11,-0.45l-0.77,-1.05l0.53,-0.84l0.86,0.43l0.43,-0.22l0.29,-1.85l1.29,-1.19l0.6,-0.98l1.16,-0.4l0.2,-0.27l0.02,-0.34l0.74,0.2l0.38,-0.27l0.03,-0.44l1.98,-0.61l1.7,1.08l1.36,1.48l0.22,0.1l1.55,0.02l1.57,0.24l0.33,-0.4l-0.48,-1.27l1.09,-1.86l1.06,-0.63l0.1,-0.42l-0.28,-0.46l0.93,-1.24l1.36,-0.8l1.16,0.27l0.14,0.0l2.1,-0.48l0.23,-0.3l-0.05,-1.3l-0.18,-0.26l-1.08,-0.49l0.44,-0.12l1.52,0.58l1.39,1.06l2.11,0.65l0.19,-0.0l0.59,-0.21l1.44,0.72l0.27,0.0l1.37,-0.68l0.84,0.2l0.26,-0.06l0.37,-0.3l0.82,0.89l-0.56,1.14l-0.84,0.91l-0.75,0.07l-0.26,0.38l0.26,0.9l-0.67,1.15l-0.88,1.24l-0.05,0.25l0.18,0.72l0.12,0.17l1.99,1.42l1.96,0.84l1.25,0.86l1.8,1.51l0.19,0.07l0.63,-0.0l1.15,0.58l0.34,0.7l0.17,0.15l2.39,0.88l0.24,-0.02l1.65,-0.88l0.14,-0.16l0.49,-1.37l0.52,-1.19l0.31,-1.39l0.75,-2.02l0.01,-0.19l-0.33,-1.16l0.16,-0.67l0.0,-0.13l-0.28,-1.41l0.3,-1.78l0.42,-0.45l0.05,-0.33l-0.33,-0.73l0.56,-1.25l0.48,-1.39l0.07,-0.69l0.58,-0.59l0.48,0.84l0.17,1.53l0.17,0.24l0.47,0.23l0.09,0.9l0.05,0.14l0.87,1.23l0.17,1.33l-0.09,0.89l0.03,0.15l0.9,2.0l0.43,0.13l1.38,-0.83l0.71,0.92l1.06,0.88l-0.22,0.96l0.0,0.14l0.53,2.2l0.38,1.3l0.15,0.18l0.52,0.26l0.62,2.01l-0.23,1.27l0.02,0.18l0.81,1.76l0.14,0.14l2.69,1.35l3.21,2.21l-0.2,0.4l0.04,0.34l1.39,1.6l0.95,2.78l0.43,0.16l0.79,-0.46l0.85,0.96l0.39,0.05l0.22,-0.15l0.36,2.33l0.09,0.18l1.78,1.63l1.16,1.01l1.9,2.1l0.67,2.05l0.06,1.47l-0.17,1.64l0.03,0.17l1.16,2.22l-0.14,2.28l-0.43,1.24l-0.68,2.44l0.04,1.63l-0.48,1.92l-1.06,2.43l-1.79,1.32l-0.1,0.12l-0.91,2.15l-0.82,1.37l-0.76,2.47l-0.98,1.46l-0.63,2.14l-0.33,2.02l0.1,0.82l-1.21,0.85l-2.71,0.1l-0.13,0.03l-2.31,1.19l-1.21,1.17l-1.34,1.11l-1.89,-1.18l-1.33,-0.46l0.32,-1.24l-0.4,-0.35l-1.46,0.61l-2.06,1.98l-1.99,-0.73l-1.43,-0.46l-1.45,-0.22l-2.32,-0.81l-1.51,-1.67l-0.45,-2.11l-0.6,-1.5l-0.07,-0.11l-1.23,-1.16l-0.16,-0.08l-1.96,-0.28l0.59,-0.99l0.03,-0.24l-0.61,-2.1l-0.54,-0.08l-1.16,1.85l-1.23,0.29l0.73,-0.88l0.06,-0.12l0.37,-1.57l0.93,-1.33l0.05,-0.2l-0.2,-2.07l-0.53,-0.17l-2.01,2.35l-1.52,0.94l-0.12,0.14l-0.82,1.93l-1.5,-0.9l0.07,-1.32l-0.06,-0.2l-1.57,-2.04l-1.15,-0.92l0.3,-0.41l-0.1,-0.44l-3.21,-1.69l-0.13,-0.03l-1.69,-0.08l-2.35,-1.31l-0.16,-0.04l-4.55,0.27l-3.24,0.99l-2.8,0.91l-2.33,-0.18l-0.17,0.03l-2.63,1.41l-2.14,0.64l-0.2,0.19l-0.47,1.42l-0.8,0.99l-1.99,0.06l-1.55,0.24l-2.27,-0.5l-1.79,0.3l-1.71,0.13l-0.19,0.09l-1.38,1.39l-0.58,-0.1l-0.21,0.04l-1.26,0.8l-1.13,0.85l-1.72,-0.1l-1.6,-0.0l-2.58,-1.76l-1.21,-0.49l0.04,-1.19l1.04,-0.32l0.16,-0.12l0.42,-0.64l0.05,-0.19l-0.09,-0.97l0.3,-2.0l-0.28,-1.64l-1.34,-2.84l-0.39,-1.49l0.1,-1.51l-0.04,-0.17l-0.96,-1.72l-0.06,-0.73l-0.09,-0.19l-1.04,-1.01l-0.3,-2.02l-0.05,-0.12l-1.23,-1.83ZM784.95,393.35l2.39,1.01l0.2,0.01l3.26,-0.96l1.19,0.16l0.16,3.19l-0.78,0.95l-0.07,0.16l-0.19,1.83l-0.43,-0.41l-0.44,0.03l-1.61,1.96l-0.4,-0.12l-1.38,-0.09l-1.43,-2.42l-0.37,-2.03l-1.4,-2.53l0.04,-0.94l1.27,0.2Z", "name": "Australia"}, "IL": {"path": "M509.04,199.22l0.71,0.0l0.27,-0.17l0.15,-0.33l0.19,-0.01l0.02,0.73l-0.27,0.34l0.02,0.08l-0.32,0.62l-0.65,-0.27l-0.41,0.19l-0.52,1.85l0.16,0.35l0.14,0.07l-0.17,0.1l-0.14,0.21l-0.11,0.73l0.39,0.33l0.81,-0.26l0.03,0.64l-0.97,3.43l-1.28,-3.67l0.62,-0.78l-0.03,-0.41l0.58,-1.16l0.5,-2.07l0.27,-0.54Z", "name": "Israel"}, "IN": {"path": "M615.84,192.58l2.4,2.97l-0.24,2.17l0.05,0.2l0.94,1.35l-0.06,0.97l-1.46,-0.3l-0.35,0.36l0.7,3.06l0.12,0.18l2.46,1.75l3.11,1.72l-1.23,0.96l-0.1,0.13l-0.97,2.55l0.16,0.38l2.41,1.02l2.37,1.33l3.27,1.52l3.43,0.37l1.37,1.3l0.17,0.08l1.92,0.25l3.0,0.62l2.15,-0.04l0.28,-0.22l0.29,-1.06l0.0,-0.13l-0.32,-1.66l0.16,-0.94l1.0,-0.37l0.23,2.28l0.18,0.24l2.28,1.02l0.2,0.02l1.52,-0.41l2.06,0.18l2.08,-0.08l0.29,-0.27l0.18,-1.66l-0.1,-0.26l-0.53,-0.44l1.38,-0.23l0.15,-0.07l2.26,-2.0l2.75,-1.65l1.97,0.63l0.25,-0.03l1.54,-0.99l0.89,1.28l-0.72,0.97l0.2,0.48l2.49,0.37l0.11,0.61l-0.69,0.39l-0.15,0.3l0.15,1.22l-1.36,-0.37l-0.23,0.03l-3.24,1.86l-0.15,0.28l0.07,1.44l-1.33,2.16l-0.04,0.13l-0.12,1.24l-0.98,1.91l-1.72,-0.53l-0.39,0.28l-0.09,2.66l-0.52,0.83l-0.04,0.23l0.21,0.89l-0.71,0.36l-1.21,-3.85l-0.29,-0.21l-0.69,0.01l-0.29,0.23l-0.28,1.17l-0.84,-0.84l0.6,-1.17l0.97,-0.13l0.23,-0.16l1.15,-2.25l-0.18,-0.42l-1.54,-0.47l-2.3,0.04l-2.13,-0.33l-0.19,-1.63l-0.26,-0.26l-1.13,-0.13l-1.93,-1.13l-0.42,0.13l-0.88,1.82l0.08,0.37l1.47,1.15l-1.21,0.77l-0.1,0.1l-0.56,0.97l0.13,0.42l1.31,0.61l-0.36,1.35l0.01,0.2l0.85,1.95l0.37,2.05l-0.26,0.68l-1.55,-0.02l-3.09,0.54l-0.25,0.32l0.13,1.84l-1.21,1.4l-3.64,1.79l-2.79,3.04l-1.86,1.61l-2.48,1.68l-0.13,0.25l-0.0,1.0l-1.07,0.55l-2.21,0.9l-1.13,0.13l-0.25,0.19l-0.75,1.96l-0.02,0.15l0.52,3.31l0.13,2.03l-1.03,2.35l-0.03,0.12l-0.01,4.03l-1.02,0.1l-0.23,0.15l-1.14,1.93l0.04,0.36l0.44,0.48l-1.83,0.57l-0.18,0.15l-0.81,1.65l-0.74,0.53l-2.14,-2.12l-1.14,-3.47l-0.96,-2.57l-0.9,-1.26l-1.3,-2.38l-0.61,-3.14l-0.44,-1.62l-2.29,-3.56l-1.03,-4.94l-0.74,-3.29l0.01,-3.12l-0.49,-2.51l-0.41,-0.22l-3.56,1.53l-1.59,-0.28l-2.96,-2.87l0.94,-0.74l0.06,-0.41l-0.74,-1.03l-2.73,-2.1l1.35,-1.43l5.38,0.01l0.29,-0.36l-0.5,-2.29l-0.09,-0.15l-1.33,-1.28l-0.27,-1.96l-0.12,-0.2l-1.36,-1.0l2.42,-2.48l2.77,0.2l0.24,-0.1l2.62,-2.85l1.59,-2.8l2.41,-2.74l0.07,-0.2l-0.04,-1.82l2.01,-1.51l-0.01,-0.49l-1.95,-1.33l-0.83,-1.81l-0.82,-2.27l0.98,-0.97l3.64,0.66l2.89,-0.42l0.17,-0.08l2.18,-2.15Z", "name": "India"}, "TZ": {"path": "M505.77,287.58l0.36,0.23l8.95,5.03l0.15,1.3l0.13,0.21l3.4,2.37l-1.07,2.88l-0.02,0.14l0.15,1.42l0.15,0.23l1.47,0.84l0.05,0.42l-0.66,1.44l-0.02,0.18l0.13,0.72l-0.16,1.16l0.03,0.19l0.87,1.57l1.03,2.48l0.12,0.14l0.53,0.32l-1.59,1.18l-2.64,0.95l-1.45,-0.04l-0.2,0.07l-0.81,0.69l-1.64,0.06l-0.68,0.3l-2.9,-0.69l-1.71,0.17l-0.65,-3.18l-0.05,-0.12l-1.35,-1.88l-0.19,-0.12l-2.41,-0.46l-1.38,-0.74l-1.63,-0.44l-0.96,-0.41l-0.95,-0.58l-1.31,-3.09l-1.47,-1.46l-0.45,-1.31l0.24,-1.34l-0.39,-1.99l0.71,-0.08l0.18,-0.09l0.91,-0.91l0.98,-1.31l0.59,-0.5l0.11,-0.24l-0.02,-0.81l-0.08,-0.2l-0.47,-0.5l-0.1,-0.67l0.51,-0.23l0.18,-0.25l0.14,-1.47l-0.05,-0.2l-0.76,-1.09l0.45,-0.15l2.71,0.03l5.01,-0.19Z", "name": "Tanzania"}, "AZ": {"path": "M539.36,175.66l0.16,0.09l1.11,0.2l0.32,-0.15l0.4,-0.71l1.22,-0.99l1.11,1.33l1.26,2.09l0.22,0.14l1.06,0.13l0.28,0.29l-1.46,0.17l-0.26,0.24l-0.43,2.26l-0.39,0.92l-0.85,0.63l-0.12,0.25l0.06,1.2l-0.22,0.05l-1.28,-1.25l0.74,-1.25l-0.03,-0.35l-0.74,-0.86l-0.3,-0.1l-1.05,0.27l-2.49,1.82l-0.04,-1.46l-0.18,-0.27l-1.09,-0.47l-0.8,-0.6l0.53,-0.7l-0.06,-0.42l-1.11,-0.84l0.34,-0.51l-0.11,-0.43l-0.89,-0.48l-0.33,-0.49l0.25,-0.2l1.78,0.81l1.35,0.18l0.25,-0.09l0.34,-0.35l0.02,-0.39l-1.04,-1.36l0.28,-0.18l0.49,0.07l1.65,1.74ZM533.53,180.16l0.63,0.67l0.22,0.09l0.8,-0.0l0.04,0.31l0.66,1.09l-0.94,-0.21l-1.16,-1.24l-0.25,-0.71Z", "name": "Azerbaijan"}, "IE": {"path": "M405.17,135.35l0.36,2.16l-1.78,2.84l-4.28,1.91l-3.02,-0.43l1.81,-3.13l0.02,-0.26l-1.23,-3.26l3.24,-2.56l1.54,-1.32l0.37,1.33l-0.49,1.77l0.3,0.38l1.49,-0.05l1.68,0.63Z", "name": "Ireland"}, "ID": {"path": "M756.56,287.86l0.69,4.02l0.15,0.21l2.59,1.5l0.39,-0.07l2.05,-2.61l2.75,-1.45l2.09,-0.0l2.08,0.85l1.85,0.89l2.52,0.46l0.08,15.44l-1.72,-1.6l-0.15,-0.07l-2.54,-0.51l-0.29,0.1l-0.53,0.62l-2.53,0.06l0.78,-1.51l1.48,-0.66l0.17,-0.34l-0.65,-2.74l-1.23,-2.19l-0.14,-0.13l-4.85,-2.13l-2.09,-0.23l-3.7,-2.28l-0.41,0.1l-0.67,1.11l-0.63,0.14l-0.41,-0.67l-0.01,-1.01l-0.14,-0.25l-1.39,-0.89l2.05,-0.69l1.73,0.05l0.29,-0.39l-0.21,-0.66l-0.29,-0.21l-3.5,-0.0l-0.9,-1.36l-0.19,-0.13l-2.14,-0.44l-0.65,-0.76l2.86,-0.51l1.28,-0.79l3.75,0.96l0.32,0.76ZM758.01,300.37l-0.79,1.04l-0.14,-1.07l0.4,-0.81l0.29,-0.47l0.24,0.31l-0.0,1.0ZM747.45,292.9l0.48,1.02l-1.45,-0.69l-2.09,-0.21l-1.45,0.16l-1.28,-0.07l0.35,-0.81l2.86,-0.1l2.58,0.68ZM741.15,285.69l-0.16,-0.25l-0.72,-3.08l0.47,-1.86l0.35,-0.38l0.1,0.73l0.25,0.26l1.28,0.19l0.18,0.78l-0.11,1.8l-0.96,-0.18l-0.35,0.22l-0.38,1.52l0.05,0.24ZM741.19,285.75l0.76,0.97l-0.11,0.05l-0.65,-1.02ZM739.18,293.52l-0.61,0.54l-1.44,-0.38l-0.25,-0.55l1.93,-0.09l0.36,0.48ZM728.4,295.87l-0.27,-0.07l-2.26,0.89l-0.37,-0.41l0.27,-0.8l-0.09,-0.33l-1.68,-1.37l0.17,-2.29l-0.42,-0.3l-1.67,0.76l-0.17,0.29l0.21,2.92l0.09,3.34l-1.22,0.28l-0.78,-0.54l0.65,-2.1l0.01,-0.14l-0.39,-2.42l-0.29,-0.25l-0.86,-0.02l-0.63,-1.4l0.99,-1.61l0.35,-1.97l1.24,-3.73l0.49,-0.96l1.95,-1.7l1.86,0.69l3.16,0.35l2.92,-0.1l0.17,-0.06l2.24,-1.65l0.11,0.14l-1.8,2.22l-1.72,0.44l-2.41,-0.48l-4.21,0.13l-2.19,0.36l-0.25,0.24l-0.36,1.9l0.08,0.27l2.24,2.23l0.4,0.02l1.29,-1.08l3.19,-0.58l-0.19,0.06l-1.04,1.4l-2.13,0.94l-0.12,0.45l2.26,3.06l-0.37,0.69l0.03,0.32l1.51,1.95ZM728.48,295.97l0.59,0.76l-0.02,1.37l-1.0,0.55l-0.64,-0.58l1.09,-1.84l-0.02,-0.26ZM728.64,286.95l0.79,-0.14l-0.07,0.39l-0.72,-0.24ZM732.38,310.1l-1.89,0.49l-0.06,-0.06l0.17,-0.64l1.0,-1.42l2.14,-0.87l0.1,0.2l0.04,0.58l-1.49,1.72ZM728.26,305.71l-0.17,0.63l-3.53,0.67l-3.02,-0.28l-0.0,-0.42l1.66,-0.44l1.47,0.71l0.16,0.03l1.75,-0.21l1.69,-0.69ZM722.98,310.33l-0.74,0.03l-2.52,-1.35l1.42,-0.3l1.19,0.7l0.72,0.63l-0.06,0.28ZM716.24,305.63l0.66,0.49l0.22,0.06l1.35,-0.18l0.31,0.53l-4.18,0.77l-0.8,-0.01l0.51,-0.86l1.2,-0.02l0.24,-0.12l0.49,-0.65ZM715.84,280.21l0.09,0.34l2.25,1.86l-2.25,0.22l-0.24,0.17l-0.84,1.71l-0.03,0.15l0.1,2.11l-2.27,1.62l-0.13,0.24l-0.06,2.46l-0.74,2.92l-0.02,-0.05l-0.39,-0.16l-2.62,1.04l-0.86,-1.33l-0.23,-0.14l-1.71,-0.14l-1.19,-0.76l-0.25,-0.03l-2.78,0.84l-0.79,-1.05l-0.26,-0.12l-1.61,0.13l-1.8,-0.25l-0.36,-3.13l-0.15,-0.23l-1.18,-0.65l-1.13,-2.02l-0.33,-2.1l0.27,-2.19l1.05,-1.17l0.28,1.12l0.1,0.16l1.71,1.41l0.28,0.05l1.55,-0.49l1.54,0.17l0.23,-0.07l1.4,-1.21l1.05,-0.19l2.3,0.68l0.16,0.0l2.04,-0.53l0.21,-0.19l1.26,-3.41l0.91,-0.82l0.09,-0.14l0.8,-2.64l2.63,0.0l1.71,0.33l-1.19,1.89l0.02,0.34l1.74,2.24l-0.37,1.0ZM692.67,302.0l0.26,0.19l4.8,0.25l0.28,-0.16l0.44,-0.83l4.29,1.12l0.85,1.52l0.23,0.15l3.71,0.45l2.37,1.15l-2.06,0.69l-2.77,-1.0l-2.25,0.07l-2.57,-0.18l-2.31,-0.45l-2.94,-0.97l-1.84,-0.25l-0.13,0.01l-0.97,0.29l-4.34,-0.98l-0.38,-0.94l-0.25,-0.19l-1.76,-0.14l1.31,-1.84l2.81,0.14l1.97,0.96l0.95,0.19l0.28,0.74ZM685.63,299.27l-2.36,0.04l-2.07,-2.05l-3.17,-2.02l-1.06,-1.5l-1.88,-2.02l-1.22,-1.85l-1.9,-3.49l-2.2,-2.11l-0.71,-2.08l-0.94,-1.99l-0.1,-0.12l-2.21,-1.54l-1.35,-2.17l-1.86,-1.39l-2.53,-2.68l-0.14,-0.81l1.22,0.08l3.76,0.47l2.16,2.4l1.94,1.7l1.37,1.04l2.35,2.67l0.22,0.1l2.44,0.04l1.99,1.62l1.42,2.06l0.09,0.09l1.67,1.0l-0.88,1.8l0.11,0.39l1.44,0.87l0.13,0.04l0.68,0.05l0.41,1.62l0.87,1.4l0.22,0.14l1.71,0.21l1.06,1.38l-0.61,3.04l-0.09,3.6Z", "name": "Indonesia"}, "UA": {"path": "M500.54,141.42l0.9,0.13l0.27,-0.11l0.52,-0.62l0.68,0.13l2.43,-0.3l1.32,1.57l-0.45,0.48l-0.07,0.26l0.21,1.03l0.27,0.24l1.85,0.15l0.76,1.22l-0.05,0.55l0.2,0.31l3.18,1.15l0.18,0.01l1.75,-0.47l1.42,1.41l0.22,0.09l1.42,-0.03l3.44,0.99l0.02,0.65l-0.97,1.62l-0.03,0.24l0.52,1.67l-0.29,0.79l-2.24,0.22l-0.14,0.05l-1.29,0.89l-0.13,0.23l-0.07,1.16l-1.75,0.22l-0.12,0.04l-1.6,0.98l-2.27,0.16l-0.12,0.04l-2.16,1.17l-0.16,0.29l0.15,1.94l0.14,0.23l1.23,0.75l0.18,0.04l2.06,-0.15l-0.22,0.51l-2.67,0.54l-3.27,1.72l-1.0,-0.45l0.45,-1.19l-0.19,-0.39l-2.34,-0.78l0.15,-0.2l2.32,-1.0l0.09,-0.49l-0.73,-0.72l-0.15,-0.08l-3.69,-0.75l-0.14,-0.96l-0.35,-0.25l-2.32,0.39l-0.21,0.15l-0.91,1.7l-1.77,2.1l-0.93,-0.44l-0.24,-0.0l-1.05,0.45l-0.48,-0.25l0.13,-0.07l0.14,-0.15l0.43,-1.04l0.67,-0.97l0.04,-0.26l-0.1,-0.31l0.04,-0.02l0.11,0.19l0.24,0.15l1.48,0.09l0.78,-0.25l0.07,-0.53l-0.27,-0.19l0.09,-0.25l-0.08,-0.33l-0.81,-0.74l-0.34,-1.24l-0.14,-0.18l-0.73,-0.42l0.15,-0.87l-0.11,-0.29l-1.13,-0.86l-0.15,-0.06l-0.97,-0.11l-1.79,-0.97l-0.2,-0.03l-1.66,0.32l-0.13,0.06l-0.52,0.41l-0.95,-0.0l-0.23,0.11l-0.56,0.66l-1.74,0.29l-0.79,0.43l-1.01,-0.68l-0.16,-0.05l-1.57,-0.01l-1.52,-0.35l-0.23,0.04l-0.71,0.45l-0.09,-0.43l-0.13,-0.19l-1.18,-0.74l0.38,-1.02l0.53,-0.64l0.35,0.12l0.37,-0.41l-0.57,-1.29l2.1,-2.5l1.16,-0.36l0.2,-0.2l0.27,-0.92l-0.01,-0.2l-1.1,-2.52l0.79,-0.09l0.13,-0.05l1.3,-0.86l1.83,-0.07l2.48,0.26l2.84,0.8l1.91,0.06l0.88,0.45l0.29,-0.01l0.72,-0.44l0.49,0.58l0.25,0.11l2.2,-0.16l0.94,0.3l0.39,-0.26l0.15,-1.57l0.61,-0.59l2.01,-0.19Z", "name": "Ukraine"}, "QA": {"path": "M548.47,221.47l-0.15,-1.72l0.59,-1.23l0.38,-0.16l0.54,0.6l0.04,1.4l-0.47,1.37l-0.41,0.11l-0.53,-0.37Z", "name": "Qatar"}, "MZ": {"path": "M507.71,314.14l1.65,-0.18l2.96,0.7l0.2,-0.02l0.6,-0.29l1.68,-0.06l0.18,-0.07l0.8,-0.69l1.5,0.02l2.74,-0.98l1.74,-1.27l0.25,0.7l-0.1,2.47l0.31,2.27l0.1,3.97l0.42,1.24l-0.7,1.71l-0.94,1.73l-1.52,1.52l-5.06,2.21l-2.88,2.8l-1.01,0.51l-1.72,1.81l-0.99,0.58l-0.15,0.23l-0.21,1.86l0.04,0.19l1.17,1.95l0.47,1.47l0.03,0.74l0.39,0.28l0.05,-0.01l-0.06,2.13l-0.39,1.19l0.1,0.33l0.42,0.32l-0.28,0.83l-0.95,0.86l-2.03,0.88l-3.08,1.49l-1.1,0.99l-0.09,0.28l0.21,1.13l0.21,0.23l0.38,0.11l-0.14,0.89l-1.39,-0.02l-0.17,-0.94l-0.38,-1.23l-0.2,-0.89l0.44,-2.91l-0.01,-0.14l-0.65,-1.88l-1.15,-3.55l2.52,-2.85l0.68,-1.89l0.29,-0.18l0.14,-0.2l0.28,-1.53l-0.03,-0.19l-0.36,-0.7l0.1,-1.83l0.49,-1.84l-0.01,-3.26l-0.14,-0.25l-1.3,-0.83l-0.11,-0.04l-1.08,-0.17l-0.47,-0.55l-0.1,-0.08l-1.16,-0.54l-0.13,-0.03l-1.83,0.04l-0.32,-2.25l7.19,-1.99l1.32,1.12l0.29,0.06l0.55,-0.19l0.75,0.49l0.11,0.81l-0.49,1.11l-0.02,0.15l0.19,1.81l0.09,0.18l1.63,1.59l0.48,-0.1l0.72,-1.68l0.99,-0.49l0.17,-0.29l-0.21,-3.29l-0.04,-0.13l-1.11,-1.92l-0.9,-0.82l-0.21,-0.08l-0.62,0.03l-0.63,-2.98l0.61,-1.67Z", "name": "Mozambique"}}, "height": 440.7063107441331, "projection": {"type": "mill", "centralMeridian": 11.5}, "width": 900.0});
\ No newline at end of file
diff --git a/common/test/data/conditional_and_poll/README b/common/test/data/conditional_and_poll/README
new file mode 100644
index 0000000000..fc95a7c0c9
--- /dev/null
+++ b/common/test/data/conditional_and_poll/README
@@ -0,0 +1,50 @@
+Any place that says "YEAR_SEMESTER" needs to be replaced with something 
+in the form "2013_Spring". Take note of this name exactly, you'll need to 
+use it everywhere, precisely - capitalization is very important.
+
+See https://github.com/MITx/mitx/blob/master/doc/xml-format.md for more on all this.
+-----------------------
+
+about/: Files that live here will be visible OUTSIDE OF COURSEWARE.
+   YEAR_SEMESTER/
+        end_date.html: Specifies in plain-text the end date of the course
+	overview.html: Text of the overview of the course
+	short_description.html: 10-15 words about the course
+	prerequisites.html: Any prerequisites for the course, or None if there are none.
+
+course/
+    YEAR_SEMESTER.xml: This is your top-level xml page that points at chapters. 
+    		       Can just be <course/> for now.
+
+course.xml: This top level file points at a file in roots/. See creating_course.xml.
+
+creating_course.xml: Explains how to create course.xml
+
+info/: Files that live here will be visible on the COURSE LANDING PAGE 
+       (Course Info) WITHIN THE COURSEWARE.
+    YEAR_SEMESTER/
+        handouts.html: A list of handouts, or an empty file if there are none 
+		       (if this file doesn't exist, it displays an error)
+	updates.html: Course updates.
+
+policies/ 
+    YEAR_SEMESTER/
+        policy.json: See https://github.com/MITx/mitx/blob/master/doc/xml-format.md 
+		     for more on the fields specified by this file.
+	grading_policy.json: Optional -- you don't need it to get a course off the 
+			     ground but will eventually. For more info see 
+			     https://github.com/MITx/mitx/blob/master/doc/course_grading.md
+
+roots/
+    YEAR_SEMESTER.xml: Looks something like 
+    		       <course url_name="YEAR_SEMESTER" org="ORG"  course="COURSENUM"/> 
+		       where ORG in {"MITx", "HarvardX", "BerkeleyX"}
+
+static/
+	See README.
+
+	images/
+		course_image.jpg: You MUST have an image named this to be the background
+				  banner image on edx.org
+
+-----------------------
\ No newline at end of file
diff --git a/common/test/data/conditional_and_poll/README.md b/common/test/data/conditional_and_poll/README.md
new file mode 100644
index 0000000000..7dbfa46a26
--- /dev/null
+++ b/common/test/data/conditional_and_poll/README.md
@@ -0,0 +1,2 @@
+content-harvard-justicex
+========================
\ No newline at end of file
diff --git a/common/test/data/conditional_and_poll/about/2013_Spring/overview.html b/common/test/data/conditional_and_poll/about/2013_Spring/overview.html
new file mode 100644
index 0000000000..9c49899948
--- /dev/null
+++ b/common/test/data/conditional_and_poll/about/2013_Spring/overview.html
@@ -0,0 +1,79 @@
+
+
+<section class="about">
+    <h2>About ER22x</h2>
+    
+    <p>Justice is a critical analysis of classical and contemporary theories of justice, including discussion of present-day applications. Topics include affirmative action, income distribution, same-sex marriage, the role of markets, debates about rights (human rights and property rights), arguments for and against equality, dilemmas of loyalty in public and private life. The course invites students to subject their own views on these controversies to critical examination.</p>
+
+<p>The principle readings for the course are texts by Aristotle, John Locke, Immanuel Kant, John Stuart Mill, and John Rawls. Other assigned readings include writings by contemporary philosophers, court cases, and articles about political controversies that raise philosophical questions.</p>
+
+<!-- 
+<p>The assigned readings will be freely available online. They are also collected in an edited volume, <emph>Justice: A Reader</emph> (ed. Michael Sandel, Oxford University Press). Students who would like further guidance on the themes of the lectures can read Michael Sandel, <emph>Justice: What’s the Right Thing to Do?</emph>  (Recommended but not required.)
+</p>
+ -->
+
+</section>
+
+
+<section class="course-staff">
+    <h2>Course instructor</h3>
+    <article class="teacher">
+        <!-- TODO: Need to change image location -->
+        <!-- First Professor -->
+        <div class="teacher-image"><img src="/static/images/professor-sandel.jpg"/></div>
+        <h3>Michael J. Sandel</h3> 
+        <p>Michael J. Sandel is the Anne T. and Robert M. Bass Professor of Government at Harvard University, where he teaches political philosophy.  His course "Justice" has enrolled more than 15,000 Harvard students.  Sandel's writings have been published in 21 languages.  His books include <i>What Money Can't Buy: The Moral Limits of Markets</i> (2012); <i>Justice: What's the Right Thing to Do?</i> (2009); <i>The Case against Perfection: Ethics in the Age of Genetic Engineering</i> (2007); <i>Public Philosophy: Essays on Morality in Politics</i> (2005); <i>Democracy's Discontent</i> (1996); and <i>Liberalism and the Limits of Justice</i>(1982; 2nd ed., 1998). </p>
+<p><br></p>
+</section>
+        
+        
+<section class="faq">
+  <section class="responses">
+    <h2>Frequently Asked Questions</h2>
+    <article class="response">
+      <h3>How much does it cost to take the course?</h3>
+<p>Nothing! The course is free.</p>
+    </article>
+
+    <article class="response">
+      <h3>Does the course have any prerequisites?</h3>
+<p>No.  Only an interest in thinking through some of the big ethical and civic questions we face in our everyday lives.</p>
+    </article>
+    
+    <article class="response">
+    <h3>Do I need any other materials to take the course?</h3>
+    <p>No. As long as you’ve got a computer to access the website, you are ready to take the course.</p>
+    </article>
+
+    <article class="response">
+    <h3>Is there a textbook for the course?</h3>
+    <p>All of the course readings that are in the public domain are freely available online, at links provided on the course website. The course can be taken using these free resources alone.  For those who wish to purchase a printed version of the assigned readings, an edited volume entitled, Justice: A Reader (ed., Michael Sandel) is available in paperback from Oxford University Press (in bookstores and from online booksellers).  Those who would like supplementary readings on the themes of the lectures can find them in Michael Sandel's book Justice: What's the Right Thing to Do?, which is available in various languages throughout the world. This book is not required, and the course can be taken using the free online resources alone.</p>
+    </article>
+  
+    <article class="response">
+    <h3>Do I need to watch the lectures at a specific time?</h3>
+    <p>No. You can watch the lectures at your leisure.</p>
+    </article>
+
+    <article class="response">
+    <h3>Will I be able to participate in class discussions?</h3>
+    <p>Yes, in several ways: </p>
+    
+    <ol>
+<li><p> Each lecture invites you to respond to a poll question related to the themes of the lecture.  If you respond to the question, you will be presented with a challenge to the opinion you have expressed, and invited to reply to the challenge.  You can also, if you wish, comment on the opinions and responses posted by other students in the course, continuing the discussion.</p></li>
+
+<li><p> In addition to the poll question, each class contains a discussion prompt that invites you to offer your view on a controversial question related to the lecture.  If you wish, you can respond to this question, and then see what other students have to say about the argument you present.  You can also comment on the opinions posted by other students.  One aim of the course is to promote reasoned public dialogue about hard moral and political questions.  </p></li>
+
+<li><p> Each week, there will be an optional live dialogue enabling students to interact with instructors and participants from around the world.</p></li>
+</ol>
+    </article>
+    
+    <article class="response">
+    <h3>Will certificates be awarded?</h3>
+    <p>Yes. Online learners who achieve a passing grade in a course can earn a certificate of mastery. These certificates will indicate you have successfully completed the course, but will not include a specific grade. Certificates will be issued by edX under the name of HarvardX, designating the institution from which the course originated. </p>
+    </article>    
+
+  </section>
+</section>
+        
+   
\ No newline at end of file
diff --git a/common/test/data/conditional_and_poll/about/2013_Spring/prerequisites.html b/common/test/data/conditional_and_poll/about/2013_Spring/prerequisites.html
new file mode 100644
index 0000000000..b0047fa49f
--- /dev/null
+++ b/common/test/data/conditional_and_poll/about/2013_Spring/prerequisites.html
@@ -0,0 +1 @@
+None
diff --git a/common/test/data/conditional_and_poll/about/2013_Spring/short_description.html b/common/test/data/conditional_and_poll/about/2013_Spring/short_description.html
new file mode 100644
index 0000000000..208880c842
--- /dev/null
+++ b/common/test/data/conditional_and_poll/about/2013_Spring/short_description.html
@@ -0,0 +1 @@
+JusticeX is an introduction to moral and political philosophy, including discussion of contemporary dilemmas and controversies.
\ No newline at end of file
diff --git a/common/test/data/conditional_and_poll/about/2013_Spring/video.html b/common/test/data/conditional_and_poll/about/2013_Spring/video.html
new file mode 100644
index 0000000000..0cf427b16c
--- /dev/null
+++ b/common/test/data/conditional_and_poll/about/2013_Spring/video.html
@@ -0,0 +1 @@
+<iframe width="560" height="315" src="http://www.youtube.com/embed/fajlZMdPkKE#!" frameborder="0" allowfullscreen></iframe>
\ No newline at end of file
diff --git a/common/test/data/conditional_and_poll/chapter/Staff.xml b/common/test/data/conditional_and_poll/chapter/Staff.xml
new file mode 100644
index 0000000000..e1d5216f6d
--- /dev/null
+++ b/common/test/data/conditional_and_poll/chapter/Staff.xml
@@ -0,0 +1,3 @@
+<chapter>
+    <sequential url_name="Problem_Demos"/>
+</chapter>
diff --git a/common/test/data/conditional_and_poll/conditional/condone.xml b/common/test/data/conditional_and_poll/conditional/condone.xml
new file mode 100644
index 0000000000..80b061e244
--- /dev/null
+++ b/common/test/data/conditional_and_poll/conditional/condone.xml
@@ -0,0 +1,3 @@
+        <conditional attempted="True" sources="i4x://HarvardX/ER22x/problem/choiceprob">
+            <html url_name="secret_page" />
+        </conditional>
diff --git a/common/test/data/conditional_and_poll/course.xml b/common/test/data/conditional_and_poll/course.xml
new file mode 120000
index 0000000000..f4f5c17b87
--- /dev/null
+++ b/common/test/data/conditional_and_poll/course.xml
@@ -0,0 +1 @@
+roots/2013_Spring.xml
\ No newline at end of file
diff --git a/common/test/data/conditional_and_poll/course/2013_Spring.xml b/common/test/data/conditional_and_poll/course/2013_Spring.xml
new file mode 100644
index 0000000000..2eea422a2f
--- /dev/null
+++ b/common/test/data/conditional_and_poll/course/2013_Spring.xml
@@ -0,0 +1,12 @@
+<!-- Name this file eg "2012_Fall.xml" or "2013_Spring.xml" 
+     Take note of this name exactly, you'll need to use it everywhere. -->
+<course>
+  <chapter url_name="Staff"/>
+  <chapter name="Problems with Condition">
+        <sequential>
+            <problem url_name="choiceprob" />
+            <conditional url_name="condone"/>
+        </sequential>
+  </chapter>
+</course>
+
diff --git a/common/test/data/conditional_and_poll/creating_course.xml b/common/test/data/conditional_and_poll/creating_course.xml
new file mode 100644
index 0000000000..4c90f1c2ec
--- /dev/null
+++ b/common/test/data/conditional_and_poll/creating_course.xml
@@ -0,0 +1,8 @@
+<!-- A file named "course.xml" in your top-level should point 
+at the appropriate roots file. You can do so like this:
+
+$ rm course.xml
+$ ln -s roots/YEAR_SEMESTER.xml course.xml
+
+
+Ask Sarina for help with this. -->
diff --git a/common/test/data/conditional_and_poll/html/secret_page.xml b/common/test/data/conditional_and_poll/html/secret_page.xml
new file mode 100644
index 0000000000..63be3cfa8d
--- /dev/null
+++ b/common/test/data/conditional_and_poll/html/secret_page.xml
@@ -0,0 +1,4 @@
+<html display_name="Secret Page">
+<p>This is a secret!</p>
+</html>
+
diff --git a/common/test/data/conditional_and_poll/info/2013_Spring/handouts.html b/common/test/data/conditional_and_poll/info/2013_Spring/handouts.html
new file mode 100644
index 0000000000..35f2c89474
--- /dev/null
+++ b/common/test/data/conditional_and_poll/info/2013_Spring/handouts.html
@@ -0,0 +1,3 @@
+<ol>
+  <li>A list of course handouts, or an empty file if there are none.</li>
+</ol>
diff --git a/common/test/data/conditional_and_poll/info/2013_Spring/updates.html b/common/test/data/conditional_and_poll/info/2013_Spring/updates.html
new file mode 100644
index 0000000000..9744c1699d
--- /dev/null
+++ b/common/test/data/conditional_and_poll/info/2013_Spring/updates.html
@@ -0,0 +1,10 @@
+<!-- If you wish to make a welcome announcement -->
+<ol>
+
+  <li><h2>December 9</h2>
+    <section class="update-description">
+      <p>Announcement text</p>
+    </section>
+  </li>
+
+</ol>
diff --git a/common/test/data/conditional_and_poll/policies/2013_Spring/policy.json b/common/test/data/conditional_and_poll/policies/2013_Spring/policy.json
new file mode 100644
index 0000000000..e2a204815c
--- /dev/null
+++ b/common/test/data/conditional_and_poll/policies/2013_Spring/policy.json
@@ -0,0 +1,8 @@
+{
+    "course/2013_Spring": {
+        "start": "2099-01-01T00:00",
+	    "advertised_start" : "Spring 2013", 
+        "display_name": "Justice"
+    }
+
+}
diff --git a/common/test/data/conditional_and_poll/problem/choiceprob.xml b/common/test/data/conditional_and_poll/problem/choiceprob.xml
new file mode 100644
index 0000000000..fa91954977
--- /dev/null
+++ b/common/test/data/conditional_and_poll/problem/choiceprob.xml
@@ -0,0 +1,22 @@
+<problem display_name="S3E2: Lorentz Force">
+
+<startouttext/>
+<p>Consider a hypothetical magnetic field pointing out of your computer screen. Now imagine an electron traveling from right to left in the plane of your screen. A diagram of this situation is show below…</p>
+<center><img width="400" src="/static/images/LSQimages/LSQ_W01_8.png"/></center>
+
+<p>a. The magnitude of the force experienced by the electron is proportional the product of which of the following? (Select all that apply.)</p>
+<endouttext/>
+<choiceresponse>
+<checkboxgroup>
+<!-- include ellipses to test non-ascii characters -->
+<choice correct="true"><text>Magnetic field strength…</text></choice>
+<choice correct="false"><text>Electric field strength…</text></choice>
+<choice correct="true"><text>Electric charge of the electron…</text></choice>
+<choice correct="false"><text>Radius of the electron…</text></choice>
+<choice correct="false"><text>Mass of the electron…</text></choice>
+<choice correct="true"><text>Velocity of the electron…</text></choice>
+
+</checkboxgroup>
+</choiceresponse>
+
+</problem>
diff --git a/common/test/data/conditional_and_poll/roots/2013_Spring.xml b/common/test/data/conditional_and_poll/roots/2013_Spring.xml
new file mode 100644
index 0000000000..1b97a5a714
--- /dev/null
+++ b/common/test/data/conditional_and_poll/roots/2013_Spring.xml
@@ -0,0 +1,2 @@
+<course url_name="2013_Spring" org="HarvardX" course="ER22x"/>
+
diff --git a/common/test/data/conditional_and_poll/sequential/Problem_Demos.xml b/common/test/data/conditional_and_poll/sequential/Problem_Demos.xml
new file mode 100644
index 0000000000..e10298336d
--- /dev/null
+++ b/common/test/data/conditional_and_poll/sequential/Problem_Demos.xml
@@ -0,0 +1,31 @@
+<sequential>
+    <vertical>
+        <poll_question id="first_poll" display_name="first poll">
+                <h3>What's the Right Thing to Do?</h3>
+                <p>Suppose four shipwrecked sailors are stranded at sea in a lifeboat, without
+    food or water. Would it be wrong for three of them to kill and eat the cabin
+    boy, in order to save their own lives?</p>
+            <answer id="Yes">Yes</answer>
+            <answer id="No">No</answer>
+            <answer id="Dont_know">Don't know</answer>
+        </poll_question>
+        <poll_question id="second_poll" display_name="second poll">
+                <h3>What's the Right Thing to Do?</h3>
+                <p>Suppose four shipwrecked sailors are stranded at sea in a lifeboat, without
+    food or water. Would it be wrong for three of them to kill and eat the cabin
+    boy, in order to save their own lives?</p>
+            <answer id="Yes">Yes</answer>
+            <answer id="No">No</answer>
+            <answer id="Dont_know">Don't know</answer>
+        </poll_question>
+    </vertical>
+
+    <wrapper>
+        <!-- Test many show tags -->
+        <html>Condition: first_poll - Yes</html>
+        <conditional sources="i4x://HarvardX/ER22x/poll_question/first_poll" poll_answer="Yes">
+            <html>In first condition.</html>
+            <show sources="i4x://HarvardX/ER22x/poll_question/second_poll"/>
+        </conditional>
+    </wrapper>
+</sequential>
diff --git a/common/test/data/conditional_and_poll/static/README b/common/test/data/conditional_and_poll/static/README
new file mode 100644
index 0000000000..e22f378b5e
--- /dev/null
+++ b/common/test/data/conditional_and_poll/static/README
@@ -0,0 +1,5 @@
+Images, handouts, and other statically-served content should go ONLY
+in this directory.
+
+Images for the front page should go in static/images. The frontpage
+banner MUST be named course_image.jpg
\ No newline at end of file
diff --git a/common/test/data/conditional_and_poll/static/images/course_image.jpg b/common/test/data/conditional_and_poll/static/images/course_image.jpg
new file mode 100644
index 0000000000..b6a64b9396
Binary files /dev/null and b/common/test/data/conditional_and_poll/static/images/course_image.jpg differ
diff --git a/common/test/data/conditional_and_poll/static/images/professor-sandel.jpg b/common/test/data/conditional_and_poll/static/images/professor-sandel.jpg
new file mode 100644
index 0000000000..41bde60165
Binary files /dev/null and b/common/test/data/conditional_and_poll/static/images/professor-sandel.jpg differ
diff --git a/doc/development.md b/doc/development.md
index 16c689ff05..184767a139 100644
--- a/doc/development.md
+++ b/doc/development.md
@@ -9,9 +9,8 @@ This will read the `Gemfile` and install all of the gems specified there.
 
 ### Python
 
-In order, run the following:
+Run the following::
 
-    pip install -r pre-requirements.txt
     pip install -r requirements.txt
     pip install -r test-requirements.txt
 
diff --git a/jenkins/base.sh b/jenkins/base.sh
new file mode 100644
index 0000000000..c7175e6e52
--- /dev/null
+++ b/jenkins/base.sh
@@ -0,0 +1,12 @@
+
+function github_status {
+    gcli status create mitx mitx $GIT_COMMIT \
+         --params=$1 \
+                  target_url:$BUILD_URL \
+                  description:"Build #$BUILD_NUMBER is running" \
+         -f csv
+}
+
+function github_mark_failed_on_exit {
+    trap '[ $? == "0" ] || github_status state:failed' EXIT
+}
\ No newline at end of file
diff --git a/jenkins/quality.sh b/jenkins/quality.sh
deleted file mode 100755
index 56217af874..0000000000
--- a/jenkins/quality.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/bash
-
-set -e
-set -x
-
-git remote prune origin
-
-# Reset the submodule, in case it changed
-git submodule foreach 'git reset --hard HEAD'
-
-# Set the IO encoding to UTF-8 so that askbot will start
-export PYTHONIOENCODING=UTF-8
-
-rake clobber
-rake pep8 || echo "pep8 failed, continuing"
-rake pylint || echo "pylint failed, continuing"
diff --git a/jenkins/test.sh b/jenkins/test.sh
index 5b9a5ed9bd..1f5ce70b1b 100755
--- a/jenkins/test.sh
+++ b/jenkins/test.sh
@@ -32,18 +32,22 @@ if [ ! -d /mnt/virtualenvs/"$JOB_NAME" ]; then
     virtualenv /mnt/virtualenvs/"$JOB_NAME"
 fi
 
+export PIP_DOWNLOAD_CACHE=/mnt/pip-cache
+
 source /mnt/virtualenvs/"$JOB_NAME"/bin/activate
 pip install -q -r pre-requirements.txt
-pip install -q -r test-requirements.txt
-yes w | pip install -q -r requirements.txt
+yes w | pip install -q -r test-requirements.txt -r requirements.txt
 
 rake clobber
+rake pep8 > pep8.log || cat pep8.log
+rake pylint > pylint.log || cat pylint.log
+
 TESTS_FAILED=0
 rake test_cms[false] || TESTS_FAILED=1
 rake test_lms[false] || TESTS_FAILED=1
 rake test_common/lib/capa || TESTS_FAILED=1
 rake test_common/lib/xmodule || TESTS_FAILED=1
-# Don't run the lms jasmine tests for now because 
+# Don't run the lms jasmine tests for now because
 # they mostly all fail anyhow
 # rake phantomjs_jasmine_lms || true
 rake phantomjs_jasmine_cms || TESTS_FAILED=1
diff --git a/lms/djangoapps/circuit/views.py b/lms/djangoapps/circuit/views.py
index 9711e0648c..40a31a2e3a 100644
--- a/lms/djangoapps/circuit/views.py
+++ b/lms/djangoapps/circuit/views.py
@@ -9,7 +9,7 @@ from django.http import HttpResponse
 from django.shortcuts import redirect
 from mitxmako.shortcuts import render_to_response, render_to_string
 
-from models import ServerCircuit
+from .models import ServerCircuit
 
 
 def circuit_line(circuit):
diff --git a/lms/djangoapps/course_wiki/views.py b/lms/djangoapps/course_wiki/views.py
index 6e9f2e38de..6ab106ed70 100644
--- a/lms/djangoapps/course_wiki/views.py
+++ b/lms/djangoapps/course_wiki/views.py
@@ -95,7 +95,7 @@ def course_wiki_redirect(request, course_id):
             root,
             course_slug,
             title=course_slug,
-            content="This is the wiki for **{0}**'s _{1}_.".format(course.org, course.title),
+            content="This is the wiki for **{0}**'s _{1}_.".format(course.org, course.display_name_with_default),
             user_message="Course page automatically created.",
             user=None,
             ip_address=None,
diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index eaf06d79dc..08bf49ac98 100644
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -164,7 +164,7 @@ def _has_access_course_desc(user, course, action):
         if settings.MITX_FEATURES.get('ACCESS_REQUIRE_STAFF_FOR_COURSE'):
             # if this feature is on, only allow courses that have ispublic set to be
             # seen by non-staff
-            if course.metadata.get('ispublic'):
+            if course.lms.ispublic:
                 debug("Allow: ACCESS_REQUIRE_STAFF_FOR_COURSE and ispublic")
                 return True
             return _has_staff_access_to_descriptor(user, course)
@@ -240,7 +240,7 @@ def _has_access_descriptor(user, descriptor, action, course_context=None):
             return True
 
         # Check start date
-        if descriptor.start is not None:
+        if descriptor.lms.start is not None:
             now = time.gmtime()
             effective_start = _adjust_start_date_for_beta_testers(user, descriptor)
             if now > effective_start:
@@ -495,9 +495,9 @@ def _adjust_start_date_for_beta_testers(user, descriptor):
     NOTE: If testing manually, make sure MITX_FEATURES['DISABLE_START_DATES'] = False
     in envs/dev.py!
     """
-    if descriptor.days_early_for_beta is None:
+    if descriptor.lms.days_early_for_beta is None:
         # bail early if no beta testing is set up
-        return descriptor.start
+        return descriptor.lms.start
 
     user_groups = [g.name for g in user.groups.all()]
 
@@ -508,13 +508,13 @@ def _adjust_start_date_for_beta_testers(user, descriptor):
         # subtract, convert back.
         # (fun fact: datetime(*a_time_struct[:6]) is the beautiful syntax for
         # converting time_structs into datetimes)
-        start_as_datetime = datetime(*descriptor.start[:6])
-        delta = timedelta(descriptor.days_early_for_beta)
+        start_as_datetime = datetime(*descriptor.lms.start[:6])
+        delta = timedelta(descriptor.lms.days_early_for_beta)
         effective = start_as_datetime - delta
         # ...and back to time_struct
         return effective.timetuple()
 
-    return descriptor.start
+    return descriptor.lms.start
 
 
 def _has_instructor_access_to_location(user, location, course_context=None):
diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py
index 52346d7583..3e1162bc03 100644
--- a/lms/djangoapps/courseware/courses.py
+++ b/lms/djangoapps/courseware/courses.py
@@ -11,7 +11,7 @@ from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.http import Http404
 
-from module_render import get_module
+from .module_render import get_module
 from xmodule.course_module import CourseDescriptor
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
@@ -19,10 +19,10 @@ from xmodule.contentstore.content import StaticContent
 from xmodule.modulestore.xml import XMLModuleStore
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.x_module import XModule
+from courseware.model_data import ModelDataCache
 from static_replace import replace_static_urls
 from courseware.access import has_access
 import branding
-from courseware.models import StudentModuleCache
 from xmodule.modulestore.exceptions import ItemNotFoundError
 
 log = logging.getLogger(__name__)
@@ -89,7 +89,7 @@ def course_image_url(course):
     """Try to look up the image url for the course.  If it's not found,
     log an error and return the dead link"""
     if isinstance(modulestore(), XMLModuleStore):
-        return '/static/' + course.metadata['data_dir'] + "/images/course_image.jpg"
+        return '/static/' + course.data_dir + "/images/course_image.jpg"
     else:
         loc = course.location._replace(tag='c4x', category='asset', name='images_course_image.jpg')
         path = StaticContent.get_url_path_from_location(loc)
@@ -153,12 +153,23 @@ def get_course_about_section(course, section_key):
             request = get_request_for_thread()
 
             loc = course.location._replace(category='about', name=section_key)
-            course_module = get_module(request.user, request, loc, None, course.id, not_found_ok=True, wrap_xmodule_display=False)
+
+            # Use an empty cache
+            model_data_cache = ModelDataCache([], course.id, request.user)
+            about_module = get_module(
+                request.user,
+                request,
+                loc,
+                model_data_cache,
+                course.id,
+                not_found_ok=True,
+                wrap_xmodule_display=False
+            )
 
             html = ''
 
-            if course_module is not None:
-                html = course_module.get_html()
+            if about_module is not None:
+                html = about_module.get_html()
 
             return html
 
@@ -167,7 +178,7 @@ def get_course_about_section(course, section_key):
                 key=section_key, url=course.location.url()))
             return None
     elif section_key == "title":
-        return course.metadata.get('display_name', course.url_name)
+        return course.display_name_with_default
     elif section_key == "university":
         return course.location.org
     elif section_key == "number":
@@ -177,7 +188,7 @@ def get_course_about_section(course, section_key):
 
 
 
-def get_course_info_section(request, cache, course, 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,
     given the key for the section.
@@ -191,11 +202,22 @@ def get_course_info_section(request, cache, course, section_key):
 
 
     loc = Location(course.location.tag, course.location.org, course.location.course, 'course_info', section_key)
-    course_module = get_module(request.user, request, loc, cache, course.id, wrap_xmodule_display=False)
+
+    # Use an empty cache
+    model_data_cache = ModelDataCache([], course.id, request.user)
+    info_module = get_module(
+        request.user,
+        request,
+        loc,
+        model_data_cache,
+        course.id,
+        wrap_xmodule_display=False
+    )
+
     html = ''
 
-    if course_module is not None:
-        html = course_module.get_html()
+    if info_module is not None:
+        html = info_module.get_html()
 
     return html
 
@@ -226,7 +248,7 @@ def get_course_syllabus_section(course, section_key):
             with fs.open(filepath) as htmlFile:
                 return replace_static_urls(
                     htmlFile.read().decode('utf-8'),
-                    course.metadata['data_dir'],
+                    getattr(course, 'data_dir', None),
                     course_namespace=course.location
                 )
         except ResourceNotFoundError:
diff --git a/lms/djangoapps/courseware/features/courses.py b/lms/djangoapps/courseware/features/courses.py
index ba0bcd359b..eb5143b782 100644
--- a/lms/djangoapps/courseware/features/courses.py
+++ b/lms/djangoapps/courseware/features/courses.py
@@ -26,8 +26,8 @@ def get_courseware_with_tabs(course_id):
     top three levels of navigation. Same as get_courseware() except include
     the tabs on the right hand main navigation page.
 
-    This hides the appropriate courseware as defined by the XML flag test:
-    chapter.metadata.get('hide_from_toc','false').lower() == 'true'
+    This hides the appropriate courseware as defined by the hide_from_toc field:
+    chapter.lms.hide_from_toc
 
     Example:
 
@@ -80,14 +80,14 @@ def get_courseware_with_tabs(course_id):
     """
 
     course = get_course_by_id(course_id)
-    chapters = [chapter for chapter in course.get_children() if chapter.metadata.get('hide_from_toc', 'false').lower() != 'true']
-    courseware = [{'chapter_name': c.display_name,
-                    'sections': [{'section_name': s.display_name,
+    chapters = [chapter for chapter in course.get_children() if not chapter.lms.hide_from_toc]
+    courseware = [{'chapter_name': c.display_name_with_default,
+                    'sections': [{'section_name': s.display_name_with_default,
                                 'clickable_tab_count': len(s.get_children()) if (type(s) == seq_module.SequenceDescriptor) else 0,
                                 'tabs': [{'children_count': len(t.get_children()) if (type(t) == vertical_module.VerticalDescriptor) else 0,
                                         'class': t.__class__.__name__}
                                         for t in s.get_children()]}
-                                for s in c.get_children() if s.metadata.get('hide_from_toc', 'false').lower() != 'true']}
+                                for s in c.get_children() if not s.lms.hide_from_toc]}
                     for c in chapters]
 
     return courseware
diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py
index 30cf91f61d..ecff14777d 100644
--- a/lms/djangoapps/courseware/grades.py
+++ b/lms/djangoapps/courseware/grades.py
@@ -8,13 +8,14 @@ from collections import defaultdict
 from django.conf import settings
 from django.contrib.auth.models import User
 
-from models import StudentModuleCache
-from module_render import get_module, get_instance_module
+from .model_data import ModelDataCache, LmsKeyValueStore
+from xblock.core import Scope
+from .module_render import get_module
 from xmodule import graders
 from xmodule.capa_module import CapaModule
 from xmodule.course_module import CourseDescriptor
 from xmodule.graders import Score
-from models import StudentModule
+from .models import StudentModule
 
 log = logging.getLogger("mitx.courseware")
 
@@ -58,37 +59,39 @@ def yield_problems(request, course, student):
     the list, but there may be others as well).
     """
     grading_context = course.grading_context
-    student_module_cache = StudentModuleCache(course.id, student, grading_context['all_descriptors'])
 
+    descriptor_locations = (descriptor.location.url() for descriptor in grading_context['all_descriptors'])
+    existing_student_modules = set(StudentModule.objects.filter(
+        module_state_key__in=descriptor_locations
+    ).values_list('module_state_key', flat=True))
+
+    sections_to_list = []
     for section_format, sections in grading_context['graded_sections'].iteritems():
         for section in sections:
 
             section_descriptor = section['section_descriptor']
 
             # If the student hasn't seen a single problem in the section, skip it.
-            skip = True
             for moduledescriptor in section['xmoduledescriptors']:
-                if student_module_cache.lookup(
-                        course.id, moduledescriptor.category, moduledescriptor.location.url()):
-                    skip = False
+                if moduledescriptor.location.url() in existing_student_modules:
+                    sections_to_list.append(section_descriptor)
                     break
 
-            if skip:
-                continue
+    model_data_cache = ModelDataCache(sections_to_list, course.id, student)
+    for section_descriptor in sections_to_list:
+        section_module = get_module(student, request,
+                                    section_descriptor.location, model_data_cache,
+                                    course.id)
+        if section_module is None:
+            # student doesn't have access to this module, or something else
+            # went wrong.
+            # log.debug("couldn't get module for student {0} for section location {1}"
+            #           .format(student.username, section_descriptor.location))
+            continue
 
-            section_module = get_module(student, request,
-                                        section_descriptor.location, student_module_cache,
-                                        course.id)
-            if section_module is None:
-                # student doesn't have access to this module, or something else
-                # went wrong.
-                # log.debug("couldn't get module for student {0} for section location {1}"
-                #           .format(student.username, section_descriptor.location))
-                continue
-
-            for problem in yield_module_descendents(section_module):
-                if isinstance(problem, CapaModule):
-                    yield problem
+        for problem in yield_module_descendents(section_module):
+            if isinstance(problem, CapaModule):
+                yield problem
 
 
 def answer_distributions(request, course):
@@ -112,13 +115,13 @@ def answer_distributions(request, course):
             for problem_id in capa_module.lcp.student_answers:
                 # Answer can be a list or some other unhashable element.  Convert to string.
                 answer = str(capa_module.lcp.student_answers[problem_id])
-                key = (capa_module.url_name, capa_module.display_name, problem_id)
+                key = (capa_module.url_name, capa_module.display_name_with_default, problem_id)
                 counts[key][answer] += 1
 
     return counts
 
 
-def grade(student, request, course, student_module_cache=None, keep_raw_scores=False):
+def grade(student, request, course, model_data_cache=None, keep_raw_scores=False):
     """
     This grades a student as quickly as possible. It retuns the
     output from the course grader, augmented with the final letter
@@ -140,8 +143,8 @@ def grade(student, request, course, student_module_cache=None, keep_raw_scores=F
     grading_context = course.grading_context
     raw_scores = []
 
-    if student_module_cache is None:
-        student_module_cache = StudentModuleCache(course.id, student, grading_context['all_descriptors'])
+    if model_data_cache is None:
+        model_data_cache = ModelDataCache(grading_context['all_descriptors'], course.id, student)
 
     totaled_scores = {}
     # This next complicated loop is just to collect the totaled_scores, which is
@@ -150,13 +153,19 @@ def grade(student, request, course, student_module_cache=None, keep_raw_scores=F
         format_scores = []
         for section in sections:
             section_descriptor = section['section_descriptor']
-            section_name = section_descriptor.metadata.get('display_name')
+            section_name = section_descriptor.display_name_with_default
 
             should_grade_section = False
             # If we haven't seen a single problem in the section, we don't have to grade it at all! We can assume 0%
             for moduledescriptor in section['xmoduledescriptors']:
-                if student_module_cache.lookup(
-                        course.id, moduledescriptor.category, moduledescriptor.location.url()):
+                # Create a fake key to pull out a StudentModule object from the ModelDataCache
+                key = LmsKeyValueStore.Key(
+                    Scope.student_state,
+                    student.id,
+                    moduledescriptor.location,
+                    None
+                )
+                if model_data_cache.find(key):
                     should_grade_section = True
                     break
 
@@ -167,11 +176,11 @@ def grade(student, request, course, student_module_cache=None, keep_raw_scores=F
                     # TODO: We need the request to pass into here. If we could forgo that, our arguments
                     # would be simpler
                     return get_module(student, request, descriptor.location,
-                                        student_module_cache, course.id)
+                                        model_data_cache, course.id)
 
                 for module_descriptor in yield_dynamic_descriptor_descendents(section_descriptor, create_module):
 
-                    (correct, total) = get_score(course.id, student, module_descriptor, create_module, student_module_cache)
+                    (correct, total) = get_score(course.id, student, module_descriptor, create_module, model_data_cache)
                     if correct is None and total is None:
                         continue
 
@@ -181,12 +190,12 @@ def grade(student, request, course, student_module_cache=None, keep_raw_scores=F
                         else:
                             correct = total
 
-                    graded = module_descriptor.metadata.get("graded", False)
+                    graded = module_descriptor.lms.graded
                     if not total > 0:
                         #We simply cannot grade a problem that is 12/0, because we might need it as a percentage
                         graded = False
 
-                    scores.append(Score(correct, total, graded, module_descriptor.metadata.get('display_name')))
+                    scores.append(Score(correct, total, graded, module_descriptor.display_name_with_default))
 
                 section_total, graded_total = graders.aggregate_scores(scores, section_name)
                 if keep_raw_scores:
@@ -243,7 +252,7 @@ def grade_for_percentage(grade_cutoffs, percentage):
 # TODO: This method is not very good. It was written in the old course style and
 # then converted over and performance is not good. Once the progress page is redesigned
 # to not have the progress summary this method should be deleted (so it won't be copied).
-def progress_summary(student, request, course, student_module_cache):
+def progress_summary(student, request, course, model_data_cache):
     """
     This pulls a summary of all problems in the course.
 
@@ -257,7 +266,7 @@ def progress_summary(student, request, course, student_module_cache):
     Arguments:
         student: A User object for the student to grade
         course: A Descriptor containing the course to grade
-        student_module_cache: A StudentModuleCache initialized with all
+        model_data_cache: A ModelDataCache initialized with all
              instance_modules for the student
 
     If the student does not have access to load the course module, this function
@@ -269,7 +278,7 @@ def progress_summary(student, request, course, student_module_cache):
     # TODO: We need the request to pass into here. If we could forgo that, our arguments
     # would be simpler
     course_module = get_module(student, request,
-                                course.location, student_module_cache,
+                                course.location, model_data_cache,
                                 course.id, depth=None)
     if not course_module:
         # This student must not have access to the course.
@@ -279,19 +288,17 @@ def progress_summary(student, request, course, student_module_cache):
     # Don't include chapters that aren't displayable (e.g. due to error)
     for chapter_module in course_module.get_display_items():
         # Skip if the chapter is hidden
-        hidden = chapter_module.metadata.get('hide_from_toc', 'false')
-        if hidden.lower() == 'true':
+        if chapter_module.lms.hide_from_toc:
             continue
 
         sections = []
         for section_module in chapter_module.get_display_items():
             # Skip if the section is hidden
-            hidden = section_module.metadata.get('hide_from_toc', 'false')
-            if hidden.lower() == 'true':
+            if section_module.lms.hide_from_toc:
                 continue
 
             # Same for sections
-            graded = section_module.metadata.get('graded', False)
+            graded = section_module.lms.graded
             scores = []
 
             module_creator = section_module.system.get_module
@@ -299,37 +306,37 @@ def progress_summary(student, request, course, student_module_cache):
             for module_descriptor in yield_dynamic_descriptor_descendents(section_module.descriptor, module_creator):
 
                 course_id = course.id
-                (correct, total) = get_score(course_id, student, module_descriptor, module_creator, student_module_cache)
+                (correct, total) = get_score(course_id, student, module_descriptor, module_creator, model_data_cache)
                 if correct is None and total is None:
                     continue
 
                 scores.append(Score(correct, total, graded,
-                    module_descriptor.metadata.get('display_name')))
+                    module_descriptor.display_name_with_default))
 
             scores.reverse()
             section_total, graded_total = graders.aggregate_scores(
-                scores, section_module.metadata.get('display_name'))
+                scores, section_module.display_name_with_default)
 
-            format = section_module.metadata.get('format', "")
+            format = section_module.lms.format if section_module.lms.format is not None else ''
             sections.append({
-                'display_name': section_module.display_name,
+                'display_name': section_module.display_name_with_default,
                 'url_name': section_module.url_name,
                 'scores': scores,
                 'section_total': section_total,
                 'format': format,
-                'due': section_module.metadata.get("due", ""),
+                'due': section_module.lms.due,
                 'graded': graded,
             })
 
-        chapters.append({'course': course.display_name,
-                         'display_name': chapter_module.display_name,
+        chapters.append({'course': course.display_name_with_default,
+                         'display_name': chapter_module.display_name_with_default,
                          'url_name': chapter_module.url_name,
                          'sections': sections})
 
     return chapters
 
 
-def get_score(course_id, user, problem_descriptor, module_creator, student_module_cache):
+def get_score(course_id, user, problem_descriptor, module_creator, model_data_cache):
     """
     Return the score for a user on a problem, as a tuple (correct, total).
     e.g. (5,7) if you got 5 out of 7 points.
@@ -341,8 +348,11 @@ def get_score(course_id, user, problem_descriptor, module_creator, student_modul
     problem_descriptor: an XModuleDescriptor
     module_creator: a function that takes a descriptor, and returns the corresponding XModule for this user.
            Can return None if user doesn't have access, or if something else went wrong.
-    cache: A StudentModuleCache
+    cache: A ModelDataCache
     """
+    if not user.is_authenticated():
+        return (None, None)
+
     if problem_descriptor.always_recalculate_grades:
         problem = module_creator(problem_descriptor)
         d = problem.get_score()
@@ -355,34 +365,42 @@ def get_score(course_id, user, problem_descriptor, module_creator, student_modul
         # These are not problems, and do not have a score
         return (None, None)
 
-    correct = 0.0
+    # Create a fake KeyValueStore key to pull out the StudentModule
+    key = LmsKeyValueStore.Key(
+        Scope.student_state,
+        user.id,
+        problem_descriptor.location,
+        None
+    )
 
-    instance_module = student_module_cache.lookup(
-        course_id, problem_descriptor.category, problem_descriptor.location.url())
+    student_module = model_data_cache.find(key)
 
-    if not instance_module:
-        # If the problem was not in the cache, we need to instantiate the problem.
-        # Otherwise, the max score (cached in instance_module) won't be available
+    if student_module is not None and student_module.max_grade is not None:
+        correct = student_module.grade if student_module.grade is not None else 0
+        total = student_module.max_grade
+    else:
+        # If the problem was not in the cache, or hasn't been graded yet,
+        # we need to instantiate the problem.
+        # Otherwise, the max score (cached in student_module) won't be available
         problem = module_creator(problem_descriptor)
         if problem is None:
             return (None, None)
-        instance_module = get_instance_module(course_id, user, problem, student_module_cache)
 
-    # If this problem is ungraded/ungradable, bail
-    if not instance_module or instance_module.max_grade is None:
-        return (None, None)
+        correct = 0.0
+        total = problem.max_score()
 
-    correct = instance_module.grade if instance_module.grade is not None else 0
-    total = instance_module.max_grade
+        # Problem may be an error module (if something in the problem builder failed)
+        # In which case total might be None
+        if total is None:
+            return (None, None)
 
-    if correct is not None and total is not None:
-        #Now we re-weight the problem, if specified
-        weight = getattr(problem_descriptor, 'weight', None)
-        if weight is not None:
-            if total == 0:
-                log.exception("Cannot reweight a problem with zero total points. Problem: " + str(instance_module))
-                return (correct, total)
-            correct = correct * weight / total
-            total = weight
+    #Now we re-weight the problem, if specified
+    weight = problem_descriptor.weight
+    if weight is not None:
+        if total == 0:
+            log.exception("Cannot reweight a problem with zero total points. Problem: " + str(student_module))
+            return (correct, total)
+        correct = correct * weight / total
+        total = weight
 
     return (correct, total)
diff --git a/lms/djangoapps/courseware/management/commands/check_course.py b/lms/djangoapps/courseware/management/commands/check_course.py
index adb8bff709..58f8933cd8 100644
--- a/lms/djangoapps/courseware/management/commands/check_course.py
+++ b/lms/djangoapps/courseware/management/commands/check_course.py
@@ -13,7 +13,7 @@ import xmodule
 import mitxmako.middleware as middleware
 middleware.MakoMiddleware()
 from xmodule.modulestore.django import modulestore
-from courseware.models import StudentModuleCache
+from courseware.model_data import ModelDataCache
 from courseware.module_render import get_module
 
 
@@ -83,7 +83,7 @@ class Command(BaseCommand):
 
         # TODO (cpennington): Get coursename in a legitimate way
         course_location = 'i4x://edx/6002xs12/course/6.002_Spring_2012'
-        student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(
+        student_module_cache = ModelDataCache.cache_for_descriptor_descendents(
         course_id,
             sample_user, modulestore().get_item(course_location))
         course = get_module(sample_user, None, course_location, student_module_cache)
diff --git a/lms/djangoapps/courseware/management/commands/metadata_to_json.py b/lms/djangoapps/courseware/management/commands/metadata_to_json.py
index b80736f693..58d087c316 100644
--- a/lms/djangoapps/courseware/management/commands/metadata_to_json.py
+++ b/lms/djangoapps/courseware/management/commands/metadata_to_json.py
@@ -53,7 +53,7 @@ def node_metadata(node):
                  'start', 'due', 'graded', 'hide_from_toc',
                  'ispublic', 'xqa_key')
 
-    orig = node.own_metadata
+    orig = own_metadata(node)
     d = {k: orig[k] for k in to_export if k in orig}
     return d
 
diff --git a/lms/djangoapps/courseware/management/commands/regrade_partial.py b/lms/djangoapps/courseware/management/commands/regrade_partial.py
new file mode 100644
index 0000000000..c24f84ddfc
--- /dev/null
+++ b/lms/djangoapps/courseware/management/commands/regrade_partial.py
@@ -0,0 +1,122 @@
+'''
+This is a one-off command aimed at fixing a temporary problem encountered where partial credit was awarded for
+code problems, but the resulting score (or grade) was mistakenly set to zero because of a bug in
+CorrectMap.get_npoints().
+'''
+
+import json
+import logging
+from optparse import make_option
+
+from django.core.management.base import BaseCommand
+
+from courseware.models import StudentModule
+from capa.correctmap import CorrectMap
+
+LOG = logging.getLogger(__name__)
+
+
+class Command(BaseCommand):
+    '''
+    The fix here is to recalculate the score/grade based on the partial credit.
+    To narrow down the set of problems that might need fixing, the StudentModule
+    objects to be checked is filtered down to those:
+
+        created < '2013-03-08 15:45:00' (the problem must have been answered before the fix was installed,
+                                         on Prod and Edge)
+        modified > '2013-03-07 20:18:00' (the problem must have been visited after the bug was introduced)
+        state like '%"npoints": 0.%' (the problem must have some form of partial credit).
+    '''
+
+    num_visited = 0
+    num_changed = 0
+
+    option_list = BaseCommand.option_list + (
+        make_option('--save',
+                    action='store_true',
+                    dest='save_changes',
+                    default=False,
+                    help='Persist the changes that were encountered.  If not set, no changes are saved.'), )
+
+    def fix_studentmodules(self, save_changes):
+        '''Identify the list of StudentModule objects that might need fixing, and then fix each one'''
+        modules = StudentModule.objects.filter(modified__gt='2013-03-07 20:18:00',
+                                               created__lt='2013-03-08 15:45:00',
+                                               state__contains='"npoints": 0.')
+
+        for module in modules:
+            self.fix_studentmodule_grade(module, save_changes)
+
+    def fix_studentmodule_grade(self, module, save_changes):
+        ''' Fix the grade assigned to a StudentModule'''
+        module_state = module.state
+        if module_state is None:
+            # not likely, since we filter on it.  But in general...
+            LOG.info("No state found for {type} module {id} for student {student} in course {course_id}"
+                     .format(type=module.module_type, id=module.module_state_key,
+                             student=module.student.username, course_id=module.course_id))
+            return
+
+        state_dict = json.loads(module_state)
+        self.num_visited += 1
+
+        # LoncapaProblem.get_score() checks student_answers -- if there are none, we will return a grade of 0
+        # Check that this is the case, but do so sooner, before we do any of the other grading work.
+        student_answers = state_dict['student_answers']
+        if (not student_answers) or len(student_answers) == 0:
+            # we should not have a grade here:
+            if module.grade != 0:
+                LOG.error("No answer found but grade {grade} exists for {type} module {id} for student {student} "
+                          "in course {course_id}".format(grade=module.grade,
+                                                         type=module.module_type, id=module.module_state_key,
+                                                         student=module.student.username, course_id=module.course_id))
+            else:
+                LOG.debug("No answer and no grade found for {type} module {id} for student {student} "
+                          "in course {course_id}".format(grade=module.grade,
+                                                         type=module.module_type, id=module.module_state_key,
+                                                         student=module.student.username, course_id=module.course_id))
+            return
+
+        # load into a CorrectMap, as done in LoncapaProblem.__init__():
+        correct_map = CorrectMap()
+        if 'correct_map' in state_dict:
+            correct_map.set_dict(state_dict['correct_map'])
+
+        # calculate score the way LoncapaProblem.get_score() works, by deferring to
+        # CorrectMap's get_npoints implementation.
+        correct = 0
+        for key in correct_map:
+            correct += correct_map.get_npoints(key)
+
+        if module.grade == correct:
+            # nothing to change
+            LOG.debug("Grade matches for {type} module {id} for student {student} in course {course_id}"
+                      .format(type=module.module_type, id=module.module_state_key,
+                              student=module.student.username, course_id=module.course_id))
+        elif save_changes:
+            # make the change
+            LOG.info("Grade changing from {0} to {1} for {type} module {id} for student {student} "
+                     "in course {course_id}".format(module.grade, correct,
+                                                    type=module.module_type, id=module.module_state_key,
+                                                    student=module.student.username, course_id=module.course_id))
+            module.grade = correct
+            module.save()
+            self.num_changed += 1
+        else:
+            # don't make the change, but log that the change would be made
+            LOG.info("Grade would change from {0} to {1} for {type} module {id} for student {student} "
+                     "in course {course_id}".format(module.grade, correct,
+                                                    type=module.module_type, id=module.module_state_key,
+                                                    student=module.student.username, course_id=module.course_id))
+            self.num_changed += 1
+
+    def handle(self, **options):
+        '''Handle management command request'''
+
+        save_changes = options['save_changes']
+
+        LOG.info("Starting run: save_changes = {0}".format(save_changes))
+
+        self.fix_studentmodules(save_changes)
+
+        LOG.info("Finished run:  updating {0} of {1} modules".format(self.num_changed, self.num_visited))
diff --git a/lms/djangoapps/courseware/migrations/0008_add_xmodule_storage.py b/lms/djangoapps/courseware/migrations/0008_add_xmodule_storage.py
new file mode 100644
index 0000000000..0d89471fff
--- /dev/null
+++ b/lms/djangoapps/courseware/migrations/0008_add_xmodule_storage.py
@@ -0,0 +1,185 @@
+# -*- 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 'XModuleStudentInfoField'
+        db.create_table('courseware_xmodulestudentinfofield', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('field_name', self.gf('django.db.models.fields.CharField')(max_length=64, db_index=True)),
+            ('value', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('student', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, db_index=True, blank=True)),
+            ('modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, db_index=True, blank=True)),
+        ))
+        db.send_create_signal('courseware', ['XModuleStudentInfoField'])
+
+        # Adding unique constraint on 'XModuleStudentInfoField', fields ['student', 'field_name']
+        db.create_unique('courseware_xmodulestudentinfofield', ['student_id', 'field_name'])
+
+        # Adding model 'XModuleContentField'
+        db.create_table('courseware_xmodulecontentfield', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('field_name', self.gf('django.db.models.fields.CharField')(max_length=64, db_index=True)),
+            ('definition_id', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+            ('value', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, db_index=True, blank=True)),
+            ('modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, db_index=True, blank=True)),
+        ))
+        db.send_create_signal('courseware', ['XModuleContentField'])
+
+        # Adding unique constraint on 'XModuleContentField', fields ['definition_id', 'field_name']
+        db.create_unique('courseware_xmodulecontentfield', ['definition_id', 'field_name'])
+
+        # Adding model 'XModuleSettingsField'
+        db.create_table('courseware_xmodulesettingsfield', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('field_name', self.gf('django.db.models.fields.CharField')(max_length=64, db_index=True)),
+            ('usage_id', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+            ('value', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, db_index=True, blank=True)),
+            ('modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, db_index=True, blank=True)),
+        ))
+        db.send_create_signal('courseware', ['XModuleSettingsField'])
+
+        # Adding unique constraint on 'XModuleSettingsField', fields ['usage_id', 'field_name']
+        db.create_unique('courseware_xmodulesettingsfield', ['usage_id', 'field_name'])
+
+        # Adding model 'XModuleStudentPrefsField'
+        db.create_table('courseware_xmodulestudentprefsfield', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('field_name', self.gf('django.db.models.fields.CharField')(max_length=64, db_index=True)),
+            ('module_type', self.gf('django.db.models.fields.CharField')(max_length=64, db_index=True)),
+            ('value', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('student', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, db_index=True, blank=True)),
+            ('modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, db_index=True, blank=True)),
+        ))
+        db.send_create_signal('courseware', ['XModuleStudentPrefsField'])
+
+        # Adding unique constraint on 'XModuleStudentPrefsField', fields ['student', 'module_type', 'field_name']
+        db.create_unique('courseware_xmodulestudentprefsfield', ['student_id', 'module_type', 'field_name'])
+
+
+    def backwards(self, orm):
+        # Removing unique constraint on 'XModuleStudentPrefsField', fields ['student', 'module_type', 'field_name']
+        db.delete_unique('courseware_xmodulestudentprefsfield', ['student_id', 'module_type', 'field_name'])
+
+        # Removing unique constraint on 'XModuleSettingsField', fields ['usage_id', 'field_name']
+        db.delete_unique('courseware_xmodulesettingsfield', ['usage_id', 'field_name'])
+
+        # Removing unique constraint on 'XModuleContentField', fields ['definition_id', 'field_name']
+        db.delete_unique('courseware_xmodulecontentfield', ['definition_id', 'field_name'])
+
+        # Removing unique constraint on 'XModuleStudentInfoField', fields ['student', 'field_name']
+        db.delete_unique('courseware_xmodulestudentinfofield', ['student_id', 'field_name'])
+
+        # Deleting model 'XModuleStudentInfoField'
+        db.delete_table('courseware_xmodulestudentinfofield')
+
+        # Deleting model 'XModuleContentField'
+        db.delete_table('courseware_xmodulecontentfield')
+
+        # Deleting model 'XModuleSettingsField'
+        db.delete_table('courseware_xmodulesettingsfield')
+
+        # Deleting model 'XModuleStudentPrefsField'
+        db.delete_table('courseware_xmodulestudentprefsfield')
+
+
+    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'})
+        },
+        'courseware.studentmodule': {
+            'Meta': {'unique_together': "(('student', 'module_state_key', 'course_id'),)", 'object_name': 'StudentModule'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'done': ('django.db.models.fields.CharField', [], {'default': "'na'", 'max_length': '8', 'db_index': 'True'}),
+            'grade': ('django.db.models.fields.FloatField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_grade': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'module_state_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_column': "'module_id'", 'db_index': 'True'}),
+            'module_type': ('django.db.models.fields.CharField', [], {'default': "'problem'", 'max_length': '32', 'db_index': 'True'}),
+            'state': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'courseware.xmodulecontentfield': {
+            'Meta': {'unique_together': "(('definition_id', 'field_name'),)", 'object_name': 'XModuleContentField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'definition_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'courseware.xmodulesettingsfield': {
+            'Meta': {'unique_together': "(('usage_id', 'field_name'),)", 'object_name': 'XModuleSettingsField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'usage_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'courseware.xmodulestudentinfofield': {
+            'Meta': {'unique_together': "(('student', 'field_name'),)", 'object_name': 'XModuleStudentInfoField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'courseware.xmodulestudentprefsfield': {
+            'Meta': {'unique_together': "(('student', 'module_type', 'field_name'),)", 'object_name': 'XModuleStudentPrefsField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'module_type': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['courseware']
\ No newline at end of file
diff --git a/lms/djangoapps/courseware/migrations/0009_add_field_default.py b/lms/djangoapps/courseware/migrations/0009_add_field_default.py
new file mode 100644
index 0000000000..cd885ee7a6
--- /dev/null
+++ b/lms/djangoapps/courseware/migrations/0009_add_field_default.py
@@ -0,0 +1,128 @@
+# -*- 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):
+
+        # Changing field 'XModuleContentField.value'
+        db.alter_column('courseware_xmodulecontentfield', 'value', self.gf('django.db.models.fields.TextField')())
+
+        # Changing field 'XModuleStudentInfoField.value'
+        db.alter_column('courseware_xmodulestudentinfofield', 'value', self.gf('django.db.models.fields.TextField')())
+
+        # Changing field 'XModuleSettingsField.value'
+        db.alter_column('courseware_xmodulesettingsfield', 'value', self.gf('django.db.models.fields.TextField')())
+
+        # Changing field 'XModuleStudentPrefsField.value'
+        db.alter_column('courseware_xmodulestudentprefsfield', 'value', self.gf('django.db.models.fields.TextField')())
+
+    def backwards(self, orm):
+
+        # Changing field 'XModuleContentField.value'
+        db.alter_column('courseware_xmodulecontentfield', 'value', self.gf('django.db.models.fields.TextField')(null=True))
+
+        # Changing field 'XModuleStudentInfoField.value'
+        db.alter_column('courseware_xmodulestudentinfofield', 'value', self.gf('django.db.models.fields.TextField')(null=True))
+
+        # Changing field 'XModuleSettingsField.value'
+        db.alter_column('courseware_xmodulesettingsfield', 'value', self.gf('django.db.models.fields.TextField')(null=True))
+
+        # Changing field 'XModuleStudentPrefsField.value'
+        db.alter_column('courseware_xmodulestudentprefsfield', 'value', self.gf('django.db.models.fields.TextField')(null=True))
+
+    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'})
+        },
+        'courseware.studentmodule': {
+            'Meta': {'unique_together': "(('student', 'module_state_key', 'course_id'),)", 'object_name': 'StudentModule'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'done': ('django.db.models.fields.CharField', [], {'default': "'na'", 'max_length': '8', 'db_index': 'True'}),
+            'grade': ('django.db.models.fields.FloatField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_grade': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'module_state_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_column': "'module_id'", 'db_index': 'True'}),
+            'module_type': ('django.db.models.fields.CharField', [], {'default': "'problem'", 'max_length': '32', 'db_index': 'True'}),
+            'state': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'courseware.xmodulecontentfield': {
+            'Meta': {'unique_together': "(('definition_id', 'field_name'),)", 'object_name': 'XModuleContentField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'definition_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'courseware.xmodulesettingsfield': {
+            'Meta': {'unique_together': "(('usage_id', 'field_name'),)", 'object_name': 'XModuleSettingsField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'usage_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'courseware.xmodulestudentinfofield': {
+            'Meta': {'unique_together': "(('student', 'field_name'),)", 'object_name': 'XModuleStudentInfoField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'courseware.xmodulestudentprefsfield': {
+            'Meta': {'unique_together': "(('student', 'module_type', 'field_name'),)", 'object_name': 'XModuleStudentPrefsField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'module_type': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        }
+    }
+
+    complete_apps = ['courseware']
\ No newline at end of file
diff --git a/lms/djangoapps/courseware/model_data.py b/lms/djangoapps/courseware/model_data.py
new file mode 100644
index 0000000000..35deda5d6b
--- /dev/null
+++ b/lms/djangoapps/courseware/model_data.py
@@ -0,0 +1,360 @@
+import json
+from collections import namedtuple, defaultdict
+from itertools import chain
+from .models import (
+    StudentModule,
+    XModuleContentField,
+    XModuleSettingsField,
+    XModuleStudentPrefsField,
+    XModuleStudentInfoField
+)
+
+from xblock.runtime import KeyValueStore, InvalidScopeError
+from xblock.core import Scope
+
+
+class InvalidWriteError(Exception):
+    pass
+
+
+def chunks(items, chunk_size):
+    items = list(items)
+    return (items[i:i + chunk_size] for i in xrange(0, len(items), chunk_size))
+
+
+class ModelDataCache(object):
+    """
+    A cache of django model objects needed to supply the data
+    for a module and its decendants
+    """
+    def __init__(self, descriptors, course_id, user, select_for_update=False):
+        '''
+        Find any courseware.models objects that are needed by any descriptor
+        in descriptors. Attempts to minimize the number of queries to the database.
+        Note: Only modules that have store_state = True or have shared
+        state will have a StudentModule.
+
+        Arguments
+        descriptors: A list of XModuleDescriptors.
+        course_id: The id of the current course
+        user: The user for which to cache data
+        select_for_update: True if rows should be locked until end of transaction
+        '''
+        self.cache = {}
+        self.descriptors = descriptors
+        self.select_for_update = select_for_update
+        self.course_id = course_id
+        self.user = user
+
+        if user.is_authenticated():
+            for scope, fields in self._fields_to_cache().items():
+                for field_object in self._retrieve_fields(scope, fields):
+                    self.cache[self._cache_key_from_field_object(scope, field_object)] = field_object
+
+    @classmethod
+    def cache_for_descriptor_descendents(cls, course_id, user, descriptor, depth=None,
+                                         descriptor_filter=lambda descriptor: True,
+                                         select_for_update=False):
+        """
+        course_id: the course in the context of which we want StudentModules.
+        user: the django user for whom to load modules.
+        descriptor: An XModuleDescriptor
+        depth is the number of levels of descendent modules to load StudentModules for, in addition to
+            the supplied descriptor. If depth is None, load all descendent StudentModules
+        descriptor_filter is a function that accepts a descriptor and return wether the StudentModule
+            should be cached
+        select_for_update: Flag indicating whether the rows should be locked until end of transaction
+        """
+
+        def get_child_descriptors(descriptor, depth, descriptor_filter):
+            if descriptor_filter(descriptor):
+                descriptors = [descriptor]
+            else:
+                descriptors = []
+
+            if depth is None or depth > 0:
+                new_depth = depth - 1 if depth is not None else depth
+
+                for child in descriptor.get_children() + descriptor.get_required_module_descriptors():
+                    descriptors.extend(get_child_descriptors(child, new_depth, descriptor_filter))
+
+            return descriptors
+
+        descriptors = get_child_descriptors(descriptor, depth, descriptor_filter)
+
+        return ModelDataCache(descriptors, course_id, user, select_for_update)
+
+    def _query(self, model_class, **kwargs):
+        """
+        Queries model_class with **kwargs, optionally adding select_for_update if
+        self.select_for_update is set
+        """
+        query = model_class.objects
+        if self.select_for_update:
+            query = query.select_for_update()
+        query = query.filter(**kwargs)
+        return query
+
+    def _chunked_query(self, model_class, chunk_field, items, chunk_size=500, **kwargs):
+        """
+        Queries model_class with `chunk_field` set to chunks of size `chunk_size`,
+        and all other parameters from `**kwargs`
+
+        This works around a limitation in sqlite3 on the number of parameters
+        that can be put into a single query
+        """
+        res = chain.from_iterable(
+            self._query(model_class, **dict([(chunk_field, chunk)] + kwargs.items()))
+            for chunk in chunks(items, chunk_size)
+        )
+        return res
+
+    def _retrieve_fields(self, scope, fields):
+        """
+        Queries the database for all of the fields in the specified scope
+        """
+        if scope in (Scope.children, Scope.parent):
+            return []
+        elif scope == Scope.student_state:
+            return self._chunked_query(
+                StudentModule,
+                'module_state_key__in',
+                (descriptor.location.url() for descriptor in self.descriptors),
+                course_id=self.course_id,
+                student=self.user,
+            )
+        elif scope == Scope.content:
+            return self._chunked_query(
+                XModuleContentField,
+                'definition_id__in',
+                (descriptor.location.url() for descriptor in self.descriptors),
+                field_name__in=set(field.name for field in fields),
+            )
+        elif scope == Scope.settings:
+            return self._chunked_query(
+                XModuleSettingsField,
+                'usage_id__in',
+                (
+                    '%s-%s' % (self.course_id, descriptor.location.url())
+                    for descriptor in self.descriptors
+                ),
+                field_name__in=set(field.name for field in fields),
+            )
+        elif scope == Scope.student_preferences:
+            return self._chunked_query(
+                XModuleStudentPrefsField,
+                'module_type__in',
+                set(descriptor.location.category for descriptor in self.descriptors),
+                student=self.user,
+                field_name__in=set(field.name for field in fields),
+            )
+        elif scope == Scope.student_info:
+            return self._query(
+                XModuleStudentInfoField,
+                student=self.user,
+                field_name__in=set(field.name for field in fields),
+            )
+        else:
+            raise InvalidScopeError(scope)
+
+    def _fields_to_cache(self):
+        """
+        Returns a map of scopes to fields in that scope that should be cached
+        """
+        scope_map = defaultdict(set)
+        for descriptor in self.descriptors:
+            for field in (descriptor.module_class.fields + descriptor.module_class.lms.fields):
+                scope_map[field.scope].add(field)
+        return scope_map
+
+    def _cache_key_from_kvs_key(self, key):
+        if key.scope == Scope.student_state:
+            return (key.scope, key.block_scope_id.url())
+        elif key.scope == Scope.content:
+            return (key.scope, key.block_scope_id.url(), key.field_name)
+        elif key.scope == Scope.settings:
+            return (key.scope, '%s-%s' % (self.course_id, key.block_scope_id.url()), key.field_name)
+        elif key.scope == Scope.student_preferences:
+            return (key.scope, key.block_scope_id, key.field_name)
+        elif key.scope == Scope.student_info:
+            return (key.scope, key.field_name)
+
+    def _cache_key_from_field_object(self, scope, field_object):
+        if scope == Scope.student_state:
+            return (scope, field_object.module_state_key)
+        elif scope == Scope.content:
+            return (scope, field_object.definition_id, field_object.field_name)
+        elif scope == Scope.settings:
+            return (scope, field_object.usage_id, field_object.field_name)
+        elif scope == Scope.student_preferences:
+            return (scope, field_object.module_type, field_object.field_name)
+        elif scope == Scope.student_info:
+            return (scope, field_object.field_name)
+
+    def find(self, key):
+        '''
+        Look for a model data object using an LmsKeyValueStore.Key object
+
+        key: An `LmsKeyValueStore.Key` object selecting the object to find
+
+        returns the found object, or None if the object doesn't exist
+        '''
+        return self.cache.get(self._cache_key_from_kvs_key(key))
+
+    def find_or_create(self, key):
+        '''
+        Find a model data object in this cache, or create it if it doesn't
+        exist
+        '''
+        field_object = self.find(key)
+
+        if field_object is not None:
+            return field_object
+
+        if key.scope == Scope.student_state:
+            field_object, _ = StudentModule.objects.get_or_create(
+                course_id=self.course_id,
+                student=self.user,
+                module_type=key.block_scope_id.category,
+                module_state_key=key.block_scope_id.url(),
+                defaults={'state': json.dumps({})},
+            )
+        elif key.scope == Scope.content:
+            field_object, _ = XModuleContentField.objects.get_or_create(
+                field_name=key.field_name,
+                definition_id=key.block_scope_id.url()
+            )
+        elif key.scope == Scope.settings:
+            field_object, _ = XModuleSettingsField.objects.get_or_create(
+                field_name=key.field_name,
+                usage_id='%s-%s' % (self.course_id, key.block_scope_id.url()),
+            )
+        elif key.scope == Scope.student_preferences:
+            field_object, _= XModuleStudentPrefsField.objects.get_or_create(
+                field_name=key.field_name,
+                module_type=key.block_scope_id,
+                student=self.user,
+            )
+        elif key.scope == Scope.student_info:
+            field_object, _ = XModuleStudentInfoField.objects.get_or_create(
+                field_name=key.field_name,
+                student=self.user,
+            )
+
+        cache_key = self._cache_key_from_kvs_key(key)
+        self.cache[cache_key] = field_object
+        return field_object
+
+
+class LmsKeyValueStore(KeyValueStore):
+    """
+    This KeyValueStore will read data from descriptor_model_data if it exists,
+    but will not overwrite any keys set in descriptor_model_data. Attempts to do so will
+    raise an InvalidWriteError.
+
+    If the scope to write to is not one of the 5 named scopes:
+        Scope.content
+        Scope.settings
+        Scope.student_state
+        Scope.student_preferences
+        Scope.student_info
+    then an InvalidScopeError will be raised.
+
+    Data for Scope.student_state is stored as StudentModule objects via the django orm.
+
+    Data for the other scopes is stored in individual objects that are named for the
+    scope involved and have the field name as a key
+
+    If the key isn't found in the expected table during a read or a delete, then a KeyError will be raised
+    """
+
+    _allowed_scopes = (
+        Scope.content,
+        Scope.settings,
+        Scope.student_state,
+        Scope.student_preferences,
+        Scope.student_info,
+        Scope.children,
+    )
+    def __init__(self, descriptor_model_data, model_data_cache):
+        self._descriptor_model_data = descriptor_model_data
+        self._model_data_cache = model_data_cache
+
+    def get(self, key):
+        if key.field_name in self._descriptor_model_data:
+            return self._descriptor_model_data[key.field_name]
+
+        if key.scope == Scope.parent:
+            return None
+
+        if key.scope not in self._allowed_scopes:
+            raise InvalidScopeError(key.scope)
+
+        field_object = self._model_data_cache.find(key)
+        if field_object is None:
+            raise KeyError(key.field_name)
+
+        if key.scope == Scope.student_state:
+            return json.loads(field_object.state)[key.field_name]
+        else:
+            return json.loads(field_object.value)
+
+    def set(self, key, value):
+        if key.field_name in self._descriptor_model_data:
+            raise InvalidWriteError("Not allowed to overwrite descriptor model data", key.field_name)
+
+        field_object = self._model_data_cache.find_or_create(key)
+
+        if key.scope not in self._allowed_scopes:
+            raise InvalidScopeError(key.scope)
+
+        if key.scope == Scope.student_state:
+            state = json.loads(field_object.state)
+            state[key.field_name] = value
+            field_object.state = json.dumps(state)
+        else:
+            field_object.value = json.dumps(value)
+
+        field_object.save()
+
+    def delete(self, key):
+        if key.field_name in self._descriptor_model_data:
+            raise InvalidWriteError("Not allowed to deleted descriptor model data", key.field_name)
+
+        if key.scope not in self._allowed_scopes:
+            raise InvalidScopeError(key.scope)
+
+        field_object = self._model_data_cache.find(key)
+        if field_object is None:
+            raise KeyError(key.field_name)
+
+        if key.scope == Scope.student_state:
+            state = json.loads(field_object.state)
+            del state[key.field_name]
+            field_object.state = json.dumps(state)
+            field_object.save()
+        else:
+            field_object.delete()
+
+    def has(self, key):
+        if key.field_name in self._descriptor_model_data:
+            return key.field_name in self._descriptor_model_data
+
+        if key.scope == Scope.parent:
+            return True
+
+        if key.scope not in self._allowed_scopes:
+            raise InvalidScopeError(key.scope)
+
+        field_object = self._model_data_cache.find(key)
+        if field_object is None:
+            return False
+
+        if key.scope == Scope.student_state:
+            return key.field_name in json.loads(field_object.state)
+        else:
+            return True
+
+
+LmsUsage = namedtuple('LmsUsage', 'id, def_id')
+
diff --git a/lms/djangoapps/courseware/models.py b/lms/djangoapps/courseware/models.py
index 3ad850f066..448757a2f8 100644
--- a/lms/djangoapps/courseware/models.py
+++ b/lms/djangoapps/courseware/models.py
@@ -57,9 +57,17 @@ class StudentModule(models.Model):
     created = models.DateTimeField(auto_now_add=True, db_index=True)
     modified = models.DateTimeField(auto_now=True, db_index=True)
 
+    def __repr__(self):
+        return 'StudentModule<%r>' % ({
+            'course_id': self.course_id,
+            'module_type': self.module_type,
+            'student': self.student.username,
+            'module_state_key': self.module_state_key,
+            'state': str(self.state)[:20],
+        },)
+
     def __unicode__(self):
-        return '/'.join([self.course_id, self.module_type,
-                         self.student.username, self.module_state_key, str(self.state)[:20]])
+        return unicode(repr(self))
 
 
 class StudentModuleHistory(models.Model):
@@ -93,121 +101,130 @@ class StudentModuleHistory(models.Model):
             history_entry.save()
 
 
-# TODO (cpennington): Remove these once the LMS switches to using XModuleDescriptors
-
-
-class StudentModuleCache(object):
+class XModuleContentField(models.Model):
     """
-    A cache of StudentModules for a specific student
+    Stores data set in the Scope.content scope by an xmodule field
     """
-    def __init__(self, course_id, user, descriptors, select_for_update=False):
-        '''
-        Find any StudentModule objects that are needed by any descriptor
-        in descriptors. Avoids making multiple queries to the database.
-        Note: Only modules that have store_state = True or have shared
-        state will have a StudentModule.
 
-        Arguments
-        user: The user for which to fetch maching StudentModules
-        descriptors: An array of XModuleDescriptors.
-        select_for_update: Flag indicating whether the rows should be locked until end of transaction
-        '''
-        if user.is_authenticated():
-            module_ids = self._get_module_state_keys(descriptors)
+    class Meta:
+        unique_together = (('definition_id', 'field_name'),)
 
-            # This works around a limitation in sqlite3 on the number of parameters
-            # that can be put into a single query
-            self.cache = []
-            chunk_size = 500
-            for id_chunk in [module_ids[i:i + chunk_size] for i in xrange(0, len(module_ids), chunk_size)]:
-                if select_for_update:
-                    self.cache.extend(StudentModule.objects.select_for_update().filter(
-                        course_id=course_id,
-                        student=user,
-                        module_state_key__in=id_chunk)
-                    )
-                else:
-                    self.cache.extend(StudentModule.objects.filter(
-                        course_id=course_id,
-                        student=user,
-                        module_state_key__in=id_chunk)
-                    )
+    # The name of the field
+    field_name = models.CharField(max_length=64, db_index=True)
 
-        else:
-            self.cache = []
+    # The definition id for the module
+    definition_id = models.CharField(max_length=255, db_index=True)
 
-    @classmethod
-    def cache_for_descriptor_descendents(cls, course_id, user, descriptor, depth=None,
-                                         descriptor_filter=lambda descriptor: True,
-                                         select_for_update=False):
-        """
-        obtain and return cache for descriptor descendents (ie children) AND modules required by the descriptor,
-        but which are not children of the module
+    # The value of the field. Defaults to None dumped as json
+    value = models.TextField(default='null')
 
-        course_id: the course in the context of which we want StudentModules.
-        user: the django user for whom to load modules.
-        descriptor: An XModuleDescriptor
-        depth is the number of levels of descendent modules to load StudentModules for, in addition to
-            the supplied descriptor. If depth is None, load all descendent StudentModules
-        descriptor_filter is a function that accepts a descriptor and return wether the StudentModule
-            should be cached
-        select_for_update: Flag indicating whether the rows should be locked until end of transaction
-        """
+    created = models.DateTimeField(auto_now_add=True, db_index=True)
+    modified = models.DateTimeField(auto_now=True, db_index=True)
 
-        def get_child_descriptors(descriptor, depth, descriptor_filter):
-            if descriptor_filter(descriptor):
-                descriptors = [descriptor]
-            else:
-                descriptors = []
+    def __repr__(self):
+        return 'XModuleContentField<%r>' % ({
+            'field_name': self.field_name,
+            'definition_id': self.definition_id,
+            'value': self.value,
+        },)
 
-            if depth is None or depth > 0:
-                new_depth = depth - 1 if depth is not None else depth
+    def __unicode__(self):
+        return unicode(repr(self))
 
-                for child in descriptor.get_children() + descriptor.get_required_module_descriptors():
-                    descriptors.extend(get_child_descriptors(child, new_depth, descriptor_filter))
 
-            return descriptors
+class XModuleSettingsField(models.Model):
+    """
+    Stores data set in the Scope.settings scope by an xmodule field
+    """
 
-        descriptors = get_child_descriptors(descriptor, depth, descriptor_filter)
+    class Meta:
+        unique_together = (('usage_id', 'field_name'),)
 
-        return StudentModuleCache(course_id, user, descriptors, select_for_update)
+    # The name of the field
+    field_name = models.CharField(max_length=64, db_index=True)
 
-    def _get_module_state_keys(self, descriptors):
-        '''
-        Get a list of the state_keys needed for StudentModules
-        required for this module descriptor
+    # The usage id for the module
+    usage_id = models.CharField(max_length=255, db_index=True)
 
-        descriptor_filter is a function that accepts a descriptor and return wether the StudentModule
-            should be cached
-        '''
-        keys = []
-        for descriptor in descriptors:
-            if descriptor.stores_state:
-                keys.append(descriptor.location.url())
+    # The value of the field. Defaults to None, dumped as json
+    value = models.TextField(default='null')
 
-            shared_state_key = getattr(descriptor, 'shared_state_key', None)
-            if shared_state_key is not None:
-                keys.append(shared_state_key)
+    created = models.DateTimeField(auto_now_add=True, db_index=True)
+    modified = models.DateTimeField(auto_now=True, db_index=True)
 
-        return keys
+    def __repr__(self):
+        return 'XModuleSettingsField<%r>' % ({
+            'field_name': self.field_name,
+            'usage_id': self.usage_id,
+            'value': self.value,
+        },)
 
-    def lookup(self, course_id, module_type, module_state_key):
-        '''
-        Look for a student module with the given course_id, type, and id in the cache.
+    def __unicode__(self):
+        return unicode(repr(self))
 
-        cache -- list of student modules
 
-        returns first found object, or None
-        '''
-        for o in self.cache:
-            if (o.course_id == course_id and
-                o.module_type == module_type and
-                o.module_state_key == module_state_key):
-                return o
-        return None
+class XModuleStudentPrefsField(models.Model):
+    """
+    Stores data set in the Scope.student_preferences scope by an xmodule field
+    """
 
-    def append(self, student_module):
-        self.cache.append(student_module)
+    class Meta:
+        unique_together = (('student', 'module_type', 'field_name'),)
+
+    # The name of the field
+    field_name = models.CharField(max_length=64, db_index=True)
+
+    # The type of the module for these preferences
+    module_type = models.CharField(max_length=64, db_index=True)
+
+    # The value of the field. Defaults to None dumped as json
+    value = models.TextField(default='null')
+
+    student = models.ForeignKey(User, db_index=True)
+
+    created = models.DateTimeField(auto_now_add=True, db_index=True)
+    modified = models.DateTimeField(auto_now=True, db_index=True)
+
+    def __repr__(self):
+        return 'XModuleStudentPrefsField<%r>' % ({
+            'field_name': self.field_name,
+            'module_type': self.module_type,
+            'student': self.student.username,
+            'value': self.value,
+        },)
+
+    def __unicode__(self):
+        return unicode(repr(self))
+
+
+class XModuleStudentInfoField(models.Model):
+    """
+    Stores data set in the Scope.student_preferences scope by an xmodule field
+    """
+
+    class Meta:
+        unique_together = (('student', 'field_name'),)
+
+    # The name of the field
+    field_name = models.CharField(max_length=64, db_index=True)
+
+    # The value of the field. Defaults to None dumped as json
+    value = models.TextField(default='null')
+
+    student = models.ForeignKey(User, db_index=True)
+
+    created = models.DateTimeField(auto_now_add=True, db_index=True)
+    modified = models.DateTimeField(auto_now=True, db_index=True)
+
+    def __repr__(self):
+        return 'XModuleStudentInfoField<%r>' % ({
+            'field_name': self.field_name,
+            'student': self.student.username,
+            'value': self.value,
+        },)
+
+    def __unicode__(self):
+        return unicode(repr(self))
 
 
 class OfflineComputedGrade(models.Model):
diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index ec2178f642..08df7bfb8c 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -18,7 +18,7 @@ from requests.auth import HTTPBasicAuth
 from capa.xqueue_interface import XQueueInterface
 from courseware.access import has_access
 from mitxmako.shortcuts import render_to_string
-from models import StudentModule, StudentModuleCache
+from .models import StudentModule
 from psychometrics.psychoanalyze import make_psychometrics_data_update_handler
 from student.models import unique_id_for_user
 from xmodule.errortracker import exc_info_to_str
@@ -27,7 +27,9 @@ from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
 from xmodule.x_module import ModuleSystem
 from xmodule.error_module import ErrorDescriptor, NonStaffErrorDescriptor
+from xblock.runtime import DbModel
 from xmodule_modifiers import replace_course_urls, replace_static_urls, add_histogram, wrap_xmodule
+from .model_data import LmsKeyValueStore, LmsUsage, ModelDataCache
 
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from statsd import statsd
@@ -59,7 +61,7 @@ def make_track_function(request):
     return f
 
 
-def toc_for_course(user, request, course, active_chapter, active_section):
+def toc_for_course(user, request, course, active_chapter, active_section, model_data_cache):
     '''
     Create a table of contents from the module store
 
@@ -79,19 +81,17 @@ def toc_for_course(user, request, course, active_chapter, active_section):
 
     NOTE: assumes that if we got this far, user has access to course.  Returns
     None if this is not the case.
+
+    model_data_cache must include data from the course module and 2 levels of its descendents
     '''
 
-    student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(
-        course.id, user, course, depth=2)
-    course_module = get_module_for_descriptor(user, request, course,
-                                              student_module_cache, course.id)
+    course_module = get_module_for_descriptor(user, request, course, model_data_cache, course.id)
     if course_module is None:
         return None
 
     chapters = list()
     for chapter in course_module.get_display_items():
-        hide_from_toc = chapter.metadata.get('hide_from_toc', 'false').lower() == 'true'
-        if hide_from_toc:
+        if chapter.lms.hide_from_toc:
             continue
 
         sections = list()
@@ -99,27 +99,26 @@ def toc_for_course(user, request, course, active_chapter, active_section):
 
             active = (chapter.url_name == active_chapter and
                       section.url_name == active_section)
-            hide_from_toc = section.metadata.get('hide_from_toc', 'false').lower() == 'true'
 
-            if not hide_from_toc:
-                sections.append({'display_name': section.display_name,
+            if not section.lms.hide_from_toc:
+                sections.append({'display_name': section.display_name_with_default,
                                  'url_name': section.url_name,
-                                 'format': section.metadata.get('format', ''),
-                                 'due': section.metadata.get('due', ''),
+                                 'format': section.lms.format if section.lms.format is not None else '',
+                                 'due': section.lms.due,
                                  'active': active,
-                                 'graded': section.metadata.get('graded', False),
+                                 'graded': section.lms.graded,
                                  })
 
-        chapters.append({'display_name': chapter.display_name,
+        chapters.append({'display_name': chapter.display_name_with_default,
                          'url_name': chapter.url_name,
                          'sections': sections,
                          'active': chapter.url_name == active_chapter})
     return chapters
 
 
-def get_module(user, request, location, student_module_cache, course_id,
-               position=None, not_found_ok=False, wrap_xmodule_display=True,
-               depth=0):
+def get_module(user, request, location, model_data_cache, course_id,
+               position=None, not_found_ok = False, wrap_xmodule_display=True,
+               grade_bucket_type=None, depth=0):
     """
     Get an instance of the xmodule class identified by location,
     setting the state based on an existing StudentModule, or creating one if none
@@ -130,7 +129,7 @@ def get_module(user, request, location, student_module_cache, course_id,
       - request               : current django HTTPrequest.  Note: request.user isn't used for anything--all auth
                                 and such works based on user.
       - location              : A Location-like object identifying the module to load
-      - student_module_cache  : a StudentModuleCache
+      - model_data_cache      : a ModelDataCache
       - course_id             : the course_id in the context of which to load module
       - position              : extra information from URL for user-specified
                                 position within module
@@ -144,9 +143,10 @@ def get_module(user, request, location, student_module_cache, course_id,
     try:
         location = Location(location)
         descriptor = modulestore().get_instance(course_id, location, depth=depth)
-        return get_module_for_descriptor(user, request, descriptor, student_module_cache, course_id,
-                                         position=position, not_found_ok=not_found_ok,
-                                         wrap_xmodule_display=wrap_xmodule_display)
+        return get_module_for_descriptor(user, request, descriptor, model_data_cache, course_id,
+                                         position=position,
+                                         wrap_xmodule_display=wrap_xmodule_display,
+                                         grade_bucket_type=grade_bucket_type)
     except ItemNotFoundError:
         if not not_found_ok:
             log.exception("Error in get_module")
@@ -157,17 +157,8 @@ def get_module(user, request, location, student_module_cache, course_id,
         return None
 
 
-def get_module_for_descriptor(user, request, descriptor, student_module_cache, course_id,
-                              position=None, not_found_ok=False, wrap_xmodule_display=True):
-    """
-    Actually implement get_module. See docstring there for details.
-    """
-    return _get_module(user, request, descriptor, student_module_cache, course_id,
-                       position=position, wrap_xmodule_display=wrap_xmodule_display)
-
-
-def _get_module(user, request, descriptor, student_module_cache, course_id,
-                position=None, wrap_xmodule_display=True):
+def get_module_for_descriptor(user, request, descriptor, model_data_cache, course_id,
+                position=None, wrap_xmodule_display=True, grade_bucket_type=None):
     """
     Actually implement get_module.  See docstring there for details.
     """
@@ -176,23 +167,6 @@ def _get_module(user, request, descriptor, student_module_cache, course_id,
     if not has_access(user, descriptor, 'load', course_id):
         return None
 
-    # Only check the cache if this module can possibly have state
-    instance_module = None
-    shared_module = None
-    if user.is_authenticated():
-        if descriptor.stores_state:
-            instance_module = student_module_cache.lookup(
-                course_id, descriptor.category, descriptor.location.url())
-
-        shared_state_key = getattr(descriptor, 'shared_state_key', None)
-        if shared_state_key is not None:
-            shared_module = student_module_cache.lookup(course_id,
-                                                        descriptor.category,
-                                                        shared_state_key)
-
-    instance_state = instance_module.state if instance_module is not None else None
-    shared_state = shared_module.state if shared_module is not None else None
-
     # Setup system context for module instance
     ajax_url = reverse('modx_dispatch',
                        kwargs=dict(course_id=course_id,
@@ -254,7 +228,44 @@ def _get_module(user, request, descriptor, student_module_cache, course_id,
         Delegate to get_module.  It does an access check, so may return None
         """
         return get_module_for_descriptor(user, request, descriptor,
-                                         student_module_cache, course_id, position)
+                                         model_data_cache, course_id, position)
+
+    def xblock_model_data(descriptor):
+        return DbModel(
+            LmsKeyValueStore(descriptor._model_data, model_data_cache),
+            descriptor.module_class,
+            user.id,
+            LmsUsage(descriptor.location, descriptor.location)
+        )
+
+    def publish(event):
+        if event.get('event_name') != 'grade':
+            return
+
+        student_module, created = StudentModule.objects.get_or_create(
+            course_id=course_id,
+            student=user,
+            module_type=descriptor.location.category,
+            module_state_key=descriptor.location.url(),
+            defaults={'state': '{}'},
+        )
+        student_module.grade = event.get('value')
+        student_module.max_grade = event.get('max_value')
+        student_module.save()
+
+        #Bin score into range and increment stats
+        score_bucket = get_score_bucket(student_module.grade, student_module.max_grade)
+        org, course_num, run = course_id.split("/")
+
+        tags = ["org:{0}".format(org),
+                "course:{0}".format(course_num),
+                "run:{0}".format(run),
+                "score_bucket:{0}".format(score_bucket)]
+
+        if grade_bucket_type is not None:
+            tags.append('type:%s' % grade_bucket_type)
+
+        statsd.increment("lms.courseware.question_answered", tags=tags)
 
     # TODO (cpennington): When modules are shared between courses, the static
     # prefix is going to have to be specific to the module, not the directory
@@ -272,10 +283,12 @@ def _get_module(user, request, descriptor, student_module_cache, course_id,
                           # by the replace_static_urls code below
                           replace_urls=partial(
                               static_replace.replace_static_urls,
-                              data_directory=descriptor.metadata.get('data_dir', ''),
+                              data_directory=getattr(descriptor, 'data_dir', None),
                               course_namespace=descriptor.location._replace(category=None, name=None),
                           ),
                           node_path=settings.NODE_PATH,
+                          xblock_model_data=xblock_model_data,
+                          publish=publish,
                           anonymous_student_id=unique_id_for_user(user),
                           course_id=course_id,
                           open_ended_grading_interface=open_ended_grading_interface,
@@ -284,26 +297,29 @@ def _get_module(user, request, descriptor, student_module_cache, course_id,
     # pass position specified in URL to module through ModuleSystem
     system.set('position', position)
     system.set('DEBUG', settings.DEBUG)
-    if settings.MITX_FEATURES.get('ENABLE_PSYCHOMETRICS') and instance_module is not None:
+    if settings.MITX_FEATURES.get('ENABLE_PSYCHOMETRICS'):
         system.set('psychometrics_handler',		# set callback for updating PsychometricsData
-                   make_psychometrics_data_update_handler(instance_module))
+                   make_psychometrics_data_update_handler(course_id, user, descriptor.location.url()))
 
     try:
-        module = descriptor.xmodule_constructor(system)(instance_state, shared_state)
+        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
-        import_system = descriptor.system
         if has_access(user, descriptor.location, 'staff', course_id):
-            err_descriptor = ErrorDescriptor.from_xml(str(descriptor), import_system,
-                                                      error_msg=exc_info_to_str(sys.exc_info()))
+            err_descriptor_class = ErrorDescriptor
         else:
-            err_descriptor = NonStaffErrorDescriptor.from_xml(str(descriptor), import_system,
-                                                              error_msg=exc_info_to_str(sys.exc_info()))
+            err_descriptor_class = NonStaffErrorDescriptor
+
+        err_descriptor = err_descriptor_class.from_xml(
+            str(descriptor), descriptor.system,
+            org=descriptor.location.org, course=descriptor.location.course,
+            error_msg=exc_info_to_str(sys.exc_info())
+        )
 
         # Make an error module
-        return err_descriptor.xmodule_constructor(system)(None, None)
+        return err_descriptor.xmodule(system)
 
     system.set('user_is_staff', has_access(user, descriptor.location, 'staff', course_id))
     _get_html = module.get_html
@@ -313,7 +329,7 @@ def _get_module(user, request, descriptor, student_module_cache, course_id,
 
     module.get_html = replace_static_urls(
         _get_html,
-        module.metadata.get('data_dir', ''),
+        getattr(descriptor, 'data_dir', None),
         course_namespace=module.location._replace(category=None, name=None))
 
     # Allow URLs of the form '/course/' refer to the root of multicourse directory
@@ -326,69 +342,6 @@ def _get_module(user, request, descriptor, student_module_cache, course_id,
 
     return module
 
-# TODO (vshnayder): Rename this?  It's very confusing.
-
-
-def get_instance_module(course_id, user, module, student_module_cache):
-    """
-    Returns the StudentModule specific to this module for this student,
-        or None if this is an anonymous user
-    """
-    if user.is_authenticated():
-        if not module.descriptor.stores_state:
-            log.exception("Attempted to get the instance_module for a module "
-                          + str(module.id) + " which does not store state.")
-            return None
-
-        instance_module = student_module_cache.lookup(
-            course_id, module.category, module.location.url())
-
-        if not instance_module:
-            instance_module = StudentModule(
-                course_id=course_id,
-                student=user,
-                module_type=module.category,
-                module_state_key=module.id,
-                state=module.get_instance_state(),
-                max_grade=module.max_score())
-            instance_module.save()
-            student_module_cache.append(instance_module)
-
-        return instance_module
-    else:
-        return None
-
-
-def get_shared_instance_module(course_id, user, module, student_module_cache):
-    """
-    Return shared_module is a StudentModule specific to all modules with the same
-        'shared_state_key' attribute, or None if the module does not elect to
-        share state
-    """
-    if user.is_authenticated():
-        # To get the shared_state_key, we need to descriptor
-        descriptor = modulestore().get_instance(course_id, module.location)
-
-        shared_state_key = getattr(module, 'shared_state_key', None)
-        if shared_state_key is not None:
-            shared_module = student_module_cache.lookup(module.category,
-                                                        shared_state_key)
-            if not shared_module:
-                shared_module = StudentModule(
-                    course_id=course_id,
-                    student=user,
-                    module_type=descriptor.category,
-                    module_state_key=shared_state_key,
-                    state=module.get_shared_state())
-                shared_module.save()
-                student_module_cache.append(shared_module)
-        else:
-            shared_module = None
-
-        return shared_module
-    else:
-        return None
-
 
 @csrf_exempt
 def xqueue_callback(request, course_id, userid, id, dispatch):
@@ -409,22 +362,13 @@ def xqueue_callback(request, course_id, userid, id, dispatch):
     # Retrieve target StudentModule
     user = User.objects.get(id=userid)
 
-    student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(course_id,
+    model_data_cache = ModelDataCache.cache_for_descriptor_descendents(course_id,
         user, modulestore().get_instance(course_id, id), depth=0, select_for_update=True)
-    instance = get_module(user, request, id, student_module_cache, course_id)
+    instance = get_module(user, request, id, model_data_cache, course_id, grade_bucket_type='xqueue')
     if instance is None:
         log.debug("No module {0} for user {1}--access denied?".format(id, user))
         raise Http404
 
-    instance_module = get_instance_module(course_id, user, instance, student_module_cache)
-
-    if instance_module is None:
-        log.debug("Couldn't find instance of module '%s' for user '%s'", id, user)
-        raise Http404
-
-    oldgrade = instance_module.grade
-    old_instance_state = instance_module.state
-
     # Transfer 'queuekey' from xqueue response header to 'get'. This is required to
     #   use the interface defined by 'handle_ajax'
     get.update({'queuekey': header['lms_key']})
@@ -438,22 +382,6 @@ def xqueue_callback(request, course_id, userid, id, dispatch):
         log.exception("error processing ajax call")
         raise
 
-    # Save state back to database
-    instance_module.state = instance.get_instance_state()
-    if instance.get_score():
-        instance_module.grade = instance.get_score()['score']
-    if instance_module.grade != oldgrade or instance_module.state != old_instance_state:
-        instance_module.save()
-
-        #Bin score into range and increment stats
-        score_bucket = get_score_bucket(instance_module.grade, instance_module.max_grade)
-        org, course_num, run = course_id.split("/")
-        statsd.increment("lms.courseware.question_answered",
-                        tags=["org:{0}".format(org),
-                              "course:{0}".format(course_num),
-                              "run:{0}".format(run),
-                              "score_bucket:{0}".format(score_bucket),
-                              "type:xqueue"])
     return HttpResponse("")
 
 
@@ -493,29 +421,16 @@ def modx_dispatch(request, dispatch, location, course_id):
                     return HttpResponse(json.dumps({'success': file_too_big_msg}))
             p[fileinput_id] = inputfiles
 
-    student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(course_id,
+    model_data_cache = ModelDataCache.cache_for_descriptor_descendents(course_id,
         request.user, modulestore().get_instance(course_id, location))
 
-    instance = get_module(request.user, request, location, student_module_cache, course_id)
+    instance = get_module(request.user, request, location, model_data_cache, course_id, grade_bucket_type='ajax')
     if instance is None:
         # Either permissions just changed, or someone is trying to be clever
         # and load something they shouldn't have access to.
         log.debug("No module {0} for user {1}--access denied?".format(location, request.user))
         raise Http404
 
-    instance_module = get_instance_module(course_id, request.user, instance, student_module_cache)
-    shared_module = get_shared_instance_module(course_id, request.user, instance, student_module_cache)
-
-    # Don't track state for anonymous users (who don't have student modules)
-    if instance_module is not None:
-        oldgrade = instance_module.grade
-        # The max grade shouldn't change under normal circumstances, but
-        # sometimes the problem changes with the same name but a new max grade.
-        # This updates the module if that happens.
-        old_instance_max_grade = instance_module.max_grade
-        old_instance_state = instance_module.state
-        old_shared_state = shared_module.state if shared_module is not None else None
-
     # Let the module handle the AJAX
     try:
         ajax_return = instance.handle_ajax(dispatch, p)
@@ -526,34 +441,6 @@ def modx_dispatch(request, dispatch, location, course_id):
         log.exception("error processing ajax call")
         raise
 
-    # Save the state back to the database
-    # Don't track state for anonymous users (who don't have student modules)
-    if instance_module is not None:
-        instance_module.state = instance.get_instance_state()
-        instance_module.max_grade = instance.max_score()
-        if instance.get_score():
-            instance_module.grade = instance.get_score()['score']
-        if (instance_module.grade != oldgrade or
-            instance_module.state != old_instance_state or
-            instance_module.max_grade != old_instance_max_grade):
-            instance_module.save()
-
-            #Bin score into range and increment stats
-            score_bucket = get_score_bucket(instance_module.grade, instance_module.max_grade)
-            org, course_num, run = course_id.split("/")
-            statsd.increment("lms.courseware.question_answered",
-                            tags=["org:{0}".format(org),
-                                  "course:{0}".format(course_num),
-                                  "run:{0}".format(run),
-                                  "score_bucket:{0}".format(score_bucket),
-                                  "type:ajax"])
-
-
-    if shared_module is not None:
-        shared_module.state = instance.get_shared_state()
-        if shared_module.state != old_shared_state:
-            shared_module.save()
-
     # Return whatever the module wanted to return to the client/caller
     return HttpResponse(ajax_return)
 
diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py
index b31aeb6b5a..9f9a4e3e96 100644
--- a/lms/djangoapps/courseware/tabs.py
+++ b/lms/djangoapps/courseware/tabs.py
@@ -21,13 +21,14 @@ from fs.errors import ResourceNotFoundError
 from courseware.access import has_access
 
 from lxml.html import rewrite_links
-from module_render import get_module
+from .module_render import get_module
 from courseware.access import has_access
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.xml import XMLModuleStore
 from xmodule.x_module import XModule
 from student.models import unique_id_for_user
+from courseware.model_data import ModelDataCache
 
 from open_ended_grading import open_ended_notifications
 
@@ -130,6 +131,17 @@ def _pdf_textbooks(tab, user, course, active_page):
                 for index, textbook in enumerate(course.pdf_textbooks)]
     return []
 
+def _html_textbooks(tab, user, course, active_page):
+    """
+    Generates one tab per textbook.  Only displays if user is authenticated.
+    """
+    if user.is_authenticated():
+        # since there can be more than one textbook, active_page is e.g. "book/0".
+        return [CourseTab(textbook['tab_title'], reverse('html_book', args=[course.id, index]),
+                          active_page == "htmltextbook/{0}".format(index))
+                for index, textbook in enumerate(course.html_textbooks)]
+    return []
+
 def _staff_grading(tab, user, course, active_page):
     if has_access(user, course, 'staff'):
         link = reverse('staff_grading', args=[course.id])
@@ -209,6 +221,7 @@ VALID_TAB_TYPES = {
     'external_link': TabImpl(key_checker(['name', 'link']), _external_link),
     'textbooks': TabImpl(null_validator, _textbooks),
     'pdf_textbooks': TabImpl(null_validator, _pdf_textbooks),
+    'html_textbooks': TabImpl(null_validator, _html_textbooks),
     'progress': TabImpl(need_name, _progress),
     'static_tab': TabImpl(key_checker(['name', 'url_slug']), _static_tab),
     'peer_grading': TabImpl(null_validator, _peer_grading),
@@ -332,10 +345,12 @@ def get_static_tab_by_slug(course, tab_slug):
     return None
 
 
-def get_static_tab_contents(request, cache, course, tab):
+def get_static_tab_contents(request, course, tab):
 
     loc = Location(course.location.tag, course.location.org, course.location.course, 'static_tab', tab['url_slug'])
-    tab_module = get_module(request.user, request, loc, cache, course.id)
+    model_data_cache = ModelDataCache.cache_for_descriptor_descendents(course.id,
+        request.user, modulestore().get_instance(course.id, loc), depth=0)
+    tab_module = get_module(request.user, request, loc, model_data_cache, course.id)
 
     logging.debug('course_module = {0}'.format(tab_module))
 
diff --git a/lms/djangoapps/courseware/tests/test_access.py b/lms/djangoapps/courseware/tests/test_access.py
index acb05d5d78..c1bb9f203e 100644
--- a/lms/djangoapps/courseware/tests/test_access.py
+++ b/lms/djangoapps/courseware/tests/test_access.py
@@ -12,7 +12,7 @@ from xmodule.modulestore import Location
 from xmodule.timeparse import parse_time
 from xmodule.x_module import XModule, XModuleDescriptor
 import courseware.access as access
-from factories import CourseEnrollmentAllowedFactory
+from .factories import CourseEnrollmentAllowedFactory
 
 
 class AccessTestCase(TestCase):
@@ -88,7 +88,6 @@ class AccessTestCase(TestCase):
         yesterday = time.gmtime(time.time() - 86400)
         tomorrow = time.gmtime(time.time() + 86400)
         c = Mock(enrollment_start=yesterday, enrollment_end=tomorrow)
-        c.metadata.get = 'is_public'
 
         # User can enroll if it is between the start and end dates
         self.assertTrue(access._has_access_course_desc(u, c, 'enroll'))
@@ -99,7 +98,6 @@ class AccessTestCase(TestCase):
         u.is_authenticated.return_value = True
 
         c = Mock(enrollment_start=tomorrow, enrollment_end=tomorrow, id='edX/test/2012_Fall')
-        c.metadata.get = 'is_public'
 
         allowed = CourseEnrollmentAllowedFactory(email=u.email, course_id=c.id)
 
@@ -110,7 +108,6 @@ class AccessTestCase(TestCase):
         u.is_authenticated.return_value = True
 
         c = Mock(enrollment_start=tomorrow, enrollment_end=tomorrow, id='edX/test/Whenever')
-        c.metadata.get = 'is_public'
         self.assertTrue(access._has_access_course_desc(u, c, 'enroll'))
 
         # TODO:
diff --git a/lms/djangoapps/courseware/tests/test_model_data.py b/lms/djangoapps/courseware/tests/test_model_data.py
new file mode 100644
index 0000000000..7f4727cf15
--- /dev/null
+++ b/lms/djangoapps/courseware/tests/test_model_data.py
@@ -0,0 +1,298 @@
+import factory
+import json
+from mock import Mock
+from django.contrib.auth.models import User
+
+from functools import partial
+
+from courseware.model_data import LmsKeyValueStore, InvalidWriteError, InvalidScopeError, ModelDataCache
+from courseware.models import StudentModule, XModuleContentField, XModuleSettingsField, XModuleStudentInfoField, XModuleStudentPrefsField
+from xblock.core import Scope, BlockScope
+from xmodule.modulestore import Location
+
+from django.test import TestCase
+
+
+def mock_field(scope, name):
+    field = Mock()
+    field.scope = scope
+    field.name = name
+    return field
+
+def mock_descriptor(fields=[], lms_fields=[]):
+    descriptor = Mock()
+    descriptor.stores_state = True
+    descriptor.location = location('def_id')
+    descriptor.module_class.fields = fields
+    descriptor.module_class.lms.fields = lms_fields
+    return descriptor
+
+location = partial(Location, 'i4x', 'edX', 'test_course', 'problem')
+course_id = 'edX/test_course/test'
+
+content_key = partial(LmsKeyValueStore.Key, Scope.content, None, location('def_id'))
+settings_key = partial(LmsKeyValueStore.Key, Scope.settings, None, location('def_id'))
+student_state_key = partial(LmsKeyValueStore.Key, Scope.student_state, 'user', location('def_id'))
+student_prefs_key = partial(LmsKeyValueStore.Key, Scope.student_preferences, 'user', 'problem')
+student_info_key = partial(LmsKeyValueStore.Key, Scope.student_info, 'user', None)
+
+
+class UserFactory(factory.Factory):
+    FACTORY_FOR = User
+
+    username = 'user'
+
+
+class StudentModuleFactory(factory.Factory):
+    FACTORY_FOR = StudentModule
+
+    module_type = 'problem'
+    module_state_key = location('def_id').url()
+    student = factory.SubFactory(UserFactory)
+    course_id = course_id
+    state = None
+
+
+class ContentFactory(factory.Factory):
+    FACTORY_FOR = XModuleContentField
+
+    field_name = 'existing_field'
+    value = json.dumps('old_value')
+    definition_id = location('def_id').url()
+
+
+class SettingsFactory(factory.Factory):
+    FACTORY_FOR = XModuleSettingsField
+
+    field_name = 'existing_field'
+    value = json.dumps('old_value')
+    usage_id = '%s-%s' % (course_id, location('def_id').url())
+
+
+class StudentPrefsFactory(factory.Factory):
+    FACTORY_FOR = XModuleStudentPrefsField
+
+    field_name = 'existing_field'
+    value = json.dumps('old_value')
+    student = factory.SubFactory(UserFactory)
+    module_type = 'problem'
+
+
+class StudentInfoFactory(factory.Factory):
+    FACTORY_FOR = XModuleStudentInfoField
+
+    field_name = 'existing_field'
+    value = json.dumps('old_value')
+    student = factory.SubFactory(UserFactory)
+
+
+class TestDescriptorFallback(TestCase):
+
+    def setUp(self):
+        self.desc_md = {
+            'field_a': 'content',
+            'field_b': 'settings',
+        }
+        self.kvs = LmsKeyValueStore(self.desc_md, None)
+
+    def test_get_from_descriptor(self):
+        self.assertEquals('content', self.kvs.get(content_key('field_a')))
+        self.assertEquals('settings', self.kvs.get(settings_key('field_b')))
+
+    def test_write_to_descriptor(self):
+        self.assertRaises(InvalidWriteError, self.kvs.set, content_key('field_a'), 'foo')
+        self.assertEquals('content', self.desc_md['field_a'])
+        self.assertRaises(InvalidWriteError, self.kvs.set, settings_key('field_b'), 'foo')
+        self.assertEquals('settings', self.desc_md['field_b'])
+
+        self.assertRaises(InvalidWriteError, self.kvs.delete, content_key('field_a'))
+        self.assertEquals('content', self.desc_md['field_a'])
+        self.assertRaises(InvalidWriteError, self.kvs.delete, settings_key('field_b'))
+        self.assertEquals('settings', self.desc_md['field_b'])
+
+
+class TestInvalidScopes(TestCase):
+    def setUp(self):
+        self.desc_md = {}
+        self.user = UserFactory.create()
+        self.mdc = ModelDataCache([mock_descriptor([mock_field(Scope.student_state, 'a_field')])], course_id, self.user)
+        self.kvs = LmsKeyValueStore(self.desc_md, self.mdc)
+
+    def test_invalid_scopes(self):
+        for scope in (Scope(student=True, block=BlockScope.DEFINITION),
+                      Scope(student=False, block=BlockScope.TYPE),
+                      Scope(student=False, block=BlockScope.ALL)):
+            self.assertRaises(InvalidScopeError, self.kvs.get, LmsKeyValueStore.Key(scope, None, None, 'field'))
+            self.assertRaises(InvalidScopeError, self.kvs.set, LmsKeyValueStore.Key(scope, None, None, 'field'), 'value')
+            self.assertRaises(InvalidScopeError, self.kvs.delete, LmsKeyValueStore.Key(scope, None, None, 'field'))
+            self.assertRaises(InvalidScopeError, self.kvs.has, LmsKeyValueStore.Key(scope, None, None, 'field'))
+
+
+class TestStudentModuleStorage(TestCase):
+
+    def setUp(self):
+        self.desc_md = {}
+        student_module = StudentModuleFactory(state=json.dumps({'a_field': 'a_value'}))
+        self.user = student_module.student
+        self.mdc = ModelDataCache([mock_descriptor([mock_field(Scope.student_state, 'a_field')])], course_id, self.user)
+        self.kvs = LmsKeyValueStore(self.desc_md, self.mdc)
+
+    def test_get_existing_field(self):
+        "Test that getting an existing field in an existing StudentModule works"
+        self.assertEquals('a_value', self.kvs.get(student_state_key('a_field')))
+
+    def test_get_missing_field(self):
+        "Test that getting a missing field from an existing StudentModule raises a KeyError"
+        self.assertRaises(KeyError, self.kvs.get, student_state_key('not_a_field'))
+
+    def test_set_existing_field(self):
+        "Test that setting an existing student_state field changes the value"
+        self.kvs.set(student_state_key('a_field'), 'new_value')
+        self.assertEquals(1, StudentModule.objects.all().count())
+        self.assertEquals({'a_field': 'new_value'}, json.loads(StudentModule.objects.all()[0].state))
+
+    def test_set_missing_field(self):
+        "Test that setting a new student_state field changes the value"
+        self.kvs.set(student_state_key('not_a_field'), 'new_value')
+        self.assertEquals(1, StudentModule.objects.all().count())
+        self.assertEquals({'a_field': 'a_value', 'not_a_field': 'new_value'}, json.loads(StudentModule.objects.all()[0].state))
+
+    def test_delete_existing_field(self):
+        "Test that deleting an existing field removes it from the StudentModule"
+        self.kvs.delete(student_state_key('a_field'))
+        self.assertEquals(1, StudentModule.objects.all().count())
+        self.assertRaises(KeyError, self.kvs.get, student_state_key('not_a_field'))
+
+    def test_delete_missing_field(self):
+        "Test that deleting a missing field from an existing StudentModule raises a KeyError"
+        self.assertRaises(KeyError, self.kvs.delete, student_state_key('not_a_field'))
+        self.assertEquals(1, StudentModule.objects.all().count())
+        self.assertEquals({'a_field': 'a_value'}, json.loads(StudentModule.objects.all()[0].state))
+
+    def test_has_existing_field(self):
+        "Test that `has` returns True for existing fields in StudentModules"
+        self.assertTrue(self.kvs.has(student_state_key('a_field')))
+
+    def test_has_missing_field(self):
+        "Test that `has` returns False for missing fields in StudentModule"
+        self.assertFalse(self.kvs.has(student_state_key('not_a_field')))
+
+
+class TestMissingStudentModule(TestCase):
+    def setUp(self):
+        self.user = UserFactory.create()
+        self.desc_md = {}
+        self.mdc = ModelDataCache([mock_descriptor()], course_id, self.user)
+        self.kvs = LmsKeyValueStore(self.desc_md, self.mdc)
+
+    def test_get_field_from_missing_student_module(self):
+        "Test that getting a field from a missing StudentModule raises a KeyError"
+        self.assertRaises(KeyError, self.kvs.get, student_state_key('a_field'))
+
+    def test_set_field_in_missing_student_module(self):
+        "Test that setting a field in a missing StudentModule creates the student module"
+        self.assertEquals(0, len(self.mdc.cache))
+        self.assertEquals(0, StudentModule.objects.all().count())
+
+        self.kvs.set(student_state_key('a_field'), 'a_value')
+
+        self.assertEquals(1, len(self.mdc.cache))
+        self.assertEquals(1, StudentModule.objects.all().count())
+
+        student_module = StudentModule.objects.all()[0]
+        self.assertEquals({'a_field': 'a_value'}, json.loads(student_module.state))
+        self.assertEquals(self.user, student_module.student)
+        self.assertEquals(location('def_id').url(), student_module.module_state_key)
+        self.assertEquals(course_id, student_module.course_id)
+
+    def test_delete_field_from_missing_student_module(self):
+        "Test that deleting a field from a missing StudentModule raises a KeyError"
+        self.assertRaises(KeyError, self.kvs.delete, student_state_key('a_field'))
+
+    def test_has_field_for_missing_student_module(self):
+        "Test that `has` returns False for missing StudentModules"
+        self.assertFalse(self.kvs.has(student_state_key('a_field')))
+
+
+class StorageTestBase(object):
+    factory = None
+    scope = None
+    key_factory = None
+    storage_class = None
+
+    def setUp(self):
+        field_storage = self.factory.create()
+        if hasattr(field_storage, 'student'):
+            self.user = field_storage.student
+        else:
+            self.user = UserFactory.create()
+        self.desc_md = {}
+        self.mdc = ModelDataCache([mock_descriptor([mock_field(self.scope, 'existing_field')])], course_id, self.user)
+        self.kvs = LmsKeyValueStore(self.desc_md, self.mdc)
+
+    def test_get_existing_field(self):
+        "Test that getting an existing field in an existing Storage Field works"
+        self.assertEquals('old_value', self.kvs.get(self.key_factory('existing_field')))
+
+    def test_get_missing_field(self):
+        "Test that getting a missing field from an existing Storage Field raises a KeyError"
+        self.assertRaises(KeyError, self.kvs.get, self.key_factory('missing_field'))
+
+    def test_set_existing_field(self):
+        "Test that setting an existing field changes the value"
+        self.kvs.set(self.key_factory('existing_field'), 'new_value')
+        self.assertEquals(1, self.storage_class.objects.all().count())
+        self.assertEquals('new_value', json.loads(self.storage_class.objects.all()[0].value))
+
+    def test_set_missing_field(self):
+        "Test that setting a new field changes the value"
+        self.kvs.set(self.key_factory('missing_field'), 'new_value')
+        self.assertEquals(2, self.storage_class.objects.all().count())
+        self.assertEquals('old_value', json.loads(self.storage_class.objects.get(field_name='existing_field').value))
+        self.assertEquals('new_value', json.loads(self.storage_class.objects.get(field_name='missing_field').value))
+
+    def test_delete_existing_field(self):
+        "Test that deleting an existing field removes it"
+        self.kvs.delete(self.key_factory('existing_field'))
+        self.assertEquals(0, self.storage_class.objects.all().count())
+
+    def test_delete_missing_field(self):
+        "Test that deleting a missing field from an existing Storage Field raises a KeyError"
+        self.assertRaises(KeyError, self.kvs.delete, self.key_factory('missing_field'))
+        self.assertEquals(1, self.storage_class.objects.all().count())
+
+    def test_has_existing_field(self):
+        "Test that `has` returns True for an existing Storage Field"
+        self.assertTrue(self.kvs.has(self.key_factory('existing_field')))
+
+    def test_has_missing_field(self):
+        "Test that `has` return False for an existing Storage Field"
+        self.assertFalse(self.kvs.has(self.key_factory('missing_field')))
+
+
+class TestSettingsStorage(StorageTestBase, TestCase):
+    factory = SettingsFactory
+    scope = Scope.settings
+    key_factory = settings_key
+    storage_class = XModuleSettingsField
+
+
+class TestContentStorage(StorageTestBase, TestCase):
+    factory = ContentFactory
+    scope = Scope.content
+    key_factory = content_key
+    storage_class = XModuleContentField
+
+
+class TestStudentPrefsStorage(StorageTestBase, TestCase):
+    factory = StudentPrefsFactory
+    scope = Scope.student_preferences
+    key_factory = student_prefs_key
+    storage_class = XModuleStudentPrefsField
+
+
+class TestStudentInfoStorage(StorageTestBase, TestCase):
+    factory = StudentInfoFactory
+    scope = Scope.student_info
+    key_factory = student_info_key
+    storage_class = XModuleStudentInfoField
diff --git a/lms/djangoapps/courseware/tests/test_module_render.py b/lms/djangoapps/courseware/tests/test_module_render.py
index 81f95a85e4..3a3a7ac5ea 100644
--- a/lms/djangoapps/courseware/tests/test_module_render.py
+++ b/lms/djangoapps/courseware/tests/test_module_render.py
@@ -15,7 +15,6 @@ from django.test.client import RequestFactory
 from django.core.urlresolvers import reverse
 from django.test.utils import override_settings
 
-from courseware.models import StudentModule, StudentModuleCache
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.exceptions import NotFoundError
 from xmodule.modulestore import Location
@@ -24,8 +23,9 @@ from xmodule.modulestore.django import modulestore, _MODULESTORES
 from xmodule.seq_module import SequenceModule
 from courseware.tests.tests import PageLoader
 from student.models import Registration
+from courseware.model_data import ModelDataCache
 
-from factories import UserFactory
+from .factories import UserFactory
 
 
 class Stub:
@@ -60,18 +60,6 @@ class ModuleRenderTestCase(PageLoader):
         self.assertIsNone(render.get_module('dummyuser', None,
                                             'invalid location', None, None))
 
-    def test_get_instance_module(self):
-        mock_user = MagicMock()
-        mock_user.is_authenticated.return_value = False
-        self.assertIsNone(render.get_instance_module('dummy', mock_user, 'dummy',
-                                                     'dummy'))
-        mock_user_2 = MagicMock()
-        mock_user_2.is_authenticated.return_value = True
-        mock_module = MagicMock()
-        mock_module.descriptor.stores_state = False
-        self.assertIsNone(render.get_instance_module('dummy', mock_user_2,
-                                                     mock_module, 'dummy'))
-
     def test_modx_dispatch(self):
         self.assertRaises(Http404, render.modx_dispatch, 'dummy', 'dummy',
                           'invalid Location', 'dummy')
@@ -133,6 +121,8 @@ class TestTOC(TestCase):
         chapter_url = '%s/%s/%s' % ('/courses', self.course_name, chapter)
         factory = RequestFactory()
         request = factory.get(chapter_url)
+        model_data_cache = ModelDataCache.cache_for_descriptor_descendents(
+            self.toy_course.id, self.portal_user, self.toy_course, depth=2)
 
         expected = ([{'active': True, 'sections':
                     [{'url_name': 'Toy_Videos', 'display_name': u'Toy Videos', 'graded': True,
@@ -149,7 +139,7 @@ class TestTOC(TestCase):
                     'format': '', 'due': '', 'active': False}],
                     'url_name': 'secret:magic', 'display_name': 'secret:magic'}])
 
-        actual = render.toc_for_course(self.portal_user, request, self.toy_course, chapter, None)
+        actual = render.toc_for_course(self.portal_user, request, self.toy_course, chapter, None, model_data_cache)
         self.assertEqual(expected, actual)
 
     def test_toc_toy_from_section(self):
@@ -158,6 +148,8 @@ class TestTOC(TestCase):
         section = 'Welcome'
         factory = RequestFactory()
         request = factory.get(chapter_url)
+        model_data_cache = ModelDataCache.cache_for_descriptor_descendents(
+            self.toy_course.id, self.portal_user, self.toy_course, depth=2)
 
         expected = ([{'active': True, 'sections':
                     [{'url_name': 'Toy_Videos', 'display_name': u'Toy Videos', 'graded': True,
@@ -174,5 +166,5 @@ class TestTOC(TestCase):
                     'format': '', 'due': '', 'active': False}],
                     'url_name': 'secret:magic', 'display_name': 'secret:magic'}])
 
-        actual = render.toc_for_course(self.portal_user, request, self.toy_course, chapter, section)
+        actual = render.toc_for_course(self.portal_user, request, self.toy_course, chapter, section, model_data_cache)
         self.assertEqual(expected, actual)
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index eeac999813..979f347d1f 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -19,7 +19,7 @@ from xmodule.modulestore.exceptions import InvalidLocationError,\
 import courseware.views as views
 from xmodule.modulestore import Location
 
-from factories import UserFactory
+from .factories import UserFactory
 
 
 class Stub():
@@ -107,7 +107,7 @@ class ViewsTestCase(TestCase):
         mock_module.position = 3
         mock_module.get_display_items.return_value = []
         self.assertRaises(Http404, views.redirect_to_course_position,
-                          mock_module, True)
+                          mock_module)
 
     def test_registered_for_course(self):
         self.assertFalse(views.registered_for_course('Basketweaving', None))
diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py
index 7e00baf61f..cd845b1e44 100644
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -19,9 +19,9 @@ from xmodule.modulestore.mongo import MongoModuleStore
 
 # Need access to internal func to put users in the right group
 from courseware import grades
+from courseware.model_data import ModelDataCache
 from courseware.access import (has_access, _course_staff_group_name,
                                course_beta_test_group_name)
-from courseware.models import StudentModuleCache
 
 from student.models import Registration
 from xmodule.error_module import ErrorDescriptor
@@ -325,7 +325,7 @@ class PageLoader(ActivateLoginTestCase):
                     num_bad += 1
                 elif isinstance(descriptor, ErrorDescriptor):
                     msg = "ERROR error descriptor loaded: "
-                    msg = msg + descriptor.definition['data']['error_msg']
+                    msg = msg + descriptor.error_msg
                     all_ok = False
                     num_bad += 1
 
@@ -560,8 +560,8 @@ class TestViewAuth(PageLoader):
 
         # Make courses start in the future
         tomorrow = time.time() + 24 * 3600
-        self.toy.metadata['start'] = stringify_time(time.gmtime(tomorrow))
-        self.full.metadata['start'] = stringify_time(time.gmtime(tomorrow))
+        self.toy.lms.start = time.gmtime(tomorrow)
+        self.full.lms.start = time.gmtime(tomorrow)
 
         self.assertFalse(self.toy.has_started())
         self.assertFalse(self.full.has_started())
@@ -730,11 +730,11 @@ class TestViewAuth(PageLoader):
         yesterday = time.time() - 24 * 3600
 
         # toy course's hasn't started
-        self.toy.metadata['start'] = stringify_time(time.gmtime(tomorrow))
+        self.toy.lms.start = time.gmtime(tomorrow)
         self.assertFalse(self.toy.has_started())
 
         # but should be accessible for beta testers
-        self.toy.metadata['days_early_for_beta'] = '2'
+        self.toy.lms.days_early_for_beta = 2
 
         # student user shouldn't see it
         student_user = user(self.student)
@@ -778,27 +778,27 @@ class TestCourseGrader(PageLoader):
         self.factory = RequestFactory()
 
     def get_grade_summary(self):
-        student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(
+        model_data_cache = ModelDataCache.cache_for_descriptor_descendents(
             self.graded_course.id, self.student_user, self.graded_course)
 
         fake_request = self.factory.get(reverse('progress',
                                        kwargs={'course_id': self.graded_course.id}))
 
         return grades.grade(self.student_user, fake_request,
-                            self.graded_course, student_module_cache)
+                            self.graded_course, model_data_cache)
 
     def get_homework_scores(self):
         return self.get_grade_summary()['totaled_scores']['Homework']
 
     def get_progress_summary(self):
-        student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(
+        model_data_cache = ModelDataCache.cache_for_descriptor_descendents(
             self.graded_course.id, self.student_user, self.graded_course)
 
         fake_request = self.factory.get(reverse('progress',
                                        kwargs={'course_id': self.graded_course.id}))
 
         progress_summary = grades.progress_summary(self.student_user, fake_request,
-                                                   self.graded_course, student_module_cache)
+                                                   self.graded_course, model_data_cache)
         return progress_summary
 
     def check_grade_percent(self, percent):
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index ceb559d59e..e75ef8e8cf 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -21,8 +21,9 @@ from courseware.access import has_access
 from courseware.courses import (get_courses, get_course_with_access,
                                 get_courses_by_university, sort_by_announcement)
 import courseware.tabs as tabs
-from courseware.models import StudentModule, StudentModuleCache, StudentModuleHistory
-from module_render import toc_for_course, get_module, get_instance_module, get_module_for_descriptor
+from courseware.model_data import ModelDataCache
+from .module_render import toc_for_course, get_module_for_descriptor, get_module
+from courseware.models import StudentModule, StudentModuleHistory
 
 from django_comment_client.utils import get_discussion_title
 
@@ -40,7 +41,6 @@ log = logging.getLogger("mitx.courseware")
 template_imports = {'urllib': urllib}
 
 
-
 def user_groups(user):
     """
     TODO (vshnayder): This is not used. When we have a new plan for groups, adjust appropriately.
@@ -76,7 +76,7 @@ def courses(request):
     return render_to_response("courseware/courses.html", {'courses': courses})
 
 
-def render_accordion(request, course, chapter, section):
+def render_accordion(request, course, chapter, section, model_data_cache):
     ''' Draws navigation bar. Takes current position in accordion as
         parameter.
 
@@ -88,7 +88,7 @@ def render_accordion(request, course, chapter, section):
 
     # grab the table of contents
     user = User.objects.prefetch_related("groups").get(id=request.user.id)
-    toc = toc_for_course(user, request, course, chapter, section)
+    toc = toc_for_course(user, request, course, chapter, section, model_data_cache)
 
     context = dict([('toc', toc),
                     ('course_id', course.id),
@@ -99,16 +99,21 @@ def render_accordion(request, course, chapter, section):
 def get_current_child(xmodule):
     """
     Get the xmodule.position's display item of an xmodule that has a position and
-    children.  Returns None if the xmodule doesn't have a position, or if there
-    are no children.  Otherwise, if position is out of bounds, returns the first child.
+    children.  If xmodule has no position or is out of bounds, return the first child.
+    Returns None only if there are no children at all.
     """
     if not hasattr(xmodule, 'position'):
         return None
 
+    if xmodule.position is None:
+        pos = 0
+    else:
+        # position is 1-indexed.
+        pos = xmodule.position - 1
+
     children = xmodule.get_display_items()
-    # position is 1-indexed.
-    if 0 <= xmodule.position - 1 < len(children):
-        child = children[xmodule.position - 1]
+    if 0 <= pos < len(children):
+        child = children[pos]
     elif len(children) > 0:
         # Something is wrong.  Default to first child
         child = children[0]
@@ -117,114 +122,114 @@ def get_current_child(xmodule):
     return child
 
 
-def redirect_to_course_position(course_module, first_time):
+def redirect_to_course_position(course_module):
     """
-    Load the course state for the user, and return a redirect to the
-    appropriate place in the course: either the first element if there
-    is no state, or their previous place if there is.
+    Return a redirect to the user's current place in the course.
+
+    If this is the user's first time, redirects to COURSE/CHAPTER/SECTION.
+    If this isn't the users's first time, redirects to COURSE/CHAPTER,
+    and the view will find the current section and display a message
+    about reusing the stored position.
+
+    If there is no current position in the course or chapter, then selects
+    the first child.
 
-    If this is the user's first time, send them to the first section instead.
     """
-    course_id = course_module.descriptor.id
+    urlargs = {'course_id': course_module.descriptor.id}
     chapter = get_current_child(course_module)
     if chapter is None:
         # oops.  Something bad has happened.
-        raise Http404
-    if not first_time:
-        return redirect(reverse('courseware_chapter', kwargs={'course_id': course_id,
-                                                              'chapter': chapter.url_name}))
+        raise Http404("No chapter found when loading current position in course")
+
+    urlargs['chapter'] = chapter.url_name
+    if course_module.position is not None:
+        return redirect(reverse('courseware_chapter', kwargs=urlargs))
+
     # Relying on default of returning first child
     section = get_current_child(chapter)
-    return redirect(reverse('courseware_section', kwargs={'course_id': course_id,
-                                                          'chapter': chapter.url_name,
-                                                          'section': section.url_name}))
+    if section is None:
+        raise Http404("No section found when loading current position in course")
+
+    urlargs['section'] = section.url_name
+    return redirect(reverse('courseware_section', kwargs=urlargs))
 
 
-def save_child_position(seq_module, child_name, instance_module):
+def save_child_position(seq_module, child_name):
     """
     child_name: url_name of the child
-    instance_module: the StudentModule object for the seq_module
     """
-    for i, c in enumerate(seq_module.get_display_items()):
+    for position, c in enumerate(seq_module.get_display_items(), start=1):
         if c.url_name == child_name:
-            # Position is 1-indexed
-            position = i + 1
             # Only save if position changed
             if position != seq_module.position:
                 seq_module.position = position
-                instance_module.state = seq_module.get_instance_state()
-                instance_module.save()
+
 
 def check_for_active_timelimit_module(request, course_id, course):
     '''
     Looks for a timing module for the given user and course that is currently active.
     If found, returns a context dict with timer-related values to enable display of time remaining.
-    ''' 
+    '''
     context = {}
+
+    # TODO (cpennington): Once we can query the course structure, replace this with such a query
     timelimit_student_modules = StudentModule.objects.filter(student=request.user, course_id=course_id, module_type='timelimit')
     if timelimit_student_modules:
-        for timelimit_student_module in timelimit_student_modules: 
+        for timelimit_student_module in timelimit_student_modules:
             # get the corresponding section_descriptor for the given StudentModel entry:
             module_state_key = timelimit_student_module.module_state_key
             timelimit_descriptor = modulestore().get_instance(course_id, Location(module_state_key))
-            timelimit_module_cache = StudentModuleCache.cache_for_descriptor_descendents(course.id, request.user, 
+            timelimit_module_cache = ModelDataCache.cache_for_descriptor_descendents(course.id, request.user,
                                                                                      timelimit_descriptor, depth=None)
-            timelimit_module = get_module_for_descriptor(request.user, request, timelimit_descriptor, 
-                                                     timelimit_module_cache, course.id, position=None)
+            timelimit_module = get_module_for_descriptor(request.user, request, timelimit_descriptor,
+                                                         timelimit_module_cache, course.id, position=None)
             if timelimit_module is not None and timelimit_module.category == 'timelimit' and \
                     timelimit_module.has_begun and not timelimit_module.has_ended:
                 location = timelimit_module.location
                 # determine where to go when the timer expires:
-                if 'time_expired_redirect_url' not in timelimit_descriptor.metadata:
-                    raise Http404("No {0} metadata at this location: {1} ".format('time_expired_redirect_url', location))
-                time_expired_redirect_url = timelimit_descriptor.metadata.get('time_expired_redirect_url')
-                context['time_expired_redirect_url'] = time_expired_redirect_url
+                if timelimit_descriptor.time_expired_redirect_url is None:
+                    raise Http404("no time_expired_redirect_url specified at this location: {} ".format(timelimit_module.location))
+                context['time_expired_redirect_url'] = timelimit_descriptor.time_expired_redirect_url
                 # Fetch the remaining time relative to the end time as stored in the module when it was started.
                 # This value should be in milliseconds.
                 remaining_time = timelimit_module.get_remaining_time_in_ms()
                 context['timer_expiration_duration'] = remaining_time
-                if 'suppress_toplevel_navigation' in timelimit_descriptor.metadata:
-                    context['suppress_toplevel_navigation'] = timelimit_descriptor.metadata['suppress_toplevel_navigation']
-                return_url = reverse('jump_to', kwargs={'course_id':course_id, 'location':location})
+                context['suppress_toplevel_navigation'] = timelimit_descriptor.suppress_toplevel_navigation
+                return_url = reverse('jump_to', kwargs={'course_id': course_id, 'location': location})
                 context['timer_navigation_return_url'] = return_url
     return context
 
-def update_timelimit_module(user, course_id, student_module_cache, timelimit_descriptor, timelimit_module):
+
+def update_timelimit_module(user, course_id, model_data_cache, timelimit_descriptor, timelimit_module):
     '''
     Updates the state of the provided timing module, starting it if it hasn't begun.
     Returns dict with timer-related values to enable display of time remaining.
     Returns 'timer_expiration_duration' in dict if timer is still active, and not if timer has expired.
-    ''' 
+    '''
     context = {}
     # determine where to go when the exam ends:
-    if 'time_expired_redirect_url' not in timelimit_descriptor.metadata: 
-        raise Http404("No {0} metadata at this location: {1} ".format('time_expired_redirect_url', timelimit_module.location))
-    time_expired_redirect_url = timelimit_descriptor.metadata.get('time_expired_redirect_url')
-    context['time_expired_redirect_url'] = time_expired_redirect_url
+    if timelimit_descriptor.time_expired_redirect_url is None:
+        raise Http404("No time_expired_redirect_url specified at this location: {} ".format(timelimit_module.location))
+    context['time_expired_redirect_url'] = timelimit_descriptor.time_expired_redirect_url
 
     if not timelimit_module.has_ended:
         if not timelimit_module.has_begun:
             # user has not started the exam, so start it now.
-            if 'duration' not in timelimit_descriptor.metadata:
-                raise Http404("No {0} metadata at this location: {1} ".format('duration', timelimit_module.location))
+            if timelimit_descriptor.duration is None:
+                raise Http404("No duration specified at this location: {} ".format(timelimit_module.location))
             # The user may have an accommodation that has been granted to them.
             # This accommodation information should already be stored in the module's state.
-            duration = int(timelimit_descriptor.metadata.get('duration'))
-            timelimit_module.begin(duration)
-            # we have changed state, so we need to persist the change:
-            instance_module = get_instance_module(course_id, user, timelimit_module, student_module_cache)
-            instance_module.state = timelimit_module.get_instance_state()
-            instance_module.save()
-            
+            timelimit_module.begin(timelimit_descriptor.duration)
+
         # the exam has been started, either because the student is returning to the
         # exam page, or because they have just visited it.  Fetch the remaining time relative to the
         # end time as stored in the module when it was started.
         context['timer_expiration_duration'] = timelimit_module.get_remaining_time_in_ms()
         # also use the timed module to determine whether top-level navigation is visible:
-        if 'suppress_toplevel_navigation' in timelimit_descriptor.metadata:
-            context['suppress_toplevel_navigation'] = timelimit_descriptor.metadata['suppress_toplevel_navigation']
+        context['suppress_toplevel_navigation'] = timelimit_descriptor.suppress_toplevel_navigation
     return context
 
+
 @login_required
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
@@ -262,26 +267,22 @@ def index(request, course_id, chapter=None, section=None,
         return redirect(reverse('about_course', args=[course.id]))
 
     try:
-        student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(
+        model_data_cache = ModelDataCache.cache_for_descriptor_descendents(
             course.id, user, course, depth=2)
 
-        # Has this student been in this course before?
-        first_time = student_module_cache.lookup(course_id, 'course', course.location.url()) is None
-
-        # Load the module for the course
-        course_module = get_module_for_descriptor(user, request, course, student_module_cache, course.id)
+        course_module = get_module_for_descriptor(user, request, course, model_data_cache, course.id)
         if course_module is None:
             log.warning('If you see this, something went wrong: if we got this'
                         ' far, should have gotten a course module for this user')
             return redirect(reverse('about_course', args=[course.id]))
 
         if chapter is None:
-            return redirect_to_course_position(course_module, first_time)
+            return redirect_to_course_position(course_module)
 
         context = {
             'csrf': csrf(request)['csrf_token'],
-            'accordion': render_accordion(request, course, chapter, section),
-            'COURSE_TITLE': course.title,
+            'accordion': render_accordion(request, course, chapter, section, model_data_cache),
+            'COURSE_TITLE': course.display_name_with_default,
             'course': course,
             'init': '',
             'content': '',
@@ -291,8 +292,7 @@ def index(request, course_id, chapter=None, section=None,
 
         chapter_descriptor = course.get_child_by(lambda m: m.url_name == chapter)
         if chapter_descriptor is not None:
-            instance_module = get_instance_module(course_id, user, course_module, student_module_cache)
-            save_child_position(course_module, chapter, instance_module)
+            save_child_position(course_module, chapter)
         else:
             raise Http404('No chapter descriptor found with name {}'.format(chapter))
 
@@ -313,23 +313,23 @@ def index(request, course_id, chapter=None, section=None,
 
             # Load all descendants of the section, because we're going to display its
             # html, which in general will need all of its children
-            section_module_cache = StudentModuleCache.cache_for_descriptor_descendents(
-                course.id, user, section_descriptor, depth=None)
+            section_model_data_cache = ModelDataCache.cache_for_descriptor_descendents(
+                course_id, user, section_descriptor, depth=None)
+            section_module = get_module(request.user, request,
+                                section_descriptor.location,
+                                section_model_data_cache, course_id, position, depth=None)
 
-            section_module = get_module(user, request, section_descriptor.location,
-                section_module_cache, course.id, position=position, depth=None)
             if section_module is None:
                 # User may be trying to be clever and access something
                 # they don't have access to.
                 raise Http404
 
             # Save where we are in the chapter
-            instance_module = get_instance_module(course_id, user, chapter_module, student_module_cache)
-            save_child_position(chapter_module, section, instance_module)
+            save_child_position(chapter_module, section)
 
-            # check here if this section *is* a timed module.  
+            # 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, student_module_cache,
                                                         section_descriptor, section_module)
                 if 'timer_expiration_duration' in timer_context:
                     context.update(timer_context)
@@ -337,10 +337,10 @@ def index(request, course_id, chapter=None, section=None,
                     # if there is no expiration defined, then we know the timer has expired:
                     return HttpResponseRedirect(timer_context['time_expired_redirect_url'])
             else:
-                # check here if this page is within a course that has an active timed module running.  If so, then 
+                # check here if this page is within a course that has an active timed module running.  If so, then
                 # 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.get_html()
         else:
             # section is none, so display a message
@@ -453,7 +453,11 @@ def static_tab(request, course_id, tab_slug):
     if tab is None:
         raise Http404
 
-    contents = tabs.get_static_tab_contents(request, None, course, tab)
+    contents = tabs.get_static_tab_contents(
+        request,
+        course,
+        tab
+    )
     if contents is None:
         raise Http404
 
@@ -594,12 +598,12 @@ def progress(request, course_id, student_id=None):
     # additional DB lookup (this kills the Progress page in particular).
     student = User.objects.prefetch_related("groups").get(id=student.id)
 
-    student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(
+    model_data_cache = ModelDataCache.cache_for_descriptor_descendents(
         course_id, student, course, depth=None)
 
     courseware_summary = grades.progress_summary(student, request, course,
-                                                 student_module_cache)
-    grade_summary = grades.grade(student, request, course, student_module_cache)
+                                                 model_data_cache)
+    grade_summary = grades.grade(student, request, course, model_data_cache)
 
     if courseware_summary is None:
         #This means the student didn't have access to the course (which the instructor requested)
@@ -617,9 +621,9 @@ def progress(request, course_id, student_id=None):
 
 @login_required
 def submission_history(request, course_id, student_username, location):
-    """Render an HTML fragment (meant for inclusion elsewhere) that renders a 
+    """Render an HTML fragment (meant for inclusion elsewhere) that renders a
     history of all state changes made by this user for this problem location.
-    Right now this only works for problems because that's all 
+    Right now this only works for problems because that's all
     StudentModuleHistory records.
     """
     course = get_course_with_access(request.user, course_id, 'load')
diff --git a/lms/djangoapps/django_comment_client/base/urls.py b/lms/djangoapps/django_comment_client/base/urls.py
index d8fd4927fb..92826a18ae 100644
--- a/lms/djangoapps/django_comment_client/base/urls.py
+++ b/lms/djangoapps/django_comment_client/base/urls.py
@@ -12,6 +12,8 @@ urlpatterns = patterns('django_comment_client.base.views',
     url(r'threads/(?P<thread_id>[\w\-]+)/upvote$', 'vote_for_thread', {'value': 'up'}, name='upvote_thread'),
     url(r'threads/(?P<thread_id>[\w\-]+)/downvote$', 'vote_for_thread', {'value': 'down'}, name='downvote_thread'),
     url(r'threads/(?P<thread_id>[\w\-]+)/unvote$', 'undo_vote_for_thread', name='undo_vote_for_thread'),
+    url(r'threads/(?P<thread_id>[\w\-]+)/pin$', 'pin_thread', name='pin_thread'),
+    url(r'threads/(?P<thread_id>[\w\-]+)/unpin$', 'un_pin_thread', name='un_pin_thread'),
     url(r'threads/(?P<thread_id>[\w\-]+)/follow$', 'follow_thread', name='follow_thread'),
     url(r'threads/(?P<thread_id>[\w\-]+)/unfollow$', 'unfollow_thread', name='unfollow_thread'),
     url(r'threads/(?P<thread_id>[\w\-]+)/close$', 'openclose_thread', name='openclose_thread'),
diff --git a/lms/djangoapps/django_comment_client/base/views.py b/lms/djangoapps/django_comment_client/base/views.py
index d93ea19f44..4d7b56122c 100644
--- a/lms/djangoapps/django_comment_client/base/views.py
+++ b/lms/djangoapps/django_comment_client/base/views.py
@@ -72,12 +72,12 @@ def create_thread(request, course_id, commentable_id):
     course = get_course_with_access(request.user, course_id, 'load')
     post = request.POST
 
-    if course.metadata.get("allow_anonymous", True):
+    if course.allow_anonymous:
         anonymous = post.get('anonymous', 'false').lower() == 'true'
     else:
         anonymous = False
 
-    if course.metadata.get("allow_anonymous_to_peers", False):
+    if course.allow_anonymous_to_peers:
         anonymous_to_peers = post.get('anonymous_to_peers', 'false').lower() == 'true'
     else:
         anonymous_to_peers = False
@@ -96,7 +96,7 @@ def create_thread(request, course_id, commentable_id):
     #kevinchugh because the new requirement is that all groups will be determined
     #by the group id in the request this all goes away
     #not anymore, only for admins
-    
+
     # Cohort the thread if the commentable is cohorted.
     if is_commentable_cohorted(course_id, commentable_id):
         user_group_id = get_cohort_id(user, course_id)
@@ -113,7 +113,7 @@ def create_thread(request, course_id, commentable_id):
 
         if group_id:
             thread.update_attributes(group_id=group_id)
-    
+
     thread.save()
 
     if post.get('auto_subscribe', 'false').lower() == 'true':
@@ -147,12 +147,12 @@ def _create_comment(request, course_id, thread_id=None, parent_id=None):
     comment = cc.Comment(**extract(post, ['body']))
 
     course = get_course_with_access(request.user, course_id, 'load')
-    if course.metadata.get("allow_anonymous", True):
+    if course.allow_anonymous:
         anonymous = post.get('anonymous', 'false').lower() == 'true'
     else:
         anonymous = False
 
-    if course.metadata.get("allow_anonymous_to_peers", False):
+    if course.allow_anonymous_to_peers:
         anonymous_to_peers = post.get('anonymous_to_peers', 'false').lower() == 'true'
     else:
         anonymous_to_peers = False
@@ -289,6 +289,21 @@ def undo_vote_for_thread(request, course_id, thread_id):
     user.unvote(thread)
     return JsonResponse(utils.safe_content(thread.to_dict()))
 
+@require_POST
+@login_required
+@permitted
+def pin_thread(request, course_id, thread_id):
+    user = cc.User.from_django_user(request.user)
+    thread = cc.Thread.find(thread_id)
+    thread.pin(user,thread_id)
+    return JsonResponse(utils.safe_content(thread.to_dict()))
+
+def un_pin_thread(request, course_id, thread_id):
+    user = cc.User.from_django_user(request.user)
+    thread = cc.Thread.find(thread_id)
+    thread.un_pin(user,thread_id)
+    return JsonResponse(utils.safe_content(thread.to_dict()))
+
 
 @require_POST
 @login_required
diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py
index a3120c563a..301bb141be 100644
--- a/lms/djangoapps/django_comment_client/forum/views.py
+++ b/lms/djangoapps/django_comment_client/forum/views.py
@@ -91,6 +91,7 @@ def get_threads(request, course_id, discussion_id=None, per_page=THREADS_PER_PAG
 
     #now add the group name if the thread has a group id
     for thread in threads:
+        
         if thread.get('group_id'):
             thread['group_name'] = get_cohort_by_id(course_id, thread.get('group_id')).name
             thread['group_string'] = "This post visible only to Group %s." % (thread['group_name'])
@@ -124,31 +125,31 @@ def inline_discussion(request, course_id, discussion_id):
 
     annotated_content_info = utils.get_metadata_for_threads(course_id, threads, request.user, user_info)
 
-    allow_anonymous = course.metadata.get("allow_anonymous", True)
-    allow_anonymous_to_peers = course.metadata.get("allow_anonymous_to_peers", False)
+    allow_anonymous = course.allow_anonymous
+    allow_anonymous_to_peers = course.allow_anonymous_to_peers
 
     #since inline is all one commentable, only show or allow the choice of cohorts
     #if the commentable is cohorted, otherwise everything is not cohorted
     #and no one has the option of choosing a cohort
     is_cohorted = is_course_cohorted(course_id) and is_commentable_cohorted(course_id, discussion_id)
     is_moderator = cached_has_permission(request.user, "see_all_cohorts", course_id)
-    
+
     cohorts_list = list()
-    
+
     if is_cohorted:
         cohorts_list.append({'name':'All Groups','id':None})
-        
+
         #if you're a mod, send all cohorts and let you pick
-        
+
         if is_moderator:
             cohorts = get_course_cohorts(course_id)
             for c in cohorts:
                 cohorts_list.append({'name':c.name, 'id':c.id})
-                
+
         else:
             #students don't get to choose
             cohorts_list = None
-          
+
     return utils.JsonResponse({
         'discussion_data': map(utils.safe_content, threads),
         'user_info': user_info,
@@ -210,6 +211,9 @@ def forum_form_discussion(request, course_id):
 
         user_cohort_id = get_cohort_id(request.user, course_id)
 
+    
+        
+
         context = {
             'csrf': csrf(request)['csrf_token'],
             'course': course,
diff --git a/lms/djangoapps/django_comment_client/helpers.py b/lms/djangoapps/django_comment_client/helpers.py
index 733856e2a9..fbe7a2401b 100644
--- a/lms/djangoapps/django_comment_client/helpers.py
+++ b/lms/djangoapps/django_comment_client/helpers.py
@@ -1,11 +1,11 @@
 from django.core.urlresolvers import reverse
 from django.conf import settings
 from mitxmako.shortcuts import render_to_string
-from mustache_helpers import mustache_helpers
+from .mustache_helpers import mustache_helpers
 from django.core.urlresolvers import reverse
 from functools import partial
 
-from utils import *
+from .utils import *
 import django_comment_client.settings as cc_settings
 
 import pystache_custom as pystache
diff --git a/lms/djangoapps/django_comment_client/permissions.py b/lms/djangoapps/django_comment_client/permissions.py
index dfdcd3e7ba..7d21cc9783 100644
--- a/lms/djangoapps/django_comment_client/permissions.py
+++ b/lms/djangoapps/django_comment_client/permissions.py
@@ -90,6 +90,8 @@ VIEW_PERMISSIONS = {
     'undo_vote_for_comment':    [['unvote', 'is_open']],
     'vote_for_thread'   :       [['vote', 'is_open']],
     'undo_vote_for_thread':     [['unvote', 'is_open']],
+    'pin_thread':    ['create_comment'],
+    'un_pin_thread':    ['create_comment'],
     'follow_thread'     :       ['follow_thread'],
     'follow_commentable':       ['follow_commentable'],
     'follow_user'       :       ['follow_user'],
diff --git a/lms/djangoapps/django_comment_client/tests.py b/lms/djangoapps/django_comment_client/tests.py
index 4b5fe2ba5a..1d925cdb8e 100644
--- a/lms/djangoapps/django_comment_client/tests.py
+++ b/lms/djangoapps/django_comment_client/tests.py
@@ -62,7 +62,7 @@ from courseware.tests.tests import PageLoader, TEST_DATA_XML_MODULESTORE
 #        #self.assertEqual(resp.status_code, 200)
 #        #self.assertEqual(my_save.something, "expected", "complaint if not true")
 #
-#        self.toy.metadata["cohort_config"] = {"cohorted": True}
+#        self.toy.cohort_config = {"cohorted": True}
 #
 #        # call the view again ...
 #
diff --git a/lms/djangoapps/django_comment_client/utils.py b/lms/djangoapps/django_comment_client/utils.py
index dde219294c..42233b84da 100644
--- a/lms/djangoapps/django_comment_client/utils.py
+++ b/lms/djangoapps/django_comment_client/utils.py
@@ -4,6 +4,10 @@ import time
 import urllib
 from datetime import datetime
 
+from courseware.module_render import get_module
+from xmodule.modulestore import Location
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.search import path_to_location
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.db import connection
@@ -18,7 +22,6 @@ import pystache_custom as pystache
 
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
-from xmodule.modulestore.search import path_to_location
 
 log = logging.getLogger(__name__)
 
@@ -166,34 +169,25 @@ def initialize_discussion_info(course):
     # get all discussion models within this course_id
     all_modules = modulestore().get_items(['i4x', course.location.org, course.location.course, 'discussion', None], course_id=course_id)
 
-    path_to_locations = {}
     for module in all_modules:
         skip_module = False
-        for key in ('id', 'discussion_category', 'for'):
-            if key not in module.metadata:
+        for key in ('discussion_id', 'discussion_category', 'discussion_target'):
+            if getattr(module, key) is None:
                 log.warning("Required key '%s' not in discussion %s, leaving out of category map" % (key, module.location))
                 skip_module = True
 
-        # cdodge: pre-compute the path_to_location. Note this can throw an exception for any
-        # dangling discussion modules
-        try:
-            path_to_locations[module.location] = path_to_location(modulestore(), course.id, module.location)
-        except NoPathToItem:
-            log.warning("Could not compute path_to_location for {0}. Perhaps this is an orphaned discussion module?!? Skipping...".format(module.location))
-            skip_module = True
-
         if skip_module:
             continue
 
-        id = module.metadata['id']
-        category = module.metadata['discussion_category']
-        title = module.metadata['for']
-        sort_key = module.metadata.get('sort_key', title)
+        id = module.discussion_id
+        category = module.discussion_category
+        title = module.discussion_target
+        sort_key = module.sort_key
         category = " / ".join([x.strip() for x in category.split("/")])
         last_category = category.split("/")[-1]
         discussion_id_map[id] = {"location": module.location, "title": last_category + " / " + title}
         unexpanded_category_map[category].append({"title": title, "id": id,
-            "sort_key": sort_key, "start_date": module.start})
+            "sort_key": sort_key, "start_date": module.lms.start})
 
     category_map = {"entries": defaultdict(dict), "subcategories": defaultdict(dict)}
     for category_path, entries in unexpanded_category_map.items():
@@ -235,9 +229,7 @@ def initialize_discussion_info(course):
     # TODO.  BUG! : course location is not unique across multiple course runs!
     # (I think Kevin already noticed this)  Need to send course_id with requests, store it
     # in the backend.
-    default_topics = {'General': {'id': course.location.html_id()}}
-    discussion_topics = course.metadata.get('discussion_topics', default_topics)
-    for topic, entry in discussion_topics.items():
+    for topic, entry in course.discussion_topics.items():
         category_map['entries'][topic] = {"id": entry["id"],
                                           "sort_key": entry.get("sort_key", topic),
                                           "start_date": time.gmtime()}
@@ -246,7 +238,6 @@ def initialize_discussion_info(course):
     _DISCUSSIONINFO[course.id]['id_map'] = discussion_id_map
     _DISCUSSIONINFO[course.id]['category_map'] = category_map
     _DISCUSSIONINFO[course.id]['timestamp'] = datetime.now()
-    _DISCUSSIONINFO[course.id]['path_to_location'] = path_to_locations
 
 
 class JsonResponse(HttpResponse):
@@ -403,21 +394,8 @@ def get_courseware_context(content, course):
         location = id_map[id]["location"].url()
         title = id_map[id]["title"]
 
-        # cdodge: did we pre-compute, if so, then let's use that rather than recomputing
-        if 'path_to_location' in _DISCUSSIONINFO[course.id] and location in _DISCUSSIONINFO[course.id]['path_to_location']:
-            (course_id, chapter, section, position) = _DISCUSSIONINFO[course.id]['path_to_location'][location]
-        else:
-            try:
-                (course_id, chapter, section, position) = path_to_location(modulestore(), course.id, location)
-            except NoPathToItem:
-                # Object is not in the graph any longer, let's just get path to the base of the course
-                # so that we can at least return something to the caller
-                (course_id, chapter, section, position) = path_to_location(modulestore(), course.id, course.location)
-
-        url = reverse('courseware_position', kwargs={"course_id":course_id,
-                                                     "chapter":chapter,
-                                                     "section":section,
-                                                     "position":position})
+        url = reverse('jump_to', kwargs={"course_id":course.location.course_id, 
+                                                    "location": location})
 
         content_info = {"courseware_url": url, "courseware_title": title}
     return content_info
@@ -430,7 +408,7 @@ def safe_content(content):
         'updated_at', 'depth', 'type', 'commentable_id', 'comments_count',
         'at_position_list', 'children', 'highlighted_title', 'highlighted_body',
         'courseware_title', 'courseware_url', 'tags', 'unread_comments_count',
-        'read', 'group_id', 'group_name', 'group_string'
+        'read', 'group_id', 'group_name', 'group_string', 'pinned'
     ]
 
     if (content.get('anonymous') is False) and (content.get('anonymous_to_peers') is False):
diff --git a/lms/djangoapps/foldit/models.py b/lms/djangoapps/foldit/models.py
index 7041be1446..0dce956756 100644
--- a/lms/djangoapps/foldit/models.py
+++ b/lms/djangoapps/foldit/models.py
@@ -59,7 +59,7 @@ class Score(models.Model):
         scores = Score.objects \
             .filter(puzzle_id__in=puzzles) \
             .annotate(total_score=models.Sum('best_score')) \
-            .order_by('-total_score')[:n]
+            .order_by('total_score')[:n]
         num = len(puzzles)
 
         return [{'username': s.user.username,
diff --git a/lms/djangoapps/foldit/tests.py b/lms/djangoapps/foldit/tests.py
index 7127651601..afdd678f06 100644
--- a/lms/djangoapps/foldit/tests.py
+++ b/lms/djangoapps/foldit/tests.py
@@ -143,11 +143,12 @@ class FolditTestCase(TestCase):
     def test_SetPlayerPuzzleScores_manyplayers(self):
         """
         Check that when we send scores from multiple users, the correct order
-        of scores is displayed.
+        of scores is displayed. Note that, before being processed by
+        display_score, lower scores are better.
         """
         puzzle_id = ['1']
-        player1_score = 0.07
-        player2_score = 0.08
+        player1_score = 0.08
+        player2_score = 0.02
         response1 = self.make_puzzle_score_request(puzzle_id, player1_score,
                 self.user)
 
@@ -164,8 +165,12 @@ class FolditTestCase(TestCase):
         self.assertEqual(len(top_10), 2)
 
         # Top score should be player2_score. Second should be player1_score
-        self.assertEqual(top_10[0]['score'], Score.display_score(player2_score))
-        self.assertEqual(top_10[1]['score'], Score.display_score(player1_score))
+        self.assertAlmostEqual(top_10[0]['score'],
+                Score.display_score(player2_score),
+                delta=0.5)
+        self.assertAlmostEqual(top_10[1]['score'],
+                Score.display_score(player1_score),
+                delta=0.5)
 
         # Top score user should be self.user2.username
         self.assertEqual(top_10[0]['username'], self.user2.username)
diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 88a4bdbb2b..0be5724365 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -1,14 +1,16 @@
-# ======== Instructor views =============================================================================
-
+"""
+Instructor Views
+"""
 from collections import defaultdict
 import csv
-import itertools
 import json
 import logging
 import os
 import re
 import requests
+from requests.status_codes import codes
 import urllib
+from collections import OrderedDict
 import json
 
 from StringIO import StringIO
@@ -19,6 +21,7 @@ from django.http import HttpResponse
 from django_future.csrf import ensure_csrf_cookie
 from django.views.decorators.cache import cache_control
 from mitxmako.shortcuts import render_to_response
+import requests
 from django.core.urlresolvers import reverse
 
 from courseware import grades
@@ -88,7 +91,11 @@ def instructor_dashboard(request, course_id):
     data = [['# Enrolled', CourseEnrollment.objects.filter(course_id=course_id).count()]]
     data += compute_course_stats(course).items()
     if request.user.is_staff:
-        data.append(['metadata', escape(str(course.metadata))])
+        for field in course.fields:
+            data.append([field.name, json.dumps(field.read_json(course))])
+        for namespace in course.namespaces:
+            for field in getattr(course, namespace).fields:
+                data.append(["{}.{}".format(namespace, field.name), json.dumps(field.read_json(course))])
     datatable['data'] = data
 
     def return_csv(fn, datatable, fp=None):
@@ -136,7 +143,7 @@ def instructor_dashboard(request, course_id):
 
     if settings.MITX_FEATURES['ENABLE_MANUAL_GIT_RELOAD']:
         if 'GIT pull' in action:
-            data_dir = course.metadata['data_dir']
+            data_dir = getattr(course, 'data_dir')
             log.debug('git pull {0}'.format(data_dir))
             gdir = settings.DATA_DIR / data_dir
             if not os.path.exists(gdir):
@@ -150,7 +157,7 @@ def instructor_dashboard(request, course_id):
         if 'Reload course' in action:
             log.debug('reloading {0} ({1})'.format(course_id, course))
             try:
-                data_dir = course.metadata['data_dir']
+                data_dir = getattr(course, 'data_dir')
                 modulestore().try_load_course(data_dir)
                 msg += "<br/><p>Course reloaded from {0}</p>".format(data_dir)
                 track.views.server_track(request, 'reload {0}'.format(data_dir), {}, page='idashboard')
@@ -404,7 +411,7 @@ def instructor_dashboard(request, course_id):
         def getdat(u):
             p = u.profile
             return [u.username, u.email] + [getattr(p,x,'') for x in profkeys]
-        
+
         datatable['data'] = [getdat(u) for u in enrolled_students]
         datatable['title'] = 'Student profile data for course %s' % course_id
         return return_csv('profiledata_%s.csv' % course_id, datatable)
@@ -426,7 +433,7 @@ def instructor_dashboard(request, course_id):
             msg+="<font color='red'>Couldn't find module with that urlname.  </font>"
             msg += "<pre>%s</pre>" % escape(err)
             smdat = []
-        
+
         if smdat:
             datatable = {'header': ['username', 'state']}
             datatable['data'] = [ [x.student.username, x.state] for x in smdat ]
@@ -587,6 +594,46 @@ def instructor_dashboard(request, course_id):
     if idash_mode == 'Psychometrics':
         problems = psychoanalyze.problems_with_psychometric_data(course_id)
 
+    #----------------------------------------
+    # analytics
+    def get_analytics_result(analytics_name):
+        """Return data for an Analytic piece, or None if it doesn't exist. It
+        logs and swallows errors.
+        """
+        url = settings.ANALYTICS_SERVER_URL + \
+              "get?aname={}&course_id={}&apikey={}".format(analytics_name,
+                                                           course_id,
+                                                           settings.ANALYTICS_API_KEY)
+        try:
+            res = requests.get(url)
+        except Exception:
+            log.exception("Error trying to access analytics at %s", url)
+            return None
+
+        if res.status_code == codes.OK:
+            # WARNING: do not use req.json because the preloaded json doesn't
+            # preserve the order of the original record (hence OrderedDict).
+            return json.loads(res.content, object_pairs_hook=OrderedDict)
+        else:
+            log.error("Error fetching %s, code: %s, msg: %s",
+                      url, res.status_code, res.content)
+        return None
+
+    analytics_results = {}
+
+    if idash_mode == 'Analytics':
+        DASHBOARD_ANALYTICS = [
+            # "StudentsAttemptedProblems",  # num students who tried given problem
+            "StudentsDailyActivity",  # active students by day
+            "StudentsDropoffPerDay",  # active students dropoff by day
+            # "OverallGradeDistribution",  # overall point distribution for course
+            "StudentsActive",  # num students active in time period (default = 1wk)
+            "StudentsEnrolled",  # num students enrolled
+            # "StudentsPerProblemCorrect",  # foreach problem, num students correct
+            "ProblemGradeDistribution",  # foreach problem, grade distribution
+        ]
+        for analytic_name in DASHBOARD_ANALYTICS:
+            analytics_results[analytic_name] = get_analytics_result(analytic_name)
 
     #----------------------------------------
     # offline grades?
@@ -608,11 +655,14 @@ def instructor_dashboard(request, course_id):
                'problems': problems,		# psychometrics
                'plots': plots,			# psychometrics
                'course_errors': modulestore().get_item_errors(course.location),
+
                'djangopid': os.getpid(),
                'mitx_version': getattr(settings, 'MITX_VERSION_STRING', ''),
                'offline_grade_log': offline_grades_available(course_id),
                'cohorts_ajax_url': reverse('cohorts', kwargs={'course_id': course_id}),
-               }
+
+               'analytics_results': analytics_results,
+            }
 
     return render_to_response('courseware/instructor_dashboard.html', context)
 
@@ -621,7 +671,7 @@ def _do_remote_gradebook(user, course, action, args=None, files=None):
     '''
     Perform remote gradebook action.  Returns msg, datatable.
     '''
-    rg = course.metadata.get('remote_gradebook', '')
+    rg = course.remote_gradebook
     if not rg:
         msg = "No remote gradebook defined in course metadata"
         return msg, {}
diff --git a/lms/djangoapps/licenses/tests.py b/lms/djangoapps/licenses/tests.py
index 9f4e0e3e4f..232c853b62 100644
--- a/lms/djangoapps/licenses/tests.py
+++ b/lms/djangoapps/licenses/tests.py
@@ -6,7 +6,7 @@ from tempfile import NamedTemporaryFile
 from django.test import TestCase
 from django.core.management import call_command
 
-from models import CourseSoftware, UserLicense
+from .models import CourseSoftware, UserLicense
 
 COURSE_1 = 'edX/toy/2012_Fall'
 
diff --git a/lms/djangoapps/licenses/views.py b/lms/djangoapps/licenses/views.py
index 7d804fbd3d..20966427ba 100644
--- a/lms/djangoapps/licenses/views.py
+++ b/lms/djangoapps/licenses/views.py
@@ -11,8 +11,8 @@ from django.contrib.auth.models import User
 from django.http import HttpResponse, Http404
 from django.views.decorators.csrf import requires_csrf_token, csrf_protect
 
-from models import CourseSoftware
-from models import get_courses_licenses, get_or_create_license, get_license
+from .models import CourseSoftware
+from .models import get_courses_licenses, get_or_create_license, get_license
 
 
 log = logging.getLogger("mitx.licenses")
diff --git a/lms/djangoapps/lms_migration/migrate.py b/lms/djangoapps/lms_migration/migrate.py
index 9cdc783bb9..569129f469 100644
--- a/lms/djangoapps/lms_migration/migrate.py
+++ b/lms/djangoapps/lms_migration/migrate.py
@@ -128,7 +128,7 @@ def manage_modulestores(request, reload_dir=None, commit_id=None):
 
     for cdir, course in def_ms.courses.items():
         html += '<hr width="100%"/>'
-        html += '<h2>Course: %s (%s)</h2>' % (course.display_name, cdir)
+        html += '<h2>Course: %s (%s)</h2>' % (course.display_name_with_default, cdir)
 
         html += '<p>commit_id=%s</p>' % get_commit_id(course)
 
diff --git a/lms/djangoapps/open_ended_grading/open_ended_notifications.py b/lms/djangoapps/open_ended_grading/open_ended_notifications.py
index b4ca20079f..6d5f2a3eb4 100644
--- a/lms/djangoapps/open_ended_grading/open_ended_notifications.py
+++ b/lms/djangoapps/open_ended_grading/open_ended_notifications.py
@@ -1,6 +1,6 @@
 from django.conf import settings
 from xmodule.open_ended_grading_classes import peer_grading_service
-from staff_grading_service import StaffGradingService
+from .staff_grading_service import StaffGradingService
 from xmodule.open_ended_grading_classes.controller_query_service import ControllerQueryService
 import json
 from student.models import unique_id_for_user
@@ -22,7 +22,7 @@ NOTIFICATION_TYPES = (
     ('staff_needs_to_grade', 'staff_grading', 'Staff Grading'),
     ('new_student_grading_to_view', 'open_ended_problems', 'Problems you have submitted'),
     ('flagged_submissions_exist', 'open_ended_flagged_problems', 'Flagged Submissions')
-    )
+)
 
 
 def staff_grading_notifications(course, user):
@@ -46,7 +46,9 @@ def staff_grading_notifications(course, user):
         #Non catastrophic error, so no real action
         notifications = {}
         #This is a dev_facing_error
-        log.info("Problem with getting notifications from staff grading service for course {0} user {1}.".format(course_id, student_id))
+        log.info(
+            "Problem with getting notifications from staff grading service for course {0} user {1}.".format(course_id,
+                                                                                                            student_id))
 
     if pending_grading:
         img_path = "/static/images/grading_notification.png"
@@ -59,7 +61,14 @@ def staff_grading_notifications(course, user):
 
 
 def peer_grading_notifications(course, user):
-    system = ModuleSystem(None, None, None, render_to_string, None)
+    system = ModuleSystem(
+        ajax_url=None,
+        track_function=None,
+        get_module = None,
+        render_template=render_to_string,
+        replace_urls=None,
+        xblock_model_data= {}
+    )
     peer_gs = peer_grading_service.PeerGradingService(settings.OPEN_ENDED_GRADING_INTERFACE, system)
     pending_grading = False
     img_path = ""
@@ -80,7 +89,9 @@ def peer_grading_notifications(course, user):
         #Non catastrophic error, so no real action
         notifications = {}
         #This is a dev_facing_error
-        log.info("Problem with getting notifications from peer grading service for course {0} user {1}.".format(course_id, student_id))
+        log.info(
+            "Problem with getting notifications from peer grading service for course {0} user {1}.".format(course_id,
+                                                                                                           student_id))
 
     if pending_grading:
         img_path = "/static/images/grading_notification.png"
@@ -93,7 +104,14 @@ def peer_grading_notifications(course, user):
 
 
 def combined_notifications(course, user):
-    system = ModuleSystem(None, None, None, render_to_string, None)
+    system = ModuleSystem(
+        ajax_url=None,
+        track_function=None,
+        get_module = None,
+        render_template=render_to_string,
+        replace_urls=None,
+        xblock_model_data= {}
+    )
     controller_qs = ControllerQueryService(settings.OPEN_ENDED_GRADING_INTERFACE, system)
     student_id = unique_id_for_user(user)
     user_is_staff = has_access(user, course, 'staff')
@@ -105,7 +123,9 @@ def combined_notifications(course, user):
         return notification_dict
 
     min_time_to_query = user.last_login
-    last_module_seen = StudentModule.objects.filter(student=user, course_id=course_id, modified__gt=min_time_to_query).values('modified').order_by('-modified')
+    last_module_seen = StudentModule.objects.filter(student=user, course_id=course_id,
+                                                    modified__gt=min_time_to_query).values('modified').order_by(
+        '-modified')
     last_module_seen_count = last_module_seen.count()
 
     if last_module_seen_count > 0:
@@ -117,7 +137,8 @@ def combined_notifications(course, user):
 
     img_path = ""
     try:
-        controller_response = controller_qs.check_combined_notifications(course.id, student_id, user_is_staff, last_time_viewed)
+        controller_response = controller_qs.check_combined_notifications(course.id, student_id, user_is_staff,
+                                                                         last_time_viewed)
         log.debug(controller_response)
         notifications = json.loads(controller_response)
         if notifications['success']:
@@ -127,7 +148,9 @@ def combined_notifications(course, user):
         #Non catastrophic error, so no real action
         notifications = {}
         #This is a dev_facing_error
-        log.exception("Problem with getting notifications from controller query service for course {0} user {1}.".format(course_id, student_id))
+        log.exception(
+            "Problem with getting notifications from controller query service for course {0} user {1}.".format(
+                course_id, student_id))
 
     if pending_grading:
         img_path = "/static/images/grading_notification.png"
@@ -151,7 +174,8 @@ def set_value_in_cache(student_id, course_id, notification_type, value):
 
 
 def create_key_name(student_id, course_id, notification_type):
-    key_name = "{prefix}{type}_{course}_{student}".format(prefix=KEY_PREFIX, type=notification_type, course=course_id, student=student_id)
+    key_name = "{prefix}{type}_{course}_{student}".format(prefix=KEY_PREFIX, type=notification_type, course=course_id,
+                                                          student=student_id)
     return key_name
 
 
diff --git a/lms/djangoapps/open_ended_grading/staff_grading.py b/lms/djangoapps/open_ended_grading/staff_grading.py
index e39b26da56..fad5268294 100644
--- a/lms/djangoapps/open_ended_grading/staff_grading.py
+++ b/lms/djangoapps/open_ended_grading/staff_grading.py
@@ -15,6 +15,7 @@ class StaffGrading(object):
     """
     Wrap up functionality for staff grading of submissions--interface exposes get_html, ajax views.
     """
+
     def __init__(self, course):
         self.course = course
 
diff --git a/lms/djangoapps/open_ended_grading/staff_grading_service.py b/lms/djangoapps/open_ended_grading/staff_grading_service.py
index 79b92dffba..57bfd7df42 100644
--- a/lms/djangoapps/open_ended_grading/staff_grading_service.py
+++ b/lms/djangoapps/open_ended_grading/staff_grading_service.py
@@ -20,10 +20,12 @@ log = logging.getLogger(__name__)
 
 STAFF_ERROR_MESSAGE = 'Could not contact the external grading server.  Please contact the development team.  If you do not have a point of contact, you can contact Vik at vik@edx.org.'
 
+
 class MockStaffGradingService(object):
     """
     A simple mockup of a staff grading service, testing.
     """
+
     def __init__(self):
         self.cnt = 0
 
@@ -43,15 +45,18 @@ class MockStaffGradingService(object):
     def get_problem_list(self, course_id, grader_id):
         self.cnt += 1
         return json.dumps({'success': True,
-        'problem_list': [
-          json.dumps({'location': 'i4x://MITx/3.091x/problem/open_ended_demo1', 
-            'problem_name': "Problem 1", 'num_graded': 3, 'num_pending': 5, 'min_for_ml': 10}),
-          json.dumps({'location': 'i4x://MITx/3.091x/problem/open_ended_demo2',
-            'problem_name': "Problem 2", 'num_graded': 1, 'num_pending': 5, 'min_for_ml': 10})
-        ]})
+                           'problem_list': [
+                               json.dumps({'location': 'i4x://MITx/3.091x/problem/open_ended_demo1',
+                                           'problem_name': "Problem 1", 'num_graded': 3, 'num_pending': 5,
+                                           'min_for_ml': 10}),
+                               json.dumps({'location': 'i4x://MITx/3.091x/problem/open_ended_demo2',
+                                           'problem_name': "Problem 2", 'num_graded': 1, 'num_pending': 5,
+                                           'min_for_ml': 10})
+                           ]})
 
 
-    def save_grade(self, course_id, grader_id, submission_id, score, feedback, skipped, rubric_scores, submission_flagged):
+    def save_grade(self, course_id, grader_id, submission_id, score, feedback, skipped, rubric_scores,
+                   submission_flagged):
         return self.get_next(course_id, 'fake location', grader_id)
 
 
@@ -59,8 +64,16 @@ class StaffGradingService(GradingService):
     """
     Interface to staff grading backend.
     """
+
     def __init__(self, config):
-        config['system'] = ModuleSystem(None, None, None, render_to_string, None)
+        config['system'] = ModuleSystem(
+            ajax_url=None,
+            track_function=None,
+            get_module = None,
+            render_template=render_to_string,
+            replace_urls=None,
+            xblock_model_data= {}
+        )
         super(StaffGradingService, self).__init__(config)
         self.url = config['url'] + config['staff_grading']
         self.login_url = self.url + '/login/'
@@ -109,12 +122,13 @@ class StaffGradingService(GradingService):
             GradingServiceError: something went wrong with the connection.
         """
         response = self.get(self.get_next_url,
-                                      params={'location': location,
-                                              'grader_id': grader_id})
+                            params={'location': location,
+                                    'grader_id': grader_id})
         return json.dumps(self._render_rubric(response))
 
 
-    def save_grade(self, course_id, grader_id, submission_id, score, feedback, skipped, rubric_scores, submission_flagged):
+    def save_grade(self, course_id, grader_id, submission_id, score, feedback, skipped, rubric_scores,
+                   submission_flagged):
         """
         Save a score and feedback for a submission.
 
@@ -253,14 +267,14 @@ def get_problem_list(request, course_id):
     try:
         response = staff_grading_service().get_problem_list(course_id, unique_id_for_user(request.user))
         return HttpResponse(response,
-                mimetype="application/json")
+                            mimetype="application/json")
     except GradingServiceError:
         #This is a dev_facing_error
         log.exception("Error from staff grading service in open ended grading.  server url: {0}"
-                      .format(staff_grading_service().url))
+        .format(staff_grading_service().url))
         #This is a staff_facing_error
         return HttpResponse(json.dumps({'success': False,
-                           'error': STAFF_ERROR_MESSAGE}))
+                                        'error': STAFF_ERROR_MESSAGE}))
 
 
 def _get_next(course_id, grader_id, location):
@@ -272,7 +286,7 @@ def _get_next(course_id, grader_id, location):
     except GradingServiceError:
         #This is a dev facing error
         log.exception("Error from staff grading service in open ended grading.  server url: {0}"
-                      .format(staff_grading_service().url))
+        .format(staff_grading_service().url))
         #This is a staff_facing_error
         return json.dumps({'success': False,
                            'error': STAFF_ERROR_MESSAGE})
@@ -297,7 +311,7 @@ def save_grade(request, course_id):
     if request.method != 'POST':
         raise Http404
 
-    required = set(['score', 'feedback', 'submission_id', 'location','submission_flagged', 'rubric_scores[]'])
+    required = set(['score', 'feedback', 'submission_id', 'location', 'submission_flagged', 'rubric_scores[]'])
     actual = set(request.POST.keys())
     missing = required - actual
     if len(missing) > 0:
@@ -307,22 +321,23 @@ def save_grade(request, course_id):
     grader_id = unique_id_for_user(request.user)
     p = request.POST
 
-
     location = p['location']
-    skipped =  'skipped' in p
+    skipped = 'skipped' in p
 
     try:
         result_json = staff_grading_service().save_grade(course_id,
-                                          grader_id,
-                                          p['submission_id'],
-                                          p['score'],
-                                          p['feedback'],
-                                          skipped,
-                                          p.getlist('rubric_scores[]'),
-                                          p['submission_flagged'])
+                                                         grader_id,
+                                                         p['submission_id'],
+                                                         p['score'],
+                                                         p['feedback'],
+                                                         skipped,
+                                                         p.getlist('rubric_scores[]'),
+                                                         p['submission_flagged'])
     except GradingServiceError:
         #This is a dev_facing_error
-        log.exception("Error saving grade in the staff grading interface in open ended grading.  Request: {0} Course ID: {1}".format(request, course_id))
+        log.exception(
+            "Error saving grade in the staff grading interface in open ended grading.  Request: {0} Course ID: {1}".format(
+                request, course_id))
         #This is a staff_facing_error
         return _err_response(STAFF_ERROR_MESSAGE)
 
@@ -330,13 +345,16 @@ def save_grade(request, course_id):
         result = json.loads(result_json)
     except ValueError:
         #This is a dev_facing_error
-        log.exception("save_grade returned broken json in the staff grading interface in open ended grading: {0}".format(result_json))
+        log.exception(
+            "save_grade returned broken json in the staff grading interface in open ended grading: {0}".format(
+                result_json))
         #This is a staff_facing_error
         return _err_response(STAFF_ERROR_MESSAGE)
 
     if not result.get('success', False):
         #This is a dev_facing_error
-        log.warning('Got success=False from staff grading service in open ended grading.  Response: {0}'.format(result_json))
+        log.warning(
+            'Got success=False from staff grading service in open ended grading.  Response: {0}'.format(result_json))
         return _err_response(STAFF_ERROR_MESSAGE)
 
     # Ok, save_grade seemed to work.  Get the next submission to grade.
diff --git a/lms/djangoapps/open_ended_grading/tests.py b/lms/djangoapps/open_ended_grading/tests.py
index d452883ebb..1fd871d0cd 100644
--- a/lms/djangoapps/open_ended_grading/tests.py
+++ b/lms/djangoapps/open_ended_grading/tests.py
@@ -7,7 +7,7 @@ django-admin.py test --settings=lms.envs.test --pythonpath=. lms/djangoapps/open
 from django.test import TestCase
 from open_ended_grading import staff_grading_service
 from xmodule.open_ended_grading_classes import peer_grading_service
-from xmodule import  peer_grading_module
+from xmodule import peer_grading_module
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import Group
 
@@ -22,6 +22,7 @@ from xmodule.x_module import ModuleSystem
 from mitxmako.shortcuts import render_to_string
 
 import logging
+
 log = logging.getLogger(__name__)
 from django.test.utils import override_settings
 from django.http import QueryDict
@@ -36,6 +37,7 @@ class TestStaffGradingService(ct.PageLoader):
     access control and error handling logic -- all the actual work is on the
     backend.
     '''
+
     def setUp(self):
         xmodule.modulestore.django._MODULESTORES = {}
 
@@ -50,6 +52,7 @@ class TestStaffGradingService(ct.PageLoader):
 
         self.course_id = "edX/toy/2012_Fall"
         self.toy = modulestore().get_course(self.course_id)
+
         def make_instructor(course):
             group_name = _course_staff_group_name(course.location)
             g = Group.objects.create(name=group_name)
@@ -130,6 +133,7 @@ class TestPeerGradingService(ct.PageLoader):
     access control and error handling logic -- all the actual work is on the
     backend.
     '''
+
     def setUp(self):
         xmodule.modulestore.django._MODULESTORES = {}
 
@@ -145,14 +149,21 @@ class TestPeerGradingService(ct.PageLoader):
         self.course_id = "edX/toy/2012_Fall"
         self.toy = modulestore().get_course(self.course_id)
         location = "i4x://edX/toy/peergrading/init"
-
+        model_data = {'data': "<peergrading/>"}
         self.mock_service = peer_grading_service.MockPeerGradingService()
-        self.system = ModuleSystem(location, None, None, render_to_string, None,
-            s3_interface = test_util_open_ended.S3_INTERFACE,
+        self.system = ModuleSystem(
+            ajax_url=location,
+            track_function=None,
+            get_module=None,
+            render_template=render_to_string,
+            replace_urls=None,
+            xblock_model_data={},
+            s3_interface=test_util_open_ended.S3_INTERFACE,
             open_ended_grading_interface=test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE
         )
-        self.descriptor = peer_grading_module.PeerGradingDescriptor(self.system)
-        self.peer_module = peer_grading_module.PeerGradingModule(self.system, location, "<peergrading/>", self.descriptor)
+        self.descriptor = peer_grading_module.PeerGradingDescriptor(self.system, location, model_data)
+        model_data = {}
+        self.peer_module = peer_grading_module.PeerGradingModule(self.system, location, self.descriptor, model_data)
         self.peer_module.peer_gs = self.mock_service
         self.logout()
 
@@ -175,18 +186,20 @@ class TestPeerGradingService(ct.PageLoader):
 
     def test_save_grade_success(self):
         data = {
-                'rubric_scores[]': [0, 0],
-                'location': self.location,
-                'submission_id': 1,
-                'submission_key': 'fake key',
-                'score': 2,
-                'feedback': 'feedback',
-                'submission_flagged': 'false'
-                }
+            'rubric_scores[]': [0, 0],
+            'location': self.location,
+            'submission_id': 1,
+            'submission_key': 'fake key',
+            'score': 2,
+            'feedback': 'feedback',
+            'submission_flagged': 'false'
+        }
 
         qdict = MagicMock()
+
         def fake_get_item(key):
             return data[key]
+
         qdict.__getitem__.side_effect = fake_get_item
         qdict.getlist = fake_get_item
         qdict.keys = data.keys
@@ -237,18 +250,20 @@ class TestPeerGradingService(ct.PageLoader):
 
     def test_save_calibration_essay_success(self):
         data = {
-                'rubric_scores[]': [0, 0],
-                'location': self.location,
-                'submission_id': 1,
-                'submission_key': 'fake key',
-                'score': 2,
-                'feedback': 'feedback',
-                'submission_flagged': 'false'
-                }
+            'rubric_scores[]': [0, 0],
+            'location': self.location,
+            'submission_id': 1,
+            'submission_key': 'fake key',
+            'score': 2,
+            'feedback': 'feedback',
+            'submission_flagged': 'false'
+        }
 
         qdict = MagicMock()
+
         def fake_get_item(key):
             return data[key]
+
         qdict.__getitem__.side_effect = fake_get_item
         qdict.getlist = fake_get_item
         qdict.keys = data.keys
diff --git a/lms/djangoapps/open_ended_grading/views.py b/lms/djangoapps/open_ended_grading/views.py
index 55e8088c3f..65cfe22ed0 100644
--- a/lms/djangoapps/open_ended_grading/views.py
+++ b/lms/djangoapps/open_ended_grading/views.py
@@ -29,7 +29,14 @@ log = logging.getLogger(__name__)
 
 template_imports = {'urllib': urllib}
 
-system = ModuleSystem(None, None, None, render_to_string, None)
+system = ModuleSystem(
+    ajax_url=None,
+    track_function=None,
+    get_module = None,
+    render_template=render_to_string,
+    replace_urls = None,
+    xblock_model_data= {}
+)
 controller_qs = ControllerQueryService(settings.OPEN_ENDED_GRADING_INTERFACE, system)
 
 """
@@ -50,22 +57,24 @@ def _reverse_without_slash(url_name, course_id):
     ajax_url = reverse(url_name, kwargs={'course_id': course_id})
     return ajax_url
 
+
 DESCRIPTION_DICT = {
-            'Peer Grading': "View all problems that require peer assessment in this particular course.",
-            'Staff Grading': "View ungraded submissions submitted by students for the open ended problems in the course.",
-            'Problems you have submitted': "View open ended problems that you have previously submitted for grading.",
-            'Flagged Submissions': "View submissions that have been flagged by students as inappropriate."
-    }
+    'Peer Grading': "View all problems that require peer assessment in this particular course.",
+    'Staff Grading': "View ungraded submissions submitted by students for the open ended problems in the course.",
+    'Problems you have submitted': "View open ended problems that you have previously submitted for grading.",
+    'Flagged Submissions': "View submissions that have been flagged by students as inappropriate."
+}
 ALERT_DICT = {
-            'Peer Grading': "New submissions to grade",
-            'Staff Grading': "New submissions to grade",
-            'Problems you have submitted': "New grades have been returned",
-            'Flagged Submissions': "Submissions have been flagged for review"
-    }
+    'Peer Grading': "New submissions to grade",
+    'Staff Grading': "New submissions to grade",
+    'Problems you have submitted': "New grades have been returned",
+    'Flagged Submissions': "Submissions have been flagged for review"
+}
 
 STUDENT_ERROR_MESSAGE = "Error occured while contacting the grading service.  Please notify course staff."
 STAFF_ERROR_MESSAGE = "Error occured while contacting the grading service.  Please notify the development team.  If you do not have a point of contact, please email Vik at vik@edx.org"
 
+
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 def staff_grading(request, course_id):
     """
@@ -92,10 +101,10 @@ def peer_grading(request, course_id):
     #Get the current course
     course = get_course_with_access(request.user, course_id, 'load')
     course_id_parts = course.id.split("/")
-    false_dict = [False,"False", "false", "FALSE"]
+    false_dict = [False, "False", "false", "FALSE"]
 
     #Reverse the base course url
-    base_course_url  = reverse('courses')
+    base_course_url = reverse('courses')
     try:
         #TODO:  This will not work with multiple runs of a course.  Make it work.  The last key in the Location passed
         #to get_items is called revision.  Is this the same as run?
@@ -147,7 +156,7 @@ def student_problem_list(request, course_id):
     success = False
     error_text = ""
     problem_list = []
-    base_course_url  = reverse('courses')
+    base_course_url = reverse('courses')
 
     try:
         problem_list_json = controller_qs.get_grading_status_list(course_id, unique_id_for_user(request.user))
@@ -174,7 +183,7 @@ def student_problem_list(request, course_id):
                 except:
                     #This is a student_facing_error
                     eta_string = "Error getting ETA."
-            problem_list[i].update({'eta_string' : eta_string})
+            problem_list[i].update({'eta_string': eta_string})
 
     except GradingServiceError:
         #This is a student_facing_error
@@ -215,7 +224,7 @@ def flagged_problem_list(request, course_id):
     success = False
     error_text = ""
     problem_list = []
-    base_course_url  = reverse('courses')
+    base_course_url = reverse('courses')
 
     try:
         problem_list_json = controller_qs.get_flagged_problem_list(course_id)
@@ -243,14 +252,14 @@ def flagged_problem_list(request, course_id):
 
     ajax_url = _reverse_with_slash('open_ended_flagged_problems', course_id)
     context = {
-            'course': course,
-            'course_id': course_id,
-            'ajax_url': ajax_url,
-            'success': success,
-            'problem_list': problem_list,
-            'error_text': error_text,
-            # Checked above
-            'staff_access': True,
+        'course': course,
+        'course_id': course_id,
+        'ajax_url': ajax_url,
+        'success': success,
+        'problem_list': problem_list,
+        'error_text': error_text,
+        # Checked above
+        'staff_access': True,
     }
     return render_to_response('open_ended_problems/open_ended_flagged_problems.html', context)
 
@@ -305,7 +314,7 @@ def combined_notifications(request, course_id):
     }
 
     return render_to_response('open_ended_problems/combined_notifications.html',
-        combined_dict
+                              combined_dict
     )
 
 
@@ -318,13 +327,14 @@ def take_action_on_flags(request, course_id):
     if request.method != 'POST':
         raise Http404
 
-
     required = ['submission_id', 'action_type', 'student_id']
     for key in required:
         if key not in request.POST:
             #This is a staff_facing_error
-            return HttpResponse(json.dumps({'success': False, 'error': STAFF_ERROR_MESSAGE + 'Missing key {0} from submission.  Please reload and try again.'.format(key)}),
-                mimetype="application/json")
+            return HttpResponse(json.dumps({'success': False,
+                                            'error': STAFF_ERROR_MESSAGE + 'Missing key {0} from submission.  Please reload and try again.'.format(
+                                                key)}),
+                                mimetype="application/json")
 
     p = request.POST
     submission_id = p['submission_id']
@@ -338,5 +348,7 @@ def take_action_on_flags(request, course_id):
         return HttpResponse(response, mimetype="application/json")
     except GradingServiceError:
         #This is a dev_facing_error
-        log.exception("Error taking action on flagged peer grading submissions, submission_id: {0}, action_type: {1}, grader_id: {2}".format(submission_id, action_type, grader_id))
+        log.exception(
+            "Error taking action on flagged peer grading submissions, submission_id: {0}, action_type: {1}, grader_id: {2}".format(
+                submission_id, action_type, grader_id))
         return _err_response(STAFF_ERROR_MESSAGE)
diff --git a/lms/djangoapps/psychometrics/psychoanalyze.py b/lms/djangoapps/psychometrics/psychoanalyze.py
index 28a5c4437c..3e9edcc997 100644
--- a/lms/djangoapps/psychometrics/psychoanalyze.py
+++ b/lms/djangoapps/psychometrics/psychoanalyze.py
@@ -297,12 +297,18 @@ def generate_plots_for_problem(problem):
 #-----------------------------------------------------------------------------
 
 
-def make_psychometrics_data_update_handler(studentmodule):
+def make_psychometrics_data_update_handler(course_id, user, module_state_key):
     """
     Construct and return a procedure which may be called to update
     the PsychometricsData instance for the given StudentModule instance.
     """
-    sm = studentmodule
+    sm = studentmodule.objects.get_or_create(
+        course_id=course_id,
+        student=user,
+        module_state_key=module_state_key,
+        defaults={'state': '{}', 'module_type': 'problem'},
+    )
+
     try:
         pmd = PsychometricData.objects.using(db).get(studentmodule=sm)
     except PsychometricData.DoesNotExist:
diff --git a/lms/djangoapps/simplewiki/admin.py b/lms/djangoapps/simplewiki/admin.py
index e4cf8c2f56..2ba6405956 100644
--- a/lms/djangoapps/simplewiki/admin.py
+++ b/lms/djangoapps/simplewiki/admin.py
@@ -4,7 +4,7 @@ from django import forms
 from django.contrib import admin
 from django.utils.translation import ugettext as _
 
-from models import Article, Revision, Permission, ArticleAttachment
+from .models import Article, Revision, Permission, ArticleAttachment
 
 
 class RevisionInline(admin.TabularInline):
diff --git a/lms/djangoapps/simplewiki/models.py b/lms/djangoapps/simplewiki/models.py
index 68da6a0d71..75cdb8aa7a 100644
--- a/lms/djangoapps/simplewiki/models.py
+++ b/lms/djangoapps/simplewiki/models.py
@@ -9,7 +9,7 @@ from django.db.models import signals
 from django.utils.translation import ugettext_lazy as _
 from markdown import markdown
 
-from wiki_settings import *
+from .wiki_settings import *
 from util.cache import cache
 
 
diff --git a/lms/djangoapps/simplewiki/views.py b/lms/djangoapps/simplewiki/views.py
index 445b0418fc..a84fac6e7d 100644
--- a/lms/djangoapps/simplewiki/views.py
+++ b/lms/djangoapps/simplewiki/views.py
@@ -14,7 +14,7 @@ from courseware.access import has_access
 from xmodule.course_module import CourseDescriptor
 from xmodule.modulestore.django import modulestore
 
-from models import Revision, Article, Namespace, CreateArticleForm, RevisionFormWithTitle, RevisionForm
+from .models import Revision, Article, Namespace, CreateArticleForm, RevisionFormWithTitle, RevisionForm
 import wiki_settings
 
 
diff --git a/lms/djangoapps/staticbook/views.py b/lms/djangoapps/staticbook/views.py
index a391b1cb32..aa1ba68d72 100644
--- a/lms/djangoapps/staticbook/views.py
+++ b/lms/djangoapps/staticbook/views.py
@@ -1,7 +1,7 @@
 from lxml import etree
 
-# from django.conf import settings
 from django.contrib.auth.decorators import login_required
+from django.http import Http404
 from mitxmako.shortcuts import render_to_response
 
 from courseware.access import has_access
@@ -15,6 +15,8 @@ def index(request, course_id, book_index, page=None):
     staff_access = has_access(request.user, course, 'staff')
 
     book_index = int(book_index)
+    if book_index < 0 or book_index >= len(course.textbooks):
+        raise Http404("Invalid book index value: {0}".format(book_index))
     textbook = course.textbooks[book_index]
     table_of_contents = textbook.table_of_contents
 
@@ -40,13 +42,15 @@ def pdf_index(request, course_id, book_index, chapter=None, page=None):
     staff_access = has_access(request.user, course, 'staff')
 
     book_index = int(book_index)
+    if book_index < 0 or book_index >= len(course.pdf_textbooks):
+        raise Http404("Invalid book index value: {0}".format(book_index))
     textbook = course.pdf_textbooks[book_index]
 
     def remap_static_url(original_url, course):
         input_url = "'" + original_url + "'"
         output_url = replace_static_urls(
                     input_url,
-                    course.metadata['data_dir'],
+                    getattr(course, 'data_dir', None),
                     course_namespace=course.location
                 )
         # strip off the quotes again...
@@ -57,13 +61,49 @@ def pdf_index(request, course_id, book_index, chapter=None, page=None):
     # then remap all the chapter URLs as well, if they are provided.
     if 'chapters' in textbook:
         for entry in textbook['chapters']:
-            entry['url'] = remap_static_url(entry['url'], course)            
+            entry['url'] = remap_static_url(entry['url'], course)
 
 
     return render_to_response('static_pdfbook.html',
-                              {'book_index': book_index, 
-                               'course': course, 
+                              {'book_index': book_index,
+                               'course': course,
                                'textbook': textbook,
                                'chapter': chapter,
                                'page': page,
                                'staff_access': staff_access})
+
+@login_required
+def html_index(request, course_id, book_index, chapter=None, anchor_id=None):
+    course = get_course_with_access(request.user, course_id, 'load')
+    staff_access = has_access(request.user, course, 'staff')
+
+    book_index = int(book_index)
+    if book_index < 0 or book_index >= len(course.html_textbooks):
+        raise Http404("Invalid book index value: {0}".format(book_index))
+    textbook = course.html_textbooks[book_index]
+
+    def remap_static_url(original_url, course):
+        input_url = "'" + original_url + "'"
+        output_url = replace_static_urls(
+                    input_url,
+                    getattr(course, 'data_dir', None),
+                    course_namespace=course.location
+                )
+        # strip off the quotes again...
+        return output_url[1:-1]
+
+    if 'url' in textbook:
+        textbook['url'] = remap_static_url(textbook['url'], course)
+    # then remap all the chapter URLs as well, if they are provided.
+    if 'chapters' in textbook:
+        for entry in textbook['chapters']:
+            entry['url'] = remap_static_url(entry['url'], course)
+
+
+    return render_to_response('static_htmlbook.html',
+                              {'book_index': book_index,
+                               'course': course,
+                               'textbook': textbook,
+                               'chapter': chapter,
+                               'anchor_id': anchor_id,
+                               'staff_access': staff_access})
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 9089bc92ed..cc9247b876 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -110,3 +110,7 @@ PEARSON = AUTH_TOKENS.get("PEARSON")
 
 # Datadog for events!
 DATADOG_API = AUTH_TOKENS.get("DATADOG_API")
+
+# Analytics dashboard server
+ANALYTICS_SERVER_URL = ENV_TOKENS.get("ANALYTICS_SERVER_URL")
+ANALYTICS_API_KEY = AUTH_TOKENS.get("ANALYTICS_API_KEY", "")
diff --git a/lms/envs/common.py b/lms/envs/common.py
index e33e37367a..cfd6fc34de 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -81,10 +81,13 @@ MITX_FEATURES = {
     'AUTH_USE_MIT_CERTIFICATES': False,
     'AUTH_USE_OPENID_PROVIDER': False,
 
+    # analytics experiments
+    'ENABLE_INSTRUCTOR_ANALYTICS': False,
+
     # Flip to True when the YouTube iframe API breaks (again)
     'USE_YOUTUBE_OBJECT_API': False,
 
-    # Give a UI to show a student's submission history in a problem by the 
+    # Give a UI to show a student's submission history in a problem by the
     # Staff Debug tool.
     'ENABLE_STUDENT_HISTORY_VIEW': True
 }
@@ -210,8 +213,8 @@ WIKI_ENABLED = False
 ###
 
 COURSE_DEFAULT = '6.002x_Fall_2012'
-COURSE_SETTINGS =  {'6.002x_Fall_2012': {'number' : '6.002x',
-                                          'title'  :  'Circuits and Electronics',
+COURSE_SETTINGS =  {'6.002x_Fall_2012': {'number': '6.002x',
+                                          'title': 'Circuits and Electronics',
                                           'xmlpath': '6002x/',
                                           'location': 'i4x://edx/6002xs12/course/6.002x_Fall_2012',
                                           }
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 6ecbbb0f85..f204dc287b 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -21,6 +21,8 @@ MITX_FEATURES['SUBDOMAIN_BRANDING'] = True
 MITX_FEATURES['FORCE_UNIVERSITY_DOMAIN'] = None		# show all university courses if in dev (ie don't use HTTP_HOST)
 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
+
 
 
 WIKI_ENABLED = True
@@ -57,6 +59,13 @@ CACHES = {
         'KEY_PREFIX': 'general',
         'VERSION': 4,
         'KEY_FUNCTION': 'util.memcache.safe_key',
+    },
+
+    'mongo_metadata_inheritance': {
+        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+        'LOCATION': '/var/tmp/mongo_metadata_inheritance',
+        'TIMEOUT': 300,
+        'KEY_FUNCTION': 'util.memcache.safe_key',
     }
 }
 
@@ -215,3 +224,8 @@ PIPELINE_SASS_ARGUMENTS = '-r {proj_dir}/static/sass/bourbon/lib/bourbon.rb'.for
 MITX_FEATURES['ENABLE_PEARSON_HACK_TEST'] = True
 PEARSON_TEST_USER = "pearsontest"
 PEARSON_TEST_PASSWORD = "12345"
+
+########################## ANALYTICS TESTING ########################
+
+ANALYTICS_SERVER_URL = "http://127.0.0.1:9000/"
+ANALYTICS_API_KEY = ""
diff --git a/lms/envs/test.py b/lms/envs/test.py
index c1863349fb..5eb96c8df0 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -8,7 +8,6 @@ sessions. Assumes structure:
         /log  # Where we're going to write log files
 """
 from .common import *
-from logsettings import get_logger_config
 import os
 from path import path
 
@@ -116,7 +115,14 @@ CACHES = {
         'KEY_PREFIX': 'general',
         'VERSION': 4,
         'KEY_FUNCTION': 'util.memcache.safe_key',
-    }
+    },
+
+    'mongo_metadata_inheritance': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        'LOCATION': '/var/tmp/mongo_metadata_inheritance',
+        'TIMEOUT': 300,
+        'KEY_FUNCTION': 'util.memcache.safe_key',
+    } 
 }
 
 # Dummy secret key for dev
@@ -170,4 +176,4 @@ PASSWORD_HASHERS = (
     'django.contrib.auth.hashers.SHA1PasswordHasher',
     'django.contrib.auth.hashers.MD5PasswordHasher',
     # 'django.contrib.auth.hashers.CryptPasswordHasher',
-)
\ No newline at end of file
+)
diff --git a/lms/lib/comment_client/__init__.py b/lms/lib/comment_client/__init__.py
index ecade68b50..6228c32024 100644
--- a/lms/lib/comment_client/__init__.py
+++ b/lms/lib/comment_client/__init__.py
@@ -1,2 +1,2 @@
-from comment_client import *
-from utils import CommentClientError, CommentClientUnknownError
+from .comment_client import *
+from .utils import CommentClientError, CommentClientUnknownError
diff --git a/lms/lib/comment_client/comment.py b/lms/lib/comment_client/comment.py
index 0d81761512..2f93aff6b3 100644
--- a/lms/lib/comment_client/comment.py
+++ b/lms/lib/comment_client/comment.py
@@ -1,6 +1,6 @@
-from utils import *
+from .utils import *
 
-from thread import Thread
+from .thread import Thread
 import models
 import settings
 
diff --git a/lms/lib/comment_client/comment_client.py b/lms/lib/comment_client/comment_client.py
index d7c8f05485..862483a75b 100644
--- a/lms/lib/comment_client/comment_client.py
+++ b/lms/lib/comment_client/comment_client.py
@@ -1,9 +1,9 @@
-from comment import Comment
-from thread import Thread
-from user import User
-from commentable import Commentable
+from .comment import Comment
+from .thread import Thread
+from .user import User
+from .commentable import Commentable
 
-from utils import *
+from .utils import *
 
 import settings
 
diff --git a/lms/lib/comment_client/commentable.py b/lms/lib/comment_client/commentable.py
index 85c357ef81..111809f8f0 100644
--- a/lms/lib/comment_client/commentable.py
+++ b/lms/lib/comment_client/commentable.py
@@ -1,4 +1,4 @@
-from utils import *
+from .utils import *
 
 import models
 import settings
diff --git a/lms/lib/comment_client/models.py b/lms/lib/comment_client/models.py
index 2a8992554d..bf5f576a44 100644
--- a/lms/lib/comment_client/models.py
+++ b/lms/lib/comment_client/models.py
@@ -1,4 +1,4 @@
-from utils import *
+from .utils import *
 
 
 class Model(object):
diff --git a/lms/lib/comment_client/thread.py b/lms/lib/comment_client/thread.py
index ca607d3ff3..8911d5a2c6 100644
--- a/lms/lib/comment_client/thread.py
+++ b/lms/lib/comment_client/thread.py
@@ -1,4 +1,4 @@
-from utils import *
+from .utils import *
 
 import models
 import settings
@@ -11,12 +11,12 @@ class Thread(models.Model):
         'closed', 'tags', 'votes', 'commentable_id', 'username', 'user_id',
         'created_at', 'updated_at', 'comments_count', 'unread_comments_count',
         'at_position_list', 'children', 'type', 'highlighted_title',
-        'highlighted_body', 'endorsed', 'read', 'group_id', 'group_name'
+        'highlighted_body', 'endorsed', 'read', 'group_id', 'group_name', 'pinned'
     ]
 
     updatable_fields = [
         'title', 'body', 'anonymous', 'anonymous_to_peers', 'course_id',
-        'closed', 'tags', 'user_id', 'commentable_id', 'group_id', 'group_name'
+        'closed', 'tags', 'user_id', 'commentable_id', 'group_id', 'group_name', 'pinned'
     ]
 
     initializable_fields = updatable_fields
@@ -79,3 +79,23 @@ class Thread(models.Model):
 
         response = perform_request('get', url, request_params)
         self.update_attributes(**response)
+        
+    def pin(self, user, thread_id):
+        url = _url_for_pin_thread(thread_id)
+        params = {'user_id': user.id}
+        request = perform_request('put', url, params)
+        self.update_attributes(request)    
+
+    def un_pin(self, user, thread_id):
+        url = _url_for_un_pin_thread(thread_id)
+        params = {'user_id': user.id}
+        request = perform_request('put', url, params)
+        self.update_attributes(request)    
+        
+        
+def _url_for_pin_thread(thread_id):
+    return "{prefix}/threads/{thread_id}/pin".format(prefix=settings.PREFIX, thread_id=thread_id)      
+       
+def _url_for_un_pin_thread(thread_id):
+    return "{prefix}/threads/{thread_id}/unpin".format(prefix=settings.PREFIX, thread_id=thread_id)      
+       
\ No newline at end of file
diff --git a/lms/lib/comment_client/user.py b/lms/lib/comment_client/user.py
index c3ba84175e..a9e47fe6aa 100644
--- a/lms/lib/comment_client/user.py
+++ b/lms/lib/comment_client/user.py
@@ -1,4 +1,4 @@
-from utils import *
+from .utils import *
 
 import models
 import settings
diff --git a/lms/lib/comment_client/utils.py b/lms/lib/comment_client/utils.py
index e053fea6c0..860035dc06 100644
--- a/lms/lib/comment_client/utils.py
+++ b/lms/lib/comment_client/utils.py
@@ -3,7 +3,7 @@ import logging
 import requests
 import settings
 
-log = logging.getLogger('mitx.' + __name__)
+log = logging.getLogger(__name__)
 
 
 def strip_none(dic):
diff --git a/lms/lib/loncapa/__init__.py b/lms/lib/loncapa/__init__.py
index b734967d0a..32661f2df8 100644
--- a/lms/lib/loncapa/__init__.py
+++ b/lms/lib/loncapa/__init__.py
@@ -1,3 +1,3 @@
 #!/usr/bin/python
 
-from loncapa_check import *
+from .loncapa_check import *
diff --git a/lms/lib/symmath/__init__.py b/lms/lib/symmath/__init__.py
index 6a5632c001..a4233e4dde 100644
--- a/lms/lib/symmath/__init__.py
+++ b/lms/lib/symmath/__init__.py
@@ -1,2 +1,2 @@
-from formula import *
-from symmath_check import *
+from .formula import *
+from .symmath_check import *
diff --git a/lms/lib/symmath/symmath_check.py b/lms/lib/symmath/symmath_check.py
index 0a4ff84f70..151debee71 100644
--- a/lms/lib/symmath/symmath_check.py
+++ b/lms/lib/symmath/symmath_check.py
@@ -13,7 +13,7 @@ import sys
 import string
 import re
 import traceback
-from formula import *
+from .formula import *
 import logging
 
 log = logging.getLogger(__name__)
diff --git a/lms/lib/symmath/test_symmath_check.py b/lms/lib/symmath/test_symmath_check.py
index 2d015fcb53..3b8f14b0d2 100644
--- a/lms/lib/symmath/test_symmath_check.py
+++ b/lms/lib/symmath/test_symmath_check.py
@@ -1,5 +1,5 @@
 from unittest import TestCase
-from symmath_check import symmath_check
+from .symmath_check import symmath_check
 
 class SymmathCheckTest(TestCase):
     def test_symmath_check_integers(self):
diff --git a/lms/one_time_startup.py b/lms/one_time_startup.py
index 93428a3404..6b3c45d60f 100644
--- a/lms/one_time_startup.py
+++ b/lms/one_time_startup.py
@@ -1,5 +1,14 @@
+import logging
 from dogapi import dog_http_api, dog_stats_api
 from django.conf import settings
+from xmodule.modulestore.django import modulestore
+
+from django.core.cache import get_cache, InvalidCacheBackendError
+
+cache = get_cache('mongo_metadata_inheritance')
+for store_name in settings.MODULESTORE:
+    store = modulestore(store_name)
+    store.metadata_inheritance_cache = cache
 
 if hasattr(settings, 'DATADOG_API'):
     dog_http_api.api_key = settings.DATADOG_API
diff --git a/lms/static/images/pinned.png b/lms/static/images/pinned.png
new file mode 100644
index 0000000000..76bb207fff
Binary files /dev/null and b/lms/static/images/pinned.png differ
diff --git a/lms/static/images/press/releases/201x_240x180.jpg b/lms/static/images/press/releases/201x_240x180.jpg
new file mode 100644
index 0000000000..d2cfd8ee45
Binary files /dev/null and b/lms/static/images/press/releases/201x_240x180.jpg differ
diff --git a/lms/static/images/university/delft/delft-cover.jpg b/lms/static/images/university/delft/delft-cover.jpg
index 73092d7596..e69c836908 100644
Binary files a/lms/static/images/university/delft/delft-cover.jpg and b/lms/static/images/university/delft/delft-cover.jpg differ
diff --git a/lms/static/images/unpinned.png b/lms/static/images/unpinned.png
new file mode 100644
index 0000000000..030198f7e8
Binary files /dev/null and b/lms/static/images/unpinned.png differ
diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index e5134837fe..2f044ca5a3 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -2442,4 +2442,39 @@ body.discussion {
     color:#000;
     font-style: italic;
     background-color:#fff;
-  }
\ No newline at end of file
+  }
+
+.discussion-pin {
+      font-size: 12px;
+      float:right;
+      padding-right: 5px;
+      font-style: italic; 
+    }  
+    
+.notpinned .icon
+{
+  display: inline-block; 
+  width: 10px; 
+  height: 14px;
+  padding-right: 3px;
+  background: transparent url('../images/unpinned.png') no-repeat 0 0; 
+}
+
+.pinned .icon
+{
+  display: inline-block; 
+  width: 10px; 
+  height: 14px; 
+  padding-right: 3px;
+  background: transparent url('../images/pinned.png') no-repeat 0 0; 
+}
+
+.pinned span {
+  color: #B82066;
+  font-style: italic;
+}
+
+.notpinned span {
+  color: #888;
+  font-style: italic;
+}
\ No newline at end of file
diff --git a/lms/static/sass/course/_textbook.scss b/lms/static/sass/course/_textbook.scss
index af9c2493fd..b1f3a863b8 100644
--- a/lms/static/sass/course/_textbook.scss
+++ b/lms/static/sass/course/_textbook.scss
@@ -158,6 +158,19 @@ div.book-wrapper {
       img {
         max-width: 100%;
       }
+
+      div {
+        text-align: left;
+	line-height: 1.6em;
+	margin-left: 5px;
+	margin-right: 5px;
+	margin-top: 5px;
+	margin-bottom: 5px;
+	
+	.Paragraph, h2 {
+	   margin-top: 10px;
+	}	   
+      }
     }
   }
 
diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss
index ea987d8b2f..ab285392ca 100644
--- a/lms/static/sass/course/courseware/_courseware.scss
+++ b/lms/static/sass/course/courseware/_courseware.scss
@@ -119,6 +119,10 @@ div.course-wrapper {
       }
     }
 
+    section.xmodule_WrapperModule ol.vert-mod > li {
+      border-bottom: none;
+    }
+
     section.tutorials {
       h2 {
         margin-bottom: lh();
@@ -219,7 +223,7 @@ div.course-wrapper {
 .xmodule_VideoModule {
   margin-bottom: 30px;
 
-  
+
 }
 
 textarea.short-form-response {
@@ -237,7 +241,7 @@ section.self-assessment {
         margin-top: 5px;
         margin-bottom: 5px;
     }
-    
+
     div {
         margin-top: 5px;
         margin-bottom: 5px;
@@ -261,4 +265,4 @@ section.foldit {
        padding-right: 5px;
 
    }
-}
\ No newline at end of file
+}
diff --git a/lms/static/sass/shared/_course_object.scss b/lms/static/sass/shared/_course_object.scss
index 2c638ed158..e99559a49f 100644
--- a/lms/static/sass/shared/_course_object.scss
+++ b/lms/static/sass/shared/_course_object.scss
@@ -205,7 +205,10 @@
           position: relative;
           width: 100%;
 
-          p {
+          section {
+            color: $base-font-color;
+            font: normal 1em/1.6em $serif;
+            margin: 0px;
             height: 100%;
             overflow: hidden;
             text-overflow: ellipsis;
diff --git a/lms/templates/conditional_ajax.html b/lms/templates/conditional_ajax.html
index 0a5887be04..61f1095259 100644
--- a/lms/templates/conditional_ajax.html
+++ b/lms/templates/conditional_ajax.html
@@ -1 +1,8 @@
-<div id="conditional_${element_id}" class="conditional-wrapper" data-problem-id="${id}" data-url="${ajax_url}"></div>
+<div
+    id="conditional_${element_id}"
+    class="conditional-wrapper"
+    data-problem-id="${id}"
+    data-url="${ajax_url}"
+    data-depends="${depends}"
+>
+</div>
diff --git a/lms/templates/conditional_module.html b/lms/templates/conditional_module.html
index 019ae67567..e9731c3db2 100644
--- a/lms/templates/conditional_module.html
+++ b/lms/templates/conditional_module.html
@@ -1,15 +1,19 @@
 <%
-    from django.core.urlresolvers import reverse
-    reqm = module.required_modules[0]
-    course_id = module.system.course_id
-    condition = module.condition
-%>
+from django.core.urlresolvers import reverse
 
-<p><a href="${reverse('jump_to',kwargs=dict(course_id=course_id, location=reqm.location.url()))}">${reqm.display_name}</a>
-must be 
-% if 'attempted' in condition:
-  attempted
-% else:
-  completed 
+# course_id = module.location.course_id
+def get_course_id(module):
+    return module.location.org +'/' + module.location.course +'/' + \
+                module.system.ajax_url.split('/')[4]
+
+def _message(reqm, message):
+    return message.format(link="<a href={url}>{url_name}</a>".format(
+        url = reverse('jump_to', kwargs=dict(course_id=get_course_id(reqm),
+                        location=reqm.location.url())),
+        url_name = reqm.display_name_with_default))
+%>
+% if message:
+	% for reqm in module.required_modules:
+		<p>${_message(reqm, message)}</p>
+	% endfor
 % endif
-before this will become visible.</p>
diff --git a/lms/templates/course.html b/lms/templates/course.html
index a2eff572e1..f009955df1 100644
--- a/lms/templates/course.html
+++ b/lms/templates/course.html
@@ -5,7 +5,7 @@
 %>
 <%page args="course" />
 <article id="${course.id}" class="course">
-  %if course.is_new:
+  %if course.is_newish:
     <span class="status">New</span>
   %endif
   <a href="${reverse('about_course', args=[course.id])}">
diff --git a/lms/templates/courseware/info.html b/lms/templates/courseware/info.html
index ff10e645ed..836e4934a9 100644
--- a/lms/templates/courseware/info.html
+++ b/lms/templates/courseware/info.html
@@ -27,20 +27,20 @@ $(document).ready(function(){
     % if user.is_authenticated():
     <section class="updates">
       <h1>Course Updates &amp; News</h1>
-      ${get_course_info_section(request, cache, course, 'updates')}
+      ${get_course_info_section(request, course, 'updates')}
     </section>
     <section aria-label="Handout Navigation" class="handouts">
       <h1>${course.info_sidebar_name}</h1>
-      ${get_course_info_section(request, cache, course, 'handouts')}
+      ${get_course_info_section(request, course, 'handouts')}
     </section>
     % else:
     <section class="updates">
       <h1>Course Updates &amp; News</h1>
-      ${get_course_info_section(request, cache, course, 'guest_updates')}
+      ${get_course_info_section(request, course, 'guest_updates')}
     </section>
     <section aria-label="Handout Navigation" class="handouts">
       <h1>Course Handouts</h1>
-      ${get_course_info_section(request, cache, course, 'guest_handouts')}
+      ${get_course_info_section(request, course, 'guest_handouts')}
     </section>
     % endif
   </div>
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index 654d7e57cf..23329c837d 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -6,6 +6,8 @@
   <%static:css group='course'/>
   <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
   <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.axislabels.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/jquery-jvectormap-1.1.1/jquery-jvectormap-1.1.1.min.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/jquery-jvectormap-1.1.1/jquery-jvectormap-world-mill-en.js')}"></script>
   <script type="text/javascript" src="${static.url('js/course_groups/cohorts.js')}"></script>
 
 </%block>
@@ -35,12 +37,55 @@ table.stat_table td {
 	border-color: #666666;
 	background-color: #ffffff;
 }
+.divScroll {  
+	height: 200px;  
+	overflow: scroll;  
+}  
 
 a.selectedmode { background-color: yellow; }
 
 textarea {
   height: 200px;
 }
+
+.jvectormap-label {
+    position: absolute;
+    display: none;
+    border: solid 1px #CDCDCD;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    background: #292929;
+    color: white;
+    font-family: sans-serif, Verdana;
+    font-size: smaller;
+    padding: 3px;
+}
+
+.jvectormap-zoomin, .jvectormap-zoomout {
+    position: absolute;
+    left: 10px;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    background: #292929;
+    padding: 3px;
+    color: white;
+    width: 10px;
+    height: 10px;
+    cursor: pointer;
+    line-height: 10px;
+    text-align: center;
+}
+
+.jvectormap-zoomin {
+    top: 10px;
+}
+
+.jvectormap-zoomout {
+    top: 30px;
+}
+
 </style>
 
 <script language="JavaScript" type="text/javascript">
@@ -57,15 +102,19 @@ function goto( mode)
   <section class="instructor-dashboard-content">
     <h1>Instructor Dashboard</h1>
 
-    <h2>[ <a href="#" onclick="goto('Grades');" class="${modeflag.get('Grades')}">Grades</a> | 
+    <h2>[ <a href="#" onclick="goto('Grades');" class="${modeflag.get('Grades')}">Grades</a> |
           %if settings.MITX_FEATURES.get('ENABLE_PSYCHOMETRICS'):
-            <a href="#" onclick="goto('Psychometrics');" class="${modeflag.get('Psychometrics')}">Psychometrics</a> | 
+            <a href="#" onclick="goto('Psychometrics');" class="${modeflag.get('Psychometrics')}">Psychometrics</a> |
           %endif
           <a href="#" onclick="goto('Admin');" class="${modeflag.get('Admin')}">Admin</a> |
           <a href="#" onclick="goto('Forum Admin');" class="${modeflag.get('Forum Admin')}">Forum Admin</a> |
           <a href="#" onclick="goto('Enrollment');" class="${modeflag.get('Enrollment')}">Enrollment</a> |
           <a href="#" onclick="goto('Data');" class="${modeflag.get('Data')}">DataDump</a> |
-          <a href="#" onclick="goto('Manage Groups');" class="${modeflag.get('Manage Groups')}">Manage Groups</a> ]
+          <a href="#" onclick="goto('Manage Groups');" class="${modeflag.get('Manage Groups')}">Manage Groups</a>
+          %if settings.MITX_FEATURES.get('ENABLE_INSTRUCTOR_ANALYTICS'):
+             | <a href="#" onclick="goto('Analytics');" class="${modeflag.get('Analytics')}">Analytics</a> 
+          %endif
+	  ]
     </h2>
 
   <div style="text-align:right"><span id="djangopid">${djangopid}</span>
@@ -75,7 +124,7 @@ function goto( mode)
     <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
     <input type="hidden" name="idash_mode" value="">
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 %if modeflag.get('Grades'):
 
     %if offline_grade_log:
@@ -111,9 +160,9 @@ function goto( mode)
     <hr width="40%" style="align:left">
 
   %if settings.MITX_FEATURES.get('REMOTE_GRADEBOOK_URL','') and instructor_access:
-  
+
     <%
-        rg = course.metadata.get('remote_gradebook',{})
+        rg = course.remote_gradebook
     %>
 
     <h3>Export grades to remote gradebook</h3>
@@ -157,7 +206,7 @@ function goto( mode)
 
  %endif
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 %if modeflag.get('Psychometrics'):
 
     <p>Select a problem and an action:
@@ -178,7 +227,7 @@ function goto( mode)
 
 %endif
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 %if modeflag.get('Admin'):
   %if instructor_access:
     <hr width="40%" style="align:left">
@@ -208,7 +257,7 @@ function goto( mode)
   %endif
 %endif
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 %if modeflag.get('Forum Admin'):
   %if instructor_access:
     <hr width="40%" style="align:left">
@@ -225,7 +274,7 @@ function goto( mode)
     <input type="submit" name="action" value="List course forum moderators">
     <input type="submit" name="action" value="List course forum community TAs">
     <p>
-    <input type="text" name="forummoderator"> 
+    <input type="text" name="forummoderator">
     <input type="submit" name="action" value="Remove forum moderator">
     <input type="submit" name="action" value="Add forum moderator">
     <input type="submit" name="action" value="Remove forum community TA">
@@ -236,7 +285,7 @@ function goto( mode)
   %endif
 %endif
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 %if modeflag.get('Enrollment'):
 
     <hr width="40%" style="align:left">
@@ -249,9 +298,9 @@ function goto( mode)
     <hr width="40%" style="align:left">
 
   %if settings.MITX_FEATURES.get('REMOTE_GRADEBOOK_URL','') and instructor_access:
-  
+
     <%
-        rg = course.metadata.get('remote_gradebook',{})
+        rg = course.remote_gradebook
     %>
 
     <p>Pull enrollment from remote gradebook</p>
@@ -264,7 +313,7 @@ function goto( mode)
     <input type="submit" name="action" value="Overload enrollment list using remote gradebook">
     <input type="submit" name="action" value="Merge enrollment list with remote gradebook">
     <hr width="40%" style="align:left">
-  
+
   %endif
 
   <p>Add students: enter emails, separated by new lines or commas;</p>
@@ -273,21 +322,21 @@ function goto( mode)
 
 %endif
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 
 %if modeflag.get('Data'):
     <hr width="40%" style="align:left">
     <p>
     <input type="submit" name="action" value="Download CSV of all student profile data">
     </p>
-    <p> Problem urlname: 
+    <p> Problem urlname:
         <input type="text" name="problem_to_dump" size="40">
         <input type="submit" name="action" value="Download CSV of all responses to problem">
     </p>
     <hr width="40%" style="align:left">
 %endif
-  
-##----------------------------------------------------------------------------- 
+
+##-----------------------------------------------------------------------------
 
 %if modeflag.get('Manage Groups'):
   %if instructor_access:
@@ -313,11 +362,171 @@ function goto( mode)
 %endif
 
     </form>
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 
 %if msg:
     <p></p><p>${msg}</p>
 %endif
+##-----------------------------------------------------------------------------
+
+%if modeflag.get('Analytics'):
+
+  %if not any(analytics_results.values()):
+    <p>No Analytics are available at this time.</p>
+  %endif
+
+  %if analytics_results.get("StudentsEnrolled"):
+    <p>
+      Students enrolled:
+      ${analytics_results["StudentsEnrolled"]['data'][0]['students']}
+    </p>
+  %endif
+
+  %if analytics_results.get("StudentsActive"):
+    <p>
+      Students active in the last week:
+      ${analytics_results["StudentsActive"]['data'][0]['active']}
+    </p>
+  %endif
+
+  %if analytics_results.get("StudentsDropoffPerDay"):
+    <p>Student activity day by day</p>
+    <div>
+      <table class="stat_table">
+        <tr>
+          <th>Day</th>
+          <th>Students</th>
+        </tr>
+      %for row in analytics_results['StudentsDropoffPerDay']['data']:
+        <tr>
+          ## For now, just discard the non-date portion
+          <td>${row['last_day'].split("T")[0]}</td>
+          <td>${row['num_students']}</td>
+        </tr>
+      %endfor
+      </table>
+    </div>
+  %endif
+  <br/>
+  %if analytics_results.get("ProblemGradeDistribution"):
+    <p>Answer distribution for problems</p>
+    <div>
+      <table class="stat_table">
+        <tr>
+          <th>Problem</th>
+          <th>Max</th>
+          <th colspan="99">Points Earned (Num Students)</th>
+        </tr>
+      %for row in analytics_results['ProblemGradeDistribution']['data']:
+        <tr>
+          <td>${row['module_id'].split('/')[-1]}</td>
+          <td>${max(grade_record['max_grade'] for grade_record in row["grade_info"])}
+          %for grade_record in row["grade_info"]:
+          <td>
+            %if isinstance(grade_record["grade"], float):
+              ${"{grade:.2f}".format(**grade_record)}
+            %else:
+              ${"{grade}".format(**grade_record)}
+            %endif
+            (${grade_record["num_students"]})
+          </td>
+          %endfor
+        </tr>
+      %endfor
+      </table>
+    </div>
+  %endif
+%endif
+
+%if modeflag.get('Analytics In Progress'):
+
+  ##This is not as helpful as it could be -- let's give full point distribution
+  ##instead.
+  %if analytics_results.get("StudentsPerProblemCorrect"):
+    <p>Students answering correctly</p>
+    <div class="divScroll">
+      <table class="stat_table">
+        <tr>
+          <th>Problem</th>
+          <th>Number of students</th>
+        </tr>
+      %for row in analytics_results['StudentsPerProblemCorrect']['data']:
+        <tr>
+          <td>${row['module_id'].split('/')[-1]}</td>
+          <td>${row['count']}</td>
+        </tr>
+      %endfor
+      </table>
+    </div>
+  %endif
+
+   <p>
+     Student distribution per country, all courses, Sep-12 to Oct-17, 1 server (shown here as an example):
+   </p>
+
+<div id="posts-list" class="clearfix">
+<figure>
+    <div id="world-map-students" style="width: 720px; height: 400px"></div>
+    <script>
+      var student_data = {BD : '300', BE : '156', BF : '7', BG : '246', BA : '62', BB : '1', BN : '7', BO : '61', JP : '153', BI : '4', BJ : '6', BT : '11', JM : '32', JO : '67', WS : '1', BR : '1941', BS : '5', JE : '6', BY : '166', BZ : '4', RU : '1907', RW : '50', RS : '128', TL : '1', RE : '2', A2 : '59', TJ : '9', RO : '232', GU : '3', GT : '76', GR : '565', BH : '22', GY : '6', GG : '2', GF : '1', GE : '22', GD : '7', GB : '2023', GA : '4', GM : '18', GL : '2', GI : '1', GH : '393', OM : '25', TN : '143', BW : '26', HR : '76', HT : '38', HU : '259', HK : '103', HN : '51', AD : '1', PR : '40', PS : '38', PT : '487', PY : '38', PA : '21', PG : '11', PE : '342', PK : '1833', PH : '571', TM : '1', PL : '736', ZM : '61', EE : '67', EG : '961', ZA : '184', EC : '118', AL : '44', AO : '10', SB : '2', EU : '183', ET : '153', SO : '1', ZW : '42', KY : '3', ES : '1954', ER : '3', ME : '6', MD : '26', MG : '10', UY : '64', UZ : '40', MM : '21', ML : '4', MO : '3', MN : '49', US : '11899', MU : '11', MT : '15', MW : '41', MV : '5', MP : '4', MR : '1', IM : '2', UG : '133', MY : '207', MX : '844', AT : '83', FR : '446', MA : '175', A1 : '167', AX : '1', FI : '97', FJ : '9', NI : '23', NL : '240', NO : '110', NA : '27', NC : '1', NE : '4', NG : '753', NZ : '98', NP : '200', CI : '9', CH : '144', CO : '851', CN : '282', CM : '82', CL : '243', CA : '1129', CD : '7', CZ : '161', CY : '26', CR : '137', CV : '11', CU : '15', SZ : '6', SY : '58', KG : '47', KE : '282', SR : '5', KI : '1', KH : '40', SV : '155', KM : '1', ST : '1', SK : '66', KR : '141', SI : '70', KP : '1', KW : '28', SN : '16', SL : '11', KZ : '174', SA : '352', SG : '217', SE : '172', SD : '61', DO : '104', DM : '5', DJ : '6', DK : '105', DE : '941', YE : '90', DZ : '281', MK : '28', TZ : '124', LC : '5', LA : '7', TW : '115', TT : '33', TR : '288', LK : '96', LV : '52', TO : '2', LT : '114', LU : '21', LR : '9', LS : '9', TH : '84', TG : '11', LY : '15', VC : '6', AE : '151', VE : '180', AG : '1', AF : '21', IQ : '29', VI : '1', IS : '14', IR : '153', AM : '37', IT : '365', VN : '269', AP : '23', AR : '258', AU : '661', IL : '159', AW : '3', IN : '7836', LB : '28', AZ : '22', IE : '210', ID : '382', UA : '860', QA : '23', MZ : '8'};
+      $(function(){
+        $('#world-map-students').vectorMap({
+          map: 'world_mill_en',
+          backgroundColor: '#eeeeee',
+          series: {
+            regions: [{
+              values: student_data,
+              scale: ['#C8EEFF', '#0071A4'],
+              normalizeFunction: 'polynomial'
+            }]
+          },
+          onRegionLabelShow: function(event, label, code){
+            label.text(label.text() + ': ' + (student_data[code] != null ? student_data[code] : 0));
+          }
+        });
+      });
+    </script>
+</figure>
+</div>
+
+
+##     <p>Number of students who dropped off per day before becoming inactive:</p>
+##
+##     % if dropoff_per_day is not None:
+##     % if dropoff_per_day['status'] == 'success':
+##     <div class="divScroll">
+##     <table class="stat_table">
+##     <tr><th>Day</th><th>Number of students</th></tr>
+##     % for k,v in dropoff_per_day['data'].items():
+##     <tr> <td>${k}</td> <td>${v}</td> </tr>
+##     % endfor
+##     </table>
+##     </div>
+##     % else:
+##     <i> ${dropoff_per_day['error']}</i>
+##     % endif
+##     % else:
+##     <i> null data </i>
+##     % endif
+##   </p>
+##
+
+
+##   <p>
+##     <h2>Daily activity (online version):</h2>
+##     <table class="stat_table">
+##     <tr><th>Day</td><th>Number of students</td></tr>
+##     % for k,v in daily_activity_json['data'].items():
+##     <tr>
+##     <td>${k}</td> <td>${v}</td>
+##     </tr>
+##     % endfor
+##     </table>
+##   </p>
+
+
+%endif
+
 ##----------------------------------------------------------------------------- 
 
 %if datatable and modeflag.get('Psychometrics') is None:
@@ -344,7 +553,7 @@ function goto( mode)
     </p>
 %endif
 
-##-----------------------------------------------------------------------------  
+##-----------------------------------------------------------------------------
 %if modeflag.get('Psychometrics'):
 
     %for plot in plots:
@@ -365,12 +574,12 @@ function goto( mode)
     %endfor
 
 %endif
- 
-##-----------------------------------------------------------------------------  
+
+##-----------------------------------------------------------------------------
 ## always show msg
 
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 %if modeflag.get('Admin'):
  % if course_errors is not UNDEFINED:
     <h2>Course errors</h2>
@@ -392,7 +601,7 @@ function goto( mode)
       %endif
       </div>
   % endif
-%endif      
+%endif
 
   </section>
 </div>
diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html
index 9b52ff2069..9c3df5237c 100644
--- a/lms/templates/courseware/progress.html
+++ b/lms/templates/courseware/progress.html
@@ -18,7 +18,7 @@
 <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.stack.js')}"></script>
 <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.symbol.js')}"></script>
 <script>
-${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph", not course.metadata.get("no_grade", False), not course.metadata.get("no_grade", False))}
+${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph", not course.no_grade, not course.no_grade)}
 </script>
 </%block>
 
@@ -32,7 +32,7 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph",
         <h1>Course Progress</h1>
       </header>
 
-      %if not course.metadata.get('disable_progress_graph',False):
+      %if not course.disable_progress_graph:
         <div id="grade-detail-graph"></div>
       %endif
 
diff --git a/lms/templates/courseware/welcome-back.html b/lms/templates/courseware/welcome-back.html
index 5d4e0fe1e3..ffd2e36d0a 100644
--- a/lms/templates/courseware/welcome-back.html
+++ b/lms/templates/courseware/welcome-back.html
@@ -1,3 +1,3 @@
-<h2>${chapter_module.display_name}</h2>
+<h2>${chapter_module.display_name_with_default}</h2>
 
-<p>You were most recently in <a href="${prev_section_url}">${prev_section.display_name}</a>.  If you're done with that, choose another section on the left.</p> 
+<p>You were most recently in <a href="${prev_section_url}">${prev_section.display_name_with_default}</a>.  If you're done with that, choose another section on the left.</p>
diff --git a/lms/templates/courseware/xqa_interface.html b/lms/templates/courseware/xqa_interface.html
index 89ec77b31f..e9f9426bf0 100644
--- a/lms/templates/courseware/xqa_interface.html
+++ b/lms/templates/courseware/xqa_interface.html
@@ -42,8 +42,6 @@ function sendlog(element_id, edit_link, staff_context){
 			entry: $('#' + element_id + '_xqa_entry').val()
 		};
 			
-	if (edit_link) xqaLog["giturl"] = edit_link;
-
 	$.ajax({
 		url: '${xqa_server}/log',
 		type: 'GET',
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 18275636ac..d23609801f 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -199,7 +199,7 @@
           %>
 
 
-          
+
           <a href="${course_target}" class="cover">
             <img src="${course_image_url(course)}" />
           </a>
@@ -216,7 +216,7 @@
               % endif
               </p>
               <h2 class="university">${get_course_about_section(course, 'university')}</h2>
-              <h3><a href="${course_target}">${course.number} ${course.title}</a></h3>
+              <h3><a href="${course_target}">${course.number} ${course.display_name_with_default}</a></h3>
             </hgroup>
 
             <%
@@ -226,7 +226,7 @@
             %>
             % if testcenter_exam_info is not None:
 
-                % if registration is None and testcenter_exam_info.is_registering():	    
+                % if registration is None and testcenter_exam_info.is_registering():
                 <div class="message message-status is-shown exam-register">
                   <a href="${testcenter_register_target}" class="button exam-button" id="exam_register_button">Register for Pearson exam</a>
                   <p class="message-copy">Registration for the Pearson exam is now open and will close on <strong>${testcenter_exam_info.registration_end_date_text}</strong></p>
@@ -234,25 +234,25 @@
                 % endif
                 <!-- display a registration for a current exam, even if the registration period is over -->
                 % if registration is not None:
-                    % if registration.is_accepted:  
+                    % if registration.is_accepted:
                 <div class="message message-status is-shown exam-schedule">
                    <a href="${registration.registration_signup_url}" class="button exam-button">Schedule Pearson exam</a>
                    <p class="exam-registration-number"><a href="${testcenter_register_target}" id="exam_register_link">Registration</a> number: <strong>${registration.client_candidate_id}</strong></p>
                    <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
                 </div>
                     % endif
-                    % if  registration.is_rejected:	    
+                    % if  registration.is_rejected:
                 <div class="message message-status is-shown exam-schedule">
                   <p class="message-copy"><strong>Your registration for the Pearson exam has been rejected. Please <a href="${testcenter_register_target}" id="exam_register_link">see your registration status details</a></strong>. Otherwise <a class="contact-link" href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}">contact edX at exam-help@edx.org</a> for further help.</p>
                 </div>
                     % endif
-                   	% if not registration.is_accepted and not registration.is_rejected:	    
+                   	% if not registration.is_accepted and not registration.is_rejected:
 	            <div class="message message-status is-shown">
     	              <p class="message-copy"><strong>Your <a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a> is pending</strong>. Within a few days, you should see a confirmation number here, which can be used to schedule your exam.</p>
                 </div>
                     % endif
                 % endif
-            % endif   
+            % endif
 
             <%
             cert_status = cert_statuses.get(course.id)
@@ -314,13 +314,13 @@
                 <a href="${course_target}" class="enter-course archived">View Archived Course</a>
               % else:
                 <a href="${course_target}" class="enter-course">View Course</a>
-              % endif              
+              % endif
             % endif
             <a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}">Unregister</a>
           </section>
         </article>
 
-        
+
 
       % endfor
     % else:
diff --git a/lms/templates/discussion/_inline_new_post.html b/lms/templates/discussion/_inline_new_post.html
index a1b347f548..a7b1781b18 100644
--- a/lms/templates/discussion/_inline_new_post.html
+++ b/lms/templates/discussion/_inline_new_post.html
@@ -7,15 +7,15 @@
                 <div class="options">
                     <input type="checkbox" name="follow" class="discussion-follow" class="discussion-follow" id="new-post-follow" checked><label for="new-post-follow">follow this post</label>
                     <br>
-                    % if course.metadata.get("allow_anonymous", True):
+                    % if course.allow_anonymous:
                         <input type="checkbox" name="anonymous" class="discussion-anonymous" id="new-post-anonymous"><label for="new-post-anonymous">post anonymously</label>
-                    %elif course.metadata.get("allow_anonymous_to_peers", False):
+                    %elif course.allow_anonymous_to_peers:
                         <input type="checkbox" name="anonymous_to_peers" class="discussion-anonymous-to-peers" id="new-post-anonymous-to-peers"><label for="new-post-anonymous-to-peers">post anonymously to classmates</label>
                     %endif
                     %if is_course_cohorted:
                     <div class="form-group-label choose-cohort">
                         Make visible to:
-                        <select class="group-filter-select new-post-group" name = "group_id"> 
+                        <select class="group-filter-select new-post-group" name = "group_id">
                             <option value="">All Groups</option>
                             %if is_moderator:
                               %for c in cohorts:
diff --git a/lms/templates/discussion/_new_post.html b/lms/templates/discussion/_new_post.html
index 7848dd1488..f692eef654 100644
--- a/lms/templates/discussion/_new_post.html
+++ b/lms/templates/discussion/_new_post.html
@@ -23,7 +23,7 @@
 
 
 <article class="new-post-article">
-    <div class="inner-wrapper">        
+    <div class="inner-wrapper">
         <form class="new-post-form">
             <div class="left-column">
                 <label>Create new post about:</label>
@@ -41,18 +41,18 @@
                 <div class="options">
                     <input type="checkbox" name="follow" class="discussion-follow" class="discussion-follow" id="new-post-follow" checked><label for="new-post-follow">follow this post</label>
                     <br>
-                    % if course.metadata.get("allow_anonymous", True):
+                    % if course.allow_anonymous:
                         <input type="checkbox" name="anonymous" class="discussion-anonymous" id="new-post-anonymous"><label for="new-post-anonymous">post anonymously</label>
-                    %elif course.metadata.get("allow_anonymous_to_peers", False):
+                    %elif course.allow_anonymous_to_peers:
                         <input type="checkbox" name="anonymous_to_peers" class="discussion-anonymous-to-peers" id="new-post-anonymous-to-peers"><label for="new-post-anonymous-to-peers">post anonymously to classmates</label>
                     %endif
                     %if is_course_cohorted and is_moderator:
                     <div class="form-group-label choose-cohort">
                         Make visible to:
-                        <select class="group-filter-select new-post-group" name = "group_id"> 
+                        <select class="group-filter-select new-post-group" name = "group_id">
                             <option value="">All Groups</option>
                             %for c in cohorts:
-                                <option value="${c.id}" 
+                                <option value="${c.id}"
                                 %if user_cohort and str(user_cohort) == str(c.id):
                                     selected
                                 %endif
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index de1ff394bd..5fdfb8aa82 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -45,6 +45,21 @@
       </header>
 
       <div class="post-body">${'<%- body %>'}</div>
+      
+      % if course and has_permission(user, 'openclose_thread', course.id):
+      <div class="admin-pin discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">                
+      <i class="icon"></i><span class="pin-label">Pin Thread</span></div> 
+      %else:
+      ${"<% if (pinned) { %>"}
+      <div class="discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">                
+      <i class="icon"></i><span class="pin-label">Pin Thread</span></div> 
+      ${"<% }  %>"}  
+      % endif
+      
+      
+      
+      
+      
       ${'<% if (obj.courseware_url) { %>'}
       <div class="post-context">
           (this post is about <a href="${'<%- courseware_url%>'}">${'<%- courseware_title %>'}</a>)
diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html
index e30ee4a2db..d43f8b945f 100644
--- a/lms/templates/discussion/index.html
+++ b/lms/templates/discussion/index.html
@@ -26,7 +26,7 @@
         <div class="sidebar"></div>
         <div class="discussion-column">
         	<div class="discussion-article blank-slate">
-	        	<h1>${course.title} Discussion</h1>
+	        	<h1>${course.display_name_with_default} Discussion</h1>
 
         	</div>
         </div>
diff --git a/lms/templates/feed.rss b/lms/templates/feed.rss
index a5b40ca11c..a6fda0d20a 100644
--- a/lms/templates/feed.rss
+++ b/lms/templates/feed.rss
@@ -4,20 +4,38 @@
 <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/">
   <id>tag:www.edx.org,2012:/blog</id>
   <link type="text/html" rel="alternate" href="http://blog.edx.org/"/>
-  ##<link type="application/atom+xml" rel="self" href="https://github.com/blog.atom"/>
+  <link type="application/atom+xml" rel="self" href="https://github.com/blog.atom"/>
   <title>EdX Blog</title>
-  <updated>2013-02-20T14:00:12-07:00</updated>
+  <updated>2013-03-15T14:00:12-07:00</updated>
   <entry>
-    <id>tag:www.edx.org,2012:Post/13</id>
-    <published>2013-02-20T10:00:00-07:00</published>
-    <updated>2013-02-20T10:00:00-07:00</updated>
-    <link type="text/html" rel="alternate" href="${reverse('press/edx-expands-internationally')}"/>
-    <title>edX Expands Internationally and Doubles its Institutional Membership with the Addition of Six New Schools</title>
+    <id>tag:www.edx.org,2013:Post/16</id>
+    <published>2013-03-15T10:00:00-07:00</published>
+    <updated>2013-03-15T10:00:00-07:00</updated>
+    <link type="text/html" rel="alternate" href="${reverse('press/xblock-announcement')}"/>
+    <title>edX releases XBlock SDK, first step toward open source vision</title>
     <content type="html">&lt;img src=&quot;${static.url('images/press/releases/edx-logo_240x180.png')}&quot; /&gt;
         &lt;p&gt;&lt;/p&gt;</content>
   </entry>
   <entry>
-    <id>tag:www.edx.org,2012:Post/13</id>
+    <id>tag:www.edx.org,2013:Post/15</id>
+    <published>2013-03-14T10:00:00-07:00</published>
+    <updated>2013-03-14T10:00:00-07:00</updated>
+    <link type="text/html" rel="alternate" href="/courses/MITx/2.01x/2013_Spring/about"/>
+    <title>New mechanical engineering course open for enrollment</title>
+    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/201x_240x180.jpg')}&quot; /&gt;
+        &lt;p&gt;&lt;/p&gt;</content>
+  </entry>
+  <!-- <entry> -->
+  <!--   <id>tag:www.edx.org,2013:Post/14</id> -->
+  <!--   <published>2013-02-20T10:00:00-07:00</published> -->
+  <!--   <updated>2013-02-20T10:00:00-07:00</updated> -->
+  <!--   <link type="text/html" rel="alternate" href="${reverse('press/edx-expands-internationally')}"/> -->
+  <!--   <title>edX Expands Internationally and Doubles its Institutional Membership with the Addition of Six New Schools</title> -->
+  <!--   <content type="html">&lt;img src=&quot;${static.url('images/press/releases/edx-logo_240x180.png')}&quot; /&gt; -->
+  <!--       &lt;p&gt;&lt;/p&gt;</content> -->
+  <!-- </entry> -->
+  <entry>
+    <id>tag:www.edx.org,2013:Post/14</id>
     <published>2013-01-30T10:00:00-07:00</published>
     <updated>2013-01-30T10:00:00-07:00</updated>
     <link type="text/html" rel="alternate" href="${reverse('press/eric-lander-secret-of-life')}"/>
@@ -26,7 +44,7 @@
         &lt;p&gt;&lt;/p&gt;</content>
   </entry>
   <entry>
-    <id>tag:www.edx.org,2012:Post/11</id>
+    <id>tag:www.edx.org,2013:Post/12</id>
     <published>2013-01-22T10:00:00-07:00</published>
     <updated>2013-01-22T10:00:00-07:00</updated>
     <link type="text/html" rel="alternate" href="${reverse('press/lewin-course-announcement')}"/>
@@ -35,7 +53,7 @@
         &lt;p&gt;&lt;/p&gt;</content>
   </entry>
   <entry>
-    <id>tag:www.edx.org,2012:Post/12</id>
+    <id>tag:www.edx.org,2013:Post/11</id>
     <published>2013-01-29T10:00:00-07:00</published>
     <updated>2013-01-29T10:00:00-07:00</updated>
     <link type="text/html" rel="alternate" href="${reverse('press/bostonx-announcement')}"/>
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index d574bc3f6e..e4c23e4836 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -41,7 +41,7 @@ site_status_msg = get_site_status_msg(course_id)
   <h1 class="logo"><a href="${reverse('root')}"><img src="${static.url(branding.get_logo_url(request.META.get('HTTP_HOST')))}"/></a></h1>
 
     % if course:
-      <h2><span class="provider">${course.org}:</span> ${course.number} ${course.title}</h2>
+      <h2><span class="provider">${course.org}:</span> ${course.number} ${course.display_name_with_default}</h2>
     % endif
 
     <ol class="left find-courses-button">
diff --git a/lms/templates/poll.html b/lms/templates/poll.html
new file mode 100644
index 0000000000..6dd2f579a4
--- /dev/null
+++ b/lms/templates/poll.html
@@ -0,0 +1,8 @@
+<section
+    id="poll_${element_id}"
+    class="${element_class}"
+    data-ajax-url="${ajax_url}"
+>
+    <!-- Hidden field to read configuration JSON from. -->
+    <div class="${element_class}_div" id="${element_id}_json" style="display: none;">${configuration_json}</div>
+</section>
\ No newline at end of file
diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html
index 01bc17bd65..9224ccc0b4 100644
--- a/lms/templates/signup_modal.html
+++ b/lms/templates/signup_modal.html
@@ -25,7 +25,7 @@
           <label data-field="password">Password*</label>
           <input name="password" type="password" placeholder="****">
           <label data-field="username">Public Username*</label>
-          <input name="username" type="text" placeholder="Shown on forms">
+          <input name="username" type="text" placeholder="Shown on forums">
           <label data-field="name">Full Name*</label>
           <input name="name" type="text" placeholder="For your certificate">
 	  % else:
diff --git a/lms/templates/staff_problem_info.html b/lms/templates/staff_problem_info.html
index f89d5ab9d5..807182b059 100644
--- a/lms/templates/staff_problem_info.html
+++ b/lms/templates/staff_problem_info.html
@@ -49,12 +49,18 @@ ${module_content}
     <div class="staff_info" style="display:block">
 is_released = ${is_released}
 location = ${location | h}
-github = <a href="${edit_link}">${edit_link | h}</a>
-%if source_file:
-source_url = <a href="${source_url}">${source_file | h}</a>
-%endif
-definition = <pre>${definition | h}</pre>
-metadata = ${metadata | h}
+<table>
+  <tr><th>Module Fields</th></tr>
+  %for name, field in fields:
+  <tr><td>${name}</td><td><pre style="display:inline-block; margin: 0;">${field | h}</pre></td></tr>
+  %endfor
+</table>
+<table>
+  <tr><th>edX Fields</th></tr>
+  %for name, field in lms_fields:
+  <tr><td>${name}</td><td><pre style="display:inline-block; margin: 0;">${field | h}</pre></td></tr>
+  %endfor
+</table>
 category = ${category | h}
     </div>
     %if render_histogram:
@@ -86,18 +92,21 @@ category = ${category | h}
 
 <script type="text/javascript">
 // assumes courseware.html's loaded this method.
-  setup_debug('${element_id}',
-    %if edit_link:
-      '${edit_link}',
-    %else:
-      null,
-    %endif
-    {
-        'location': '${location}',
-        'xqa_key': '${xqa_key}',
-        'category': '${category}',
-        'user': '${user}'
-    });
+$(function () {
+    setup_debug('${element_id}',
+        %if edit_link:
+        '${edit_link}',
+        %else:
+        null,
+        %endif
+        {
+            'location': '${location}',
+            'xqa_key': '${xqa_key}',
+            'category': '${category}',
+            'user': '${user}'
+        }
+    );
+});
 </script>
 %endif
 
diff --git a/lms/templates/static_htmlbook.html b/lms/templates/static_htmlbook.html
new file mode 100644
index 0000000000..9500a379ac
--- /dev/null
+++ b/lms/templates/static_htmlbook.html
@@ -0,0 +1,135 @@
+<%inherit file="main.html" />
+<%namespace name='static' file='static_content.html'/>
+<%block name="title"><title>${course.number} Textbook</title>
+</%block>
+
+<%block name="headextra">
+<%static:css group='course'/>
+<%static:js group='courseware'/>
+</%block>
+
+<%block name="js_extra">
+  <script type="text/javascript">
+(function($) {
+    $.fn.myHTMLViewer = function(options) {
+        var urlToLoad = null;
+        if (options.url) {
+            urlToLoad = options.url;
+        }
+        var chapterUrls = null;
+        if (options.chapters) {
+            chapterUrls = options.chapters;
+        }
+        var chapterToLoad = 1;
+        if (options.chapterNum) {
+            // TODO: this should only be specified if there are 
+            // chapters, and it should be in-bounds.
+            chapterToLoad = options.chapterNum;
+        }
+        var anchorToLoad = null;
+        if (options.chapters) {
+            anchorToLoad = options.anchor_id;
+        }
+
+        loadUrl = function htmlViewLoadUrl(url, anchorId) {
+            // clear out previous load, if any:
+            parentElement = document.getElementById('bookpage');
+            while (parentElement.hasChildNodes())
+                parentElement.removeChild(parentElement.lastChild);
+	    // load new URL in:
+            $('#bookpage').load(url);
+
+	    // if there is an anchor set, then go to that location:
+            if (anchorId != null) {
+		// TODO: add implementation....
+            } 
+
+        }; 
+
+        loadChapterUrl = function htmlViewLoadChapterUrl(chapterNum, anchorId) {
+            if (chapterNum < 1 || chapterNum > chapterUrls.length) {
+                return;
+            }
+            var chapterUrl = chapterUrls[chapterNum-1];
+            loadUrl(chapterUrl, anchorId);
+        };
+
+        // define navigation links for chapters:  
+        if (chapterUrls != null) {
+            var loadChapterUrlHelper = function(i) {
+                return function(event) {
+                    // when opening a new chapter, always open to the top:
+                    loadChapterUrl(i, null);
+                };
+            };
+            for (var index = 1; index <= chapterUrls.length; index += 1) {
+                $("#htmlchapter-" + index).click(loadChapterUrlHelper(index));
+            }   
+        }
+
+        // finally, load the appropriate url/page
+        if (urlToLoad != null) {
+            loadUrl(urlToLoad, anchorToLoad);
+        } else {
+            loadChapterUrl(chapterToLoad, anchorToLoad);
+        }       
+
+    }
+})(jQuery);
+
+    $(document).ready(function() {
+        var options = {};
+        %if 'url' in textbook:
+            options.url = "${textbook['url']}";
+        %endif
+        %if 'chapters' in textbook:
+            var chptrs = [];
+            %for chap in textbook['chapters']:
+                chptrs.push("${chap['url']}");
+            %endfor
+            options.chapters = chptrs;
+        %endif
+        %if chapter is not None:
+            options.chapterNum = ${chapter};
+        %endif
+        %if anchor_id is not None:
+            options.anchor_id = ${anchor_id};
+        %endif
+
+        $('#outerContainer').myHTMLViewer(options);
+    });
+  </script>  
+</%block>
+
+<%include file="/courseware/course_navigation.html" args="active_page='htmltextbook/{0}'.format(book_index)" />
+
+    <div id="outerContainer">
+      <div id="mainContainer" class="book-wrapper">
+
+        %if 'chapters' in textbook:
+        <section aria-label="Textbook Navigation" class="book-sidebar">
+          <ul id="booknav" class="treeview-booknav">
+            <%def name="print_entry(entry, index_value)">
+              <li id="htmlchapter-${index_value}">
+                <a class="chapter">
+                  ${entry.get('title')}
+                </a>
+              </li>
+            </%def>
+
+            %for (index, entry) in enumerate(textbook['chapters']):
+              ${print_entry(entry, index+1)}
+            % endfor
+          </ul>
+        </section>
+        %endif
+
+        <section id="viewerContainer" class="book">
+          <section class="page"> 
+            <div id="bookpage" />
+          </section> 
+        </section>
+
+      </div>
+    </div>
+
diff --git a/lms/templates/static_templates/jobs.html b/lms/templates/static_templates/jobs.html
index da31e07e42..2f6713fd06 100644
--- a/lms/templates/static_templates/jobs.html
+++ b/lms/templates/static_templates/jobs.html
@@ -48,11 +48,12 @@
             <li>A great working experience where everyone cares and wants to change the world (no, we’re not kidding)</li>
           </ul>
           <p>While we appreciate every applicant&rsquo;s interest, only those under consideration will be contacted. We regret that phone calls will not be accepted.  Equal opportunity employer.</p>
+          <p>All positions are located in our Cambridge offices.</p>
         </div>
       </article>
 
 
-      <!-- Template        
+      <!-- Template
            <article id="SOME-JOB" class="job">
              <div class="inner-wrapper">
                <h3><strong>TITLE</strong></h3>
diff --git a/lms/templates/static_templates/press_releases/xblock_announcement.html b/lms/templates/static_templates/press_releases/xblock_announcement.html
new file mode 100644
index 0000000000..e6deaae23c
--- /dev/null
+++ b/lms/templates/static_templates/press_releases/xblock_announcement.html
@@ -0,0 +1,63 @@
+<%! from django.core.urlresolvers import reverse %>
+<%inherit file="../../main.html" />
+
+<%namespace name='static' file='../../static_content.html'/>
+
+<%block name="title"><title>edX Takes First Step toward Open Source Vision by Releasing XBlock SDK</title></%block>
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+var js, fjs = d.getElementsByTagName(s)[0];
+if (d.getElementById(id)) return;
+js = d.createElement(s); js.id = id;
+js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
+fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+
+<section class="pressrelease">
+  <section class="container">
+    <h1>edX Takes First Step toward Open Source Vision by Releasing XBlock SDK</h1>
+    <hr class="horizontal-divider"/>
+    <article>
+      <h2>With Release of XBlock Source Code, Global Community Invited to Participate in the Development of the edX Learning Platform and the Next Generation of Online and Blended Courses</h2>
+
+      <p><strong>CAMBRIDGE, MA and SANTA CLARA, CA (PyCon 2013) &ndash; March 14, 2013 &ndash; </strong> <a href="https://www.edx.org/">EdX</a>, the not-for-profit online learning enterprise founded by <a href="http://harvard.edu">Harvard University</a> and the <a href="http://www.mit.edu">Massachusetts Institute of Technology</a> (MIT), today released its XBlock SDK to the general public under the Affero GPL open source license.   XBlock is the underlying architecture supporting the rich, interactive course content found in edX courses.  With XBlock, educational institutions are able to go far beyond simple text and videos to deliver interactive learning built specifically for the Internet environment.  The release of the XBlock source code marks the first step toward edX’s vision of creating an open online learning platform that mirrors the collaborative philosophy of MOOCs themselves and is an invitation to the global community of developers to work with edX to deliver the world’s best and most accessible online learning experience.</p>
+
+      <p>XBlock is a component architecture that enables developers to create independent course components, or XBlocks, that are able to work seamlessly with other components in the construction and presentation of an online course.  Course authors are able to combine XBlocks from a variety of sources – from text and video to sophisticated wiki-based collaborative learning environments and online laboratories – to create rich engaging online courses.  The XBlock architecture will enable the easy integration of next generation education tools like the circuit simulator in edX’s popular <a href="https://www.edx.org/courses/MITx/6.002x/2013_Spring/about">Circuits and Electronics</a> course (6.002x) and the molecular manipulator in the new <a href="https://www.edx.org/courses/MITx/7.00x/2013_Spring/about">Introduction to Biology – The Secret of Life</a> course (7.00x) taught by Eric Lander, one of the leaders of the Human Genome Project.</p>
+
+      <p>XBlock is not limited to just delivering courses.  A complete educational ecosystem will make use of a number of web applications, all of which require access to course content and data.  XBlocks provide the structure and APIs needed to build components for use by those applications.  edX will be working with independent developers to continue to extend the functionality of XBlock through the XBlock SDK and future open source initiatives.</p>
+
+      <p>“From its beginning, edX has been committed to developing the world’s best learning platform and tapping our global community to help us get there,” said Rob Rubin, edX Vice President of Engineering. “We look forward to working with the world’s developers, educators and researchers to help evolve the platform and ensure that everyone, everywhere has access to the world-class education that edX provides.”</p>
+
+      <p>The XBlock source code is available immediately and can be accessed at <a href="http://github.com/edX/XBlock">http://github.com/edX/XBlock</a>.</p>
+
+      <h2>About edX</h2>
+
+      <p><a href="https://www.edx.org/">EdX</a> is a not-for-profit enterprise of its founding partners <a href="http://www.harvard.edu">Harvard University</a> and the <a href="http://www.mit.edu">Massachusetts Institute of Technology</a> focused on transforming online and on-campus learning through groundbreaking methodologies, game-like experiences and cutting-edge research. EdX provides inspirational and transformative knowledge to students of all ages, social status, and income who form worldwide communities of learners. EdX uses its open source technology to transcend physical and social borders. We’re focused on people, not profit. EdX is based in Cambridge, Massachusetts in the USA.</p>
+
+      <section class="contact">
+        <p><strong>Media Contacts:</strong></p>
+        <p>Dan O'Connell</p>
+        <p>oconnell@edx.org</p>
+        <p>(617) 480-6585</p>
+        <br/>
+        <p>Gerald Kimber White</p>
+        <p>gerald.kimberwhite@rfbinder.com</p>
+        <p>781-455-8250</p>
+      </section>
+
+      <section class="footer">
+        <hr class="horizontal-divider"/>
+        <div class="logo"></div><h3 class="date">03 - 15 - 2013</h3>
+        <div class="social-sharing">
+          <hr class="horizontal-divider"/>
+          <p>Share with friends and family:</p>
+          <a href="http://twitter.com/intent/tweet?text=edX+Takes+First+Step+toward+Open+Source+Vision+by+Releasing+XBlock+SDK:+http://www.edx.org/press/xblock-announcement" class="share">
+          <img src="${static.url('images/social/twitter-sharing.png')}"/></a>
+          <a href="mailto:?subject=edX%20Takes%20First%20Step%20toward%20Open%20Source%20Vision%20by%20Releasing%20XBlock%20SDK…http://www.edx.org/press/xblock-announcement" class="share">
+          <img src="${static.url('images/social/email-sharing.png')}"/></a>
+          <div class="fb-like" data-href="http://edx.org/press/xblock-announcement" data-send="true" data-width="450" data-show-faces="true"></div>
+        </div>
+      </section>
+    </article>
+  </section>
+</section>
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 6b87860fad..c9ea907263 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -31,8 +31,8 @@
         // when a form is successfully filled out, return back to the dashboard.
         location.href="${reverse('dashboard')}";
       } else {
-    	// 	This is performed by the following code that parses the errors returned as json by the 
-    	// 	registration form validation. 
+    	// 	This is performed by the following code that parses the errors returned as json by the
+    	// 	registration form validation.
         var field_errors = json.field_errors;
         var non_field_errors = json.non_field_errors;
         var fieldname;
@@ -55,7 +55,7 @@
 
           $("[id='"+field_id+"']").addClass('error');
 
-          field_errorlist = field_errors[fieldname];      
+          field_errorlist = field_errors[fieldname];
           for (i=0; i < field_errorlist.length; i+= 1) {
             field_error = field_errorlist[i];
             error_msg = '<span class="field-name">' + field_label + ':</span>' + '<span class="field-error">' + field_error + '</span>';
@@ -88,24 +88,24 @@
   </script>
 </%block>
 
-<section class="testcenter-register container">    
-  
+<section class="testcenter-register container">
+
   <section class="introduction">
     <header>
       <hgroup>
-        <h2><a href="${reverse('dashboard')}">${get_course_about_section(course, 'university')} ${course.number} ${course.title}</a></h2>      
-        
+        <h2><a href="${reverse('dashboard')}">${get_course_about_section(course, 'university')} ${course.number} ${course.display_name_with_default}</a></h2>
+
         % if registration:
         <h1>Your Pearson VUE Proctored Exam Registration</h1>
-        % else: 
+        % else:
         <h1>Register for a Pearson VUE Proctored Exam</h1>
         % endif
       </hgroup>
     </header>
   </section>
-  
-  <% 
-    exam_help_href = "mailto:exam-help@edx.org?subject=Pearson VUE Exam - " + get_course_about_section(course, 'university') + " - " + course.number 
+
+  <%
+    exam_help_href = "mailto:exam-help@edx.org?subject=Pearson VUE Exam - " + get_course_about_section(course, 'university') + " - " + course.number
   %>
 
   % if registration:
@@ -118,14 +118,14 @@
     </section>
     % endif
 
-    % if registration.demographics_is_rejected:      
+    % if registration.demographics_is_rejected:
     <section class="status message message-flash demographics-rejected message-action is-shown">
       <h3 class="message-title">Your demographic information contained an error and was rejected</h3>
       <p class="message-copy">Please check the information you provided, and correct the errors noted below.
     </section>
     % endif
-   
-    % if registration.registration_is_rejected:      
+
+    % if registration.registration_is_rejected:
     <section class="status message message-flash registration-rejected message-action is-shown">
       <h3 class="message-title">Your registration for the Pearson exam has been rejected</h3>
       <p class="message-copy">Please see your <strong>registration status</strong> details for more information.</p>
@@ -140,14 +140,14 @@
     % endif
 
   % endif
-  
+
   <section class="content">
     <header>
       <h3 class="is-hidden">Registration Form</h3>
     </header>
-  % if exam_info.is_registering():  
+  % if exam_info.is_registering():
     <form id="testcenter_register_form" method="post" data-remote="true" action="/create_exam_registration">
-  % else:    
+  % else:
     <form id="testcenter_register_form" method="post" data-remote="true" action="/create_exam_registration" class="disabled">
       <!-- registration closed, so tell them they can't do anything: -->
       <div class="status message registration-closed is-shown">
@@ -155,12 +155,12 @@
         <p class="message-copy">Your previous information is available below, however you may not edit any of the information.
       </div>
   % endif
-      
+
       % if registration:
       <p class="instructions">
-        Please use the following form if you need to update your demographic information used in your Pearson VUE Proctored Exam. Required fields are noted by <strong class="indicator">bold text and an asterisk (*)</strong>. 
+        Please use the following form if you need to update your demographic information used in your Pearson VUE Proctored Exam. Required fields are noted by <strong class="indicator">bold text and an asterisk (*)</strong>.
       </p>
-      % else: 
+      % else:
       <p class="instructions">
         Please provide the following demographic information to register for a Pearson VUE Proctored Exam. Required fields are noted by <strong class="indicator">bold text and an asterisk (*)</strong>.
       </p>
@@ -175,11 +175,11 @@
       <div class="form-fields-primary">
         <fieldset class="group group-form group-form-personalinformation">
           <legend class="is-hidden">Personal Information</legend>
-          
+
           <ol class="list-input">
             <li class="field" id="field-salutation">
               <label for="salutation">Salutation</label>
-              <input class="short" id="salutation" type="text" name="salutation" value="${testcenteruser.salutation}" placeholder="e.g. Mr., Ms., Mrs., Dr." />              
+              <input class="short" id="salutation" type="text" name="salutation" value="${testcenteruser.salutation}" placeholder="e.g. Mr., Ms., Mrs., Dr." />
             </li>
             <li class="field required" id="field-first_name">
               <label for="first_name">First Name </label>
@@ -199,14 +199,14 @@
             </li>
           </ol>
         </fieldset>
-        
+
         <fieldset class="group group-form group-form-mailingaddress">
           <legend class="is-hidden">Mailing Address</legend>
-          
+
           <ol class="list-input">
             <li class="field required" id="field-address_1">
               <label class="long" for="address_1">Address Line #1</label>
-              <input id="address_1" type="text" name="address_1" value="${testcenteruser.address_1}" placeholder="e.g. 112 Mercer Street" />              
+              <input id="address_1" type="text" name="address_1" value="${testcenteruser.address_1}" placeholder="e.g. 112 Mercer Street" />
             </li>
             <li class="field-group addresses">
               <div class="field" id="field-address_2">
@@ -221,7 +221,7 @@
             <li class="field required postal-1" id="field-city">
               <label for="city">City</label>
               <input id="city" class="long" type="text" name="city" value="${testcenteruser.city}" placeholder="e.g. Newark" />
-            </li>         
+            </li>
             <li class="field-group postal-2">
               <div class="field" id="field-state">
                 <label for="state">State/Province</label>
@@ -238,15 +238,15 @@
             </li>
           </ol>
         </fieldset>
-        
+
         <fieldset class="group group-form group-form-contactinformation">
           <legend class="is-hidden">Contact &amp; Other Information</legend>
-          
+
           <ol class="list-input">
             <li class="field-group phoneinfo">
               <div class="field required" id="field-phone">
                 <label for="phone">Phone Number</label>
-                <input id="phone" type="tel" name="phone" value="${testcenteruser.phone}" />              
+                <input id="phone" type="tel" name="phone" value="${testcenteruser.phone}" />
               </div>
               <div class="field" id="field-extension">
                 <label for="extension">Extension</label>
@@ -274,12 +274,12 @@
           </ol>
         </fieldset>
       </div>
-      
+
       % if registration:
         % if registration.accommodation_request and len(registration.accommodation_request) > 0:
       <div class="form-fields-secondary is-shown disabled" id="form-fields-secondary">
         % endif
-      % else: 
+      % else:
       <div class="form-fields-secondary" id="form-fields-secondary">
       % endif
 
@@ -287,13 +287,13 @@
           % if registration.accommodation_request and len(registration.accommodation_request) > 0:
         <p class="note"><span class="title">Note</span>: Your previous accommodation request below needs to be reviewed in detail <strong>and will add a significant delay to your registration process</strong>.</p>
           % endif
-        % else: 
+        % else:
         <p class="note"><span class="title">Note</span>: Accommodation requests are not part of your demographic information, <strong>and cannot be changed once submitted</strong>. Accommodation requests, which are reviewed on a case-by-case basis, <strong>will add significant delay to the registration process</strong>.</p>
         % endif
-                  
+
         <fieldset class="group group-form group-form-optional">
           <legend class="is-hidden">Optional Information</legend>
-          
+
           <ol class="list-input">
             % if registration:
               % if registration.accommodation_request and len(registration.accommodation_request) > 0:
@@ -302,21 +302,21 @@
               <p class="value" id="accommodations">${registration.accommodation_request}</p>
             </li>
               % endif
-            % else: 
+            % else:
             <li class="field" id="field-accommodation_request">
               <label for="accommodation_request">Accommodations Requested</label>
-              <textarea class="long" id="accommodation_request" name="accommodation_request" value="" placeholder=""></textarea>             
+              <textarea class="long" id="accommodation_request" name="accommodation_request" value="" placeholder=""></textarea>
             </li>
             % endif
           </ol>
         </fieldset>
       </div>
-      
+
       <div class="form-actions">
         % if registration:
         <button type="submit" id="submit" class="action action-primary action-update">Update Demographics</button>
         <a href="${reverse('dashboard')}" class="action action-secondary action-cancel">Cancel Update</a>
-        % else: 
+        % else:
         <button type="submit" id="submit" class="action action-primary action-register">Register for Pearson VUE Test</button>
         <a href="${reverse('dashboard')}" class="action action-secondary action-cancel">Cancel Registration</a>
         % endif
@@ -325,68 +325,68 @@
           <p id="submission-error-heading" class="message-copy"></p>
           <ul id="submission-error-list"></ul>
         </div>
-      </div>      
+      </div>
     </form>
 
     % if registration:
       % if registration.accommodation_request and len(registration.accommodation_request) > 0:
     <a class="actions form-fields-secondary-visibility is-hidden" href="#form-fields-secondary">Special (<abbr title="Americans with Disabilities Act">ADA</abbr>) Accommodations</a>
       % endif
-    % else: 
+    % else:
     <a class="actions form-fields-secondary-visibility" href="#form-fields-secondary">Special (<abbr title="Americans with Disabilities Act">ADA</abbr>) Accommodations</a>
     % endif
   </section>
-    
+
   <aside>
    % if registration:
 
-    % if registration.is_accepted:     
+    % if registration.is_accepted:
     <div class="message message-status registration-processed is-shown">
-    % endif     
-    % if registration.is_rejected:     
+    % endif
+    % if registration.is_rejected:
     <div class="message message-status registration-rejected is-shown">
-    % endif     
-    % if registration.is_pending:     
+    % endif
+    % if registration.is_pending:
     <div class="message message-status registration-pending is-shown">
-    % endif     
+    % endif
       <h3>Pearson Exam Registration Status</h3>
 
       <ol class="status-list">
         <!-- first provide status of demographics -->
-        % if registration.demographics_is_pending:     
+        % if registration.demographics_is_pending:
         <li class="item status status-pending status-demographics">
           <h4 class="title">Demographic Information</h4>
           <p class="details">The demographic information you most recently provided is pending. You may edit this information at any point before exam registration closes on <strong>${exam_info.registration_end_date_text}</strong></p>
         </li>
-        % endif     
-        % if registration.demographics_is_accepted:     
+        % endif
+        % if registration.demographics_is_accepted:
         <li class="item status status-processed status-demographics">
           <h4 class="title">Demographic Information</h4>
           <p class="details">The demographic information you most recently provided has been processed. You may edit this information at any point before exam registration closes on <strong>${exam_info.registration_end_date_text}</strong></p>
         </li>
-        % endif     
-        % if registration.demographics_is_rejected:     
+        % endif
+        % if registration.demographics_is_rejected:
         <li class="item status status-rejected status-demographics">
           <h4 class="title">Demographic Information</h4>
           <p class="details">The demographic information you most recently provided has been rejected by Pearson. You can correct and submit it again before the exam registration closes on <strong>${exam_info.registration_end_date_text}</strong>.
           The error message is:</p>
-          
+
           <ul class="error-list">
             <li class="item">${registration.testcenter_user.upload_error_message}.</li>
           </ul>
-          
+
           <p class="action">If the error is not correctable by revising your demographic information, please <a class="contact-link" href="${exam_help_href}">contact edX at exam-help@edx.org</a>.</p>
         </li>
-        % endif     
+        % endif
 
         <!-- then provide status of accommodations, if any -->
-        % if registration.accommodation_is_pending:     
+        % if registration.accommodation_is_pending:
         <li class="item status status-pending status-accommodations">
           <h4 class="title">Accommodations Request</h4>
           <p class="details">Your requested accommodations are pending. Within a few days, you should see confirmation here of granted accommodations.</p>
         </li>
-        % endif     
-        % if registration.accommodation_is_accepted:     
+        % endif
+        % if registration.accommodation_is_accepted:
         <li class="item status status-processed status-accommodations">
           <h4 class="title">Accommodations Request</h4>
           <p class="details">Your requested accommodations have been reviewed and processed. You are allowed:</p>
@@ -395,50 +395,50 @@
             % for accommodation_name in registration.get_accommodation_names():
             <li class="item">${accommodation_name}</li>
             % endfor
-          </ul> 
+          </ul>
         </li>
-        % endif     
-        % if registration.accommodation_is_rejected:     
+        % endif
+        % if registration.accommodation_is_rejected:
         <li class="item status status-processed status-accommodations">
           <h4 class="title">Accommodations Request</h4>
           <p class="details">Your requested accommodations have been reviewed and processed. You are allowed no accommodations.</p>
-          
+
           <p class="action">Please <a class="contact-link" href="${exam_help_href}">contact edX at exam-help@edx.org</a> if you have any questions.</p>
         </li>
-        % endif     
+        % endif
 
         <!-- finally provide status of registration -->
-        % if registration.registration_is_pending:     
+        % if registration.registration_is_pending:
         <li class="item status status-pending status-registration">
           <h4 class="title">Registration Request</h4>
           <p class="details">Your exam registration is pending. Once your information is processed, it will be forwarded to Pearson and you will be able to schedule an exam.</p>
         </li>
-        % endif     
-        % if registration.registration_is_accepted:     
+        % endif
+        % if registration.registration_is_accepted:
         <li class="item status status-processed status-registration">
           <h4 class="title">Registration Request</h4>
           <p class="details">Your exam registration has been processed and has been forwarded to Pearson. <strong>You are now able to <a href="${registration.registration_signup_url}" class="exam-link">schedule a Pearson exam</a></strong>.</p>
         </li>
-        % endif     
-        % if registration.registration_is_rejected:     
+        % endif
+        % if registration.registration_is_rejected:
         <li class="item status status-rejected status-registration">
           <h4 class="title">Registration Request</h4>
           <p class="details">Your exam registration has been rejected by Pearson. <strong>You currently cannot schedule an exam</strong>. The errors found include:</p>
-          
+
           <ul class="error-list">
             <li class="item">${registration.upload_error_message}</li>
           </ul>
-          
+
           <p class="action">Please <a class="contact-link" href="${exam_help_href}">contact edX at exam-help@edx.org</a>.</p>
         </li>
         % endif
       </ol>
-   
+
    </div>
-   
+
 
    % endif
-    
+
     <div class="details details-course">
       <h4>About ${get_course_about_section(course, 'university')} ${course.number}</h4>
       <p>
@@ -451,27 +451,27 @@
       % endif
       </p>
     </div>
-    
+
     <div class="details details-registration">
       <h4>Pearson VUE Test Details</h4>
       % if exam_info is not None:
         <ul>
           <li>
-            <span class="label">Exam Name:</span> <span class="value">${exam_info.display_name}</span>
+            <span class="label">Exam Name:</span> <span class="value">${exam_info.display_name_with_default}</span>
           </li>
           <li>
             <span class="label">First Eligible Appointment Date:</span> <span class="value">${exam_info.first_eligible_appointment_date_text}</span>
           </li>
           <li>
             <span class="label">Last Eligible Appointment Date:</span> <span class="value">${exam_info.last_eligible_appointment_date_text}</span>
-          </li>            
+          </li>
           <li>
             <span class="label">Registration Ends:</span> <span class="value">${exam_info.registration_end_date_text}</span>
-          </li>            
+          </li>
         </ul>
       % endif
     </div>
-    
+
     <div class="details details-contact">
       <h4>Questions</h4>
       <p>If you have a specific question pertaining to your registration, you may <a class="contact-link" href="${exam_help_href}">contact edX at exam-help@edx.org</a>.</p>
diff --git a/lms/templates/video.html b/lms/templates/video.html
index afbb9015ee..24785abf72 100644
--- a/lms/templates/video.html
+++ b/lms/templates/video.html
@@ -16,7 +16,7 @@
            width="640" height="390"></embed>
   </object>
 %else:
-  <div id="video_${id}" class="video" data-streams="${streams}" data-caption-data-dir="${data_dir}" data-show-captions="${show_captions}" data-start="${start}" data-end="${end}" data-caption-asset-path="${caption_asset_path}">
+  <div id="video_${id}" class="video" data-streams="${streams}" data-show-captions="${show_captions}" data-start="${start}" data-end="${end}" data-caption-asset-path="${caption_asset_path}">
     <div class="tc-wrapper">
       <article class="video-wrapper">
         <section class="video-player">
diff --git a/lms/urls.py b/lms/urls.py
index f2ec45f402..ee213f2b8c 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -172,11 +172,13 @@ urlpatterns = ('',
     url(r'^press/edx-expands-internationally$', 'static_template_view.views.render',
         {'template': 'press_releases/edx_expands_internationally.html'},
         name="press/edx-expands-internationally"),
-
+    url(r'^press/xblock_announcement$', 'static_template_view.views.render',
+        {'template': 'press_releases/xblock_announcement.html'},
+        name="press/xblock-announcement"),
 
     # Should this always update to point to the latest press release?
     (r'^pressrelease$', 'django.views.generic.simple.redirect_to',
-     {'url': '/press/edx-expands-internationally'}),
+     {'url': '/press/xblock-announcement'}),
 
 
     (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/images/favicon.ico'}),
@@ -280,6 +282,15 @@ if settings.COURSEWARE_ENABLED:
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/pdfbook/(?P<book_index>[^/]*)/chapter/(?P<chapter>[^/]*)/(?P<page>[^/]*)$',
             'staticbook.views.pdf_index'),
 
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/htmlbook/(?P<book_index>[^/]*)/$',
+            'staticbook.views.html_index', name="html_book"),
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/htmlbook/(?P<book_index>[^/]*)/chapter/(?P<chapter>[^/]*)/$',
+            'staticbook.views.html_index'),
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/htmlbook/(?P<book_index>[^/]*)/chapter/(?P<chapter>[^/]*)/(?P<anchor_id>[^/]*)/$',
+            'staticbook.views.html_index'),
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/htmlbook/(?P<book_index>[^/]*)/(?P<anchor_id>[^/]*)/$',
+            'staticbook.views.html_index'),
+
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/courseware/?$',
             'courseware.views.index', name="courseware"),
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/courseware/(?P<chapter>[^/]*)/$',
diff --git a/lms/xmodule_namespace.py b/lms/xmodule_namespace.py
new file mode 100644
index 0000000000..4c04700a31
--- /dev/null
+++ b/lms/xmodule_namespace.py
@@ -0,0 +1,45 @@
+from xblock.core import Namespace, Boolean, Scope, String, List, Float
+from xmodule.fields import Date, Timedelta
+
+
+class StringyBoolean(Boolean):
+    def from_json(self, value):
+        if isinstance(value, basestring):
+            return value.lower() == 'true'
+        return value
+
+class StringyFloat(Float):
+    def from_json(self, value):
+        try:
+            return float(value)
+        except:
+            return None
+
+
+class LmsNamespace(Namespace):
+    hide_from_toc = StringyBoolean(
+        help="Whether to display this module in the table of contents",
+        default=False,
+        scope=Scope.settings
+    )
+    graded = Boolean(
+        help="Whether this module contributes to the final course grade",
+        default=False,
+        scope=Scope.settings
+    )
+    format = String(
+        help="What format this module is in (used for deciding which "
+             "grader to apply, and what to show in the TOC)",
+        scope=Scope.settings,
+    )
+
+    start = Date(help="Start time when this module is visible", scope=Scope.settings)
+    due = String(help="Date that this problem is due by", scope=Scope.settings, default='')
+    source_file = String(help="DO NOT USE", scope=Scope.settings)
+    xqa_key = String(help="DO NOT USE", scope=Scope.settings)
+    ispublic = Boolean(help="Whether this course is open to the public, or only to admins", scope=Scope.settings)
+    graceperiod = Timedelta(help="Amount of time after the due date that submissions will be accepted", scope=Scope.settings)
+    showanswer = String(help="When to show the problem answer to the student", scope=Scope.settings, default="closed")
+    rerandomize = String(help="When to rerandomize the problem", default="always", scope=Scope.settings)
+    days_early_for_beta = StringyFloat(help="Number of days early to show content to beta users", default=None, scope=Scope.settings)
+
diff --git a/local-requirements.txt b/local-requirements.txt
index a4d153dd36..de2d274719 100644
--- a/local-requirements.txt
+++ b/local-requirements.txt
@@ -1,3 +1,9 @@
 # Python libraries to install that are local to the mitx repo
 -e common/lib/capa
 -e common/lib/xmodule
+-e .
+
+# XBlock:
+# Might change frequently, so put it in local-requirements.txt,
+# but conceptually is an external package, so it is in a separate repo.
+-e git+ssh://git@github.com/MITx/xmodule-debugger@9a4f883a#egg=XBlock
diff --git a/rakefile b/rakefile
index f62e75507c..6d34684791 100644
--- a/rakefile
+++ b/rakefile
@@ -120,8 +120,8 @@ default_options = {
 }
 
 task :predjango do
-    sh("find . -type f -name '*.pyc' -delete")
-    sh('pip install -q --upgrade --no-deps -r local-requirements.txt')
+    sh("find . -type f -name *.pyc -delete")
+    sh('pip install -q --no-index -r local-requirements.txt')
 end
 
 task :clean_test_files do
@@ -140,12 +140,8 @@ end
 
     desc "Run pylint on all #{system} code"
     task "pylint_#{system}" => report_dir do
-        Dir["#{system}/djangoapps/*", "#{system}/lib/*"].each do |app|
-            if File.exists? "#{app}/setup.py"
-                pythonpath_prefix = "PYTHONPATH=#{app}"
-            else
-                pythonpath_prefix = "PYTHONPATH=#{File.dirname(app)}"
-            end
+        Dir["#{system}/*.py", "#{system}/djangoapps/*", "#{system}/lib/*"].each do |app|
+            pythonpath_prefix = "PYTHONPATH=#{system}:#{system}/djangoapps:#{system}/lib:common/djangoapps:common/lib"
             app = File.basename(app)
             if app =~ /.py$/
                 app = app.gsub('.py', '')
@@ -183,6 +179,12 @@ end
 
 TEST_TASK_DIRS = []
 
+task :fastlms do
+    # this is >2 times faster that rake [lms], and does not need web, good for local dev
+    django_admin = ENV['DJANGO_ADMIN_PATH'] || select_executable('django-admin.py', 'django-admin')
+    sh("#{django_admin} runserver --traceback --settings=lms.envs.dev   --pythonpath=.")
+end
+
 [:lms, :cms].each do |system|
     report_dir = report_dir_path(system)
 
@@ -197,6 +199,8 @@ TEST_TASK_DIRS = []
         run_tests(system, report_dir, args.stop_on_failure)
     end
 
+    task :fasttest => "fasttest_#{system}"
+
     TEST_TASK_DIRS << system
 
     desc <<-desc
@@ -415,7 +419,7 @@ end
 namespace :cms do
   desc "Delete existing MongoDB based course"
   task :delete_course do
-    
+
     if ENV['LOC'] and ENV['COMMIT']
         sh(django_admin(:cms, :dev, :delete_course, ENV['LOC'], ENV['COMMIT']))
     elsif ENV['LOC']
diff --git a/requirements.txt b/requirements.txt
index 204ec85889..3dc732e013 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,61 +1,61 @@
-django==1.4.3
-pip
-numpy==1.6.2
-scipy==0.11.0
-Markdown==2.2.1
-pygments==1.5
-lxml==3.0.1
-boto==2.6.0
-mako==0.7.3
-python-memcached==1.48
-python-openid==2.2.5
-path.py
-django_debug_toolbar
-fs==0.4.0
-beautifulsoup==3.2.1
+-r repo-requirements.txt
 beautifulsoup4==4.1.3
-feedparser==5.1.3
-requests==0.14.2
-http://sympy.googlecode.com/files/sympy-0.7.1.tar.gz
-newrelic==1.8.0.13
-glob2==0.3
-pymongo==2.4.1
-django_nose==1.1
-nosexcover==1.0.7
-rednose==0.3.3
-GitPython==0.3.2.RC1
-mock==0.8.0
-PyYAML==3.10
-South==0.7.6
-pytz==2012h
+beautifulsoup==3.2.1
+boto==2.6.0
 django-celery==3.0.11
 django-countries==1.5
-django-kombu==0.9.4
+django-debug-toolbar-mongo
 django-followit==0.0.3
 django-jasmine==0.3.2
 django-keyedcache==1.4-6
+django-kombu==0.9.4
 django-mako==0.1.5pre
 django-masquerade==0.1.6
+django-mptt==0.5.5
 django-openid-auth==0.4
 django-robots==0.9.1
+django-sekizai==0.6.1
 django-ses==0.4.1
 django-storages==1.1.5
 django-threaded-multihost==1.4-1
-django-sekizai==0.6.1
-django-mptt==0.5.5
-sorl-thumbnail==11.12
-networkx==1.7
-pygraphviz==1.1
--r repo-requirements.txt
-nltk==2.0.4
-django-debug-toolbar-mongo
-dogstatsd-python==0.2.1
-MySQL-python==1.2.4c1
-sphinx==1.1.3
-factory_boy
-Shapely==1.2.16
-ipython==0.13.1
-xmltodict==0.4.1
-paramiko==1.9.0
-Pillow==1.7.8
+django==1.4.3
+django_debug_toolbar
+django_nose==1.1
 dogapi==1.2.1
+dogstatsd-python==0.2.1
+factory_boy
+feedparser==5.1.3
+fs==0.4.0
+GitPython==0.3.2.RC1
+glob2==0.3
+http://sympy.googlecode.com/files/sympy-0.7.1.tar.gz
+ipython==0.13.1
+lxml==3.0.1
+mako==0.7.3
+Markdown==2.2.1
+mock==0.8.0
+MySQL-python==1.2.4c1
+networkx==1.7
+newrelic==1.8.0.13
+nltk==2.0.4
+nosexcover==1.0.7
+numpy==1.6.2
+paramiko==1.9.0
+path.py
+Pillow==1.7.8
+pip
+pygments==1.5
+pygraphviz==1.1
+pymongo==2.4.1
+python-memcached==1.48
+python-openid==2.2.5
+pytz==2012h
+PyYAML==3.10
+rednose==0.3.3
+requests==0.14.2
+scipy==0.11.0
+Shapely==1.2.16
+sorl-thumbnail==11.12
+South==0.7.6
+sphinx==1.1.3
+xmltodict==0.4.1
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000000..48572de6de
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,19 @@
+from setuptools import setup, find_packages
+
+setup(
+    name="edX Apps",
+    version="0.1",
+    install_requires=['distribute'],
+    requires=[
+        'xmodule',
+    ],
+    py_modules=['lms.xmodule_namespace', 'cms.xmodule_namespace'],
+    # See http://guide.python-distribute.org/creation.html#entry-points
+    # for a description of entry_points
+    entry_points={
+        'xblock.namespace': [
+            'lms = lms.xmodule_namespace:LmsNamespace',
+            'cms = cms.xmodule_namespace:CmsNamespace',
+        ],
+    }
+)
\ No newline at end of file
diff --git a/test-requirements.txt b/test-requirements.txt
index 4706e239a5..d9db89f107 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,10 +1,7 @@
-django-nose
-coverage
-nosexcover
-pylint
-pep8
-lettuce
-selenium
-factory_boy
-splinter
+coverage==3.6
+pylint==0.27.0
+pep8==1.4.5
+lettuce==0.2.15
+selenium==2.31.0
+splinter==0.5.0