From aa96d401f8fcd2e1996171c78a5aec4d25593c7e Mon Sep 17 00:00:00 2001
From: Austin Cory Bart <acbart@vt.edu>
Date: Wed, 7 Aug 2019 08:35:14 -0400
Subject: [PATCH] Bug fixes

---
 .babelrc                 |     3 +
 .idea/workspace.xml      |    38 +-
 dist/block_mirror.css    |   391 --
 dist/block_mirror.js     | 11758 ++++++++++++++++++++-----------------
 package-lock.json        |  4105 +++++++++----
 package.json             |    16 +-
 src/ast/ast_Call.js      |    11 +-
 src/ast/ast_ClassDef.js  |     6 +-
 src/ast/ast_functions.js |    70 +-
 src/block_editor.js      |   154 +-
 src/block_mirror.js      |    29 +-
 src/text_editor.js       |    28 +-
 src/text_to_blocks.js    |    22 +-
 src/toolbars.js          |   100 +
 test/simple_dev.html     |     1 +
 webpack.config.js        |    28 +-
 16 files changed, 10003 insertions(+), 6757 deletions(-)
 create mode 100644 .babelrc
 create mode 100644 src/toolbars.js

diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..8aa924d
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["@babel/preset-env"]
+}
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 799bc58..38b7756 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,20 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="fe00182d-05fa-4529-8d2b-92bd952d65d2" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/.babelrc" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/toolbars.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/dist/block_mirror.css" beforeDir="false" afterPath="$PROJECT_DIR$/dist/block_mirror.css" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/dist/block_mirror.js" beforeDir="false" afterPath="$PROJECT_DIR$/dist/block_mirror.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/ast/ast_Call.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Call.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ast/ast_Comp.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Comp.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ast/ast_FunctionDef.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_FunctionDef.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_ClassDef.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_ClassDef.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_functions.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_functions.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/block_editor.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/block_editor.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/block_mirror.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/block_mirror.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/text_editor.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/text_editor.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/simple.html" beforeDir="false" afterPath="$PROJECT_DIR$/test/simple.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/text_to_blocks.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/text_to_blocks.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/test/simple_dev.html" beforeDir="false" afterPath="$PROJECT_DIR$/test/simple_dev.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/webpack.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/webpack.config.js" afterDir="false" />
     </list>
@@ -85,7 +90,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="npm.build">
+  <component name="RunManager" selected="npm.devbuild">
     <configuration name="webpack.config.js" type="NodeJSConfigurationType" temporary="true" nameIsGenerated="true" path-to-js-file="webpack.config.js" working-dir="$PROJECT_DIR$">
       <method v="2" />
     </configuration>
@@ -99,12 +104,24 @@
       <envs />
       <method v="2" />
     </configuration>
+    <configuration name="devbuild" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
+      <package-json value="$PROJECT_DIR$/package.json" />
+      <command value="run" />
+      <scripts>
+        <script value="devbuild" />
+      </scripts>
+      <node-interpreter value="project" />
+      <envs />
+      <method v="2" />
+    </configuration>
     <list>
       <item itemvalue="Node.js.webpack.config.js" />
       <item itemvalue="npm.build" />
+      <item itemvalue="npm.devbuild" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="npm.devbuild" />
         <item itemvalue="npm.build" />
         <item itemvalue="Node.js.webpack.config.js" />
       </list>
@@ -125,6 +142,19 @@
       <workItem from="1563925130756" duration="17000" />
       <workItem from="1563926206114" duration="40569000" />
       <workItem from="1564112387987" duration="1691000" />
+      <workItem from="1564150717925" duration="4000" />
+      <workItem from="1564194355295" duration="6795000" />
+      <workItem from="1564373913220" duration="4347000" />
+      <workItem from="1564405679276" duration="275000" />
+      <workItem from="1564408427527" duration="88000" />
+      <workItem from="1564414212624" duration="4470000" />
+      <workItem from="1564662808985" duration="1025000" />
+      <workItem from="1564895575540" duration="1685000" />
+      <workItem from="1564949914358" duration="2354000" />
+      <workItem from="1565065547361" duration="2791000" />
+      <workItem from="1565112500562" duration="657000" />
+      <workItem from="1565131777631" duration="606000" />
+      <workItem from="1565155525428" duration="727000" />
     </task>
     <task id="LOCAL-00001" summary="Basics of packaging, bug fixes, better updating">
       <created>1564063805490</created>
diff --git a/dist/block_mirror.css b/dist/block_mirror.css
index b2ec407..a4cce5d 100644
--- a/dist/block_mirror.css
+++ b/dist/block_mirror.css
@@ -1,394 +1,3 @@
-/* BASICS */
-
-.CodeMirror {
-  /* Set height, width, borders, and global font properties here */
-  font-family: monospace;
-  height: 300px;
-  color: black;
-  direction: ltr;
-}
-
-/* PADDING */
-
-.CodeMirror-lines {
-  padding: 4px 0; /* Vertical padding around content */
-}
-.CodeMirror pre {
-  padding: 0 4px; /* Horizontal padding of content */
-}
-
-.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  background-color: white; /* The little square between H and V scrollbars */
-}
-
-/* GUTTER */
-
-.CodeMirror-gutters {
-  border-right: 1px solid #ddd;
-  background-color: #f7f7f7;
-  white-space: nowrap;
-}
-.CodeMirror-linenumbers {}
-.CodeMirror-linenumber {
-  padding: 0 3px 0 5px;
-  min-width: 20px;
-  text-align: right;
-  color: #999;
-  white-space: nowrap;
-}
-
-.CodeMirror-guttermarker { color: black; }
-.CodeMirror-guttermarker-subtle { color: #999; }
-
-/* CURSOR */
-
-.CodeMirror-cursor {
-  border-left: 1px solid black;
-  border-right: none;
-  width: 0;
-}
-/* Shown when moving in bi-directional text */
-.CodeMirror div.CodeMirror-secondarycursor {
-  border-left: 1px solid silver;
-}
-.cm-fat-cursor .CodeMirror-cursor {
-  width: auto;
-  border: 0 !important;
-  background: #7e7;
-}
-.cm-fat-cursor div.CodeMirror-cursors {
-  z-index: 1;
-}
-.cm-fat-cursor-mark {
-  background-color: rgba(20, 255, 20, 0.5);
-  -webkit-animation: blink 1.06s steps(1) infinite;
-  -moz-animation: blink 1.06s steps(1) infinite;
-  animation: blink 1.06s steps(1) infinite;
-}
-.cm-animate-fat-cursor {
-  width: auto;
-  border: 0;
-  -webkit-animation: blink 1.06s steps(1) infinite;
-  -moz-animation: blink 1.06s steps(1) infinite;
-  animation: blink 1.06s steps(1) infinite;
-  background-color: #7e7;
-}
-@-moz-keyframes blink {
-  0% {}
-  50% { background-color: transparent; }
-  100% {}
-}
-@-webkit-keyframes blink {
-  0% {}
-  50% { background-color: transparent; }
-  100% {}
-}
-@keyframes blink {
-  0% {}
-  50% { background-color: transparent; }
-  100% {}
-}
-
-/* Can style cursor different in overwrite (non-insert) mode */
-.CodeMirror-overwrite .CodeMirror-cursor {}
-
-.cm-tab { display: inline-block; text-decoration: inherit; }
-
-.CodeMirror-rulers {
-  position: absolute;
-  left: 0; right: 0; top: -50px; bottom: -20px;
-  overflow: hidden;
-}
-.CodeMirror-ruler {
-  border-left: 1px solid #ccc;
-  top: 0; bottom: 0;
-  position: absolute;
-}
-
-/* DEFAULT THEME */
-
-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-.cm-strikethrough {text-decoration: line-through;}
-
-.cm-s-default .cm-keyword {color: #708;}
-.cm-s-default .cm-atom {color: #219;}
-.cm-s-default .cm-number {color: #164;}
-.cm-s-default .cm-def {color: #00f;}
-.cm-s-default .cm-variable,
-.cm-s-default .cm-punctuation,
-.cm-s-default .cm-property,
-.cm-s-default .cm-operator {}
-.cm-s-default .cm-variable-2 {color: #05a;}
-.cm-s-default .cm-variable-3, .cm-s-default .cm-type {color: #085;}
-.cm-s-default .cm-comment {color: #a50;}
-.cm-s-default .cm-string {color: #a11;}
-.cm-s-default .cm-string-2 {color: #f50;}
-.cm-s-default .cm-meta {color: #555;}
-.cm-s-default .cm-qualifier {color: #555;}
-.cm-s-default .cm-builtin {color: #30a;}
-.cm-s-default .cm-bracket {color: #997;}
-.cm-s-default .cm-tag {color: #170;}
-.cm-s-default .cm-attribute {color: #00c;}
-.cm-s-default .cm-hr {color: #999;}
-.cm-s-default .cm-link {color: #00c;}
-
-.cm-s-default .cm-error {color: #f00;}
-.cm-invalidchar {color: #f00;}
-
-.CodeMirror-composing { border-bottom: 2px solid; }
-
-/* Default styles for common addons */
-
-div.CodeMirror span.CodeMirror-matchingbracket {color: #0b0;}
-div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
-.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
-.CodeMirror-activeline-background {background: #e8f2ff;}
-
-/* STOP */
-
-/* The rest of this file contains styles related to the mechanics of
-   the editor. You probably shouldn't touch them. */
-
-.CodeMirror {
-  position: relative;
-  overflow: hidden;
-  background: white;
-}
-
-.CodeMirror-scroll {
-  overflow: scroll !important; /* Things will break if this is overridden */
-  /* 30px is the magic margin used to hide the element's real scrollbars */
-  /* See overflow: hidden in .CodeMirror */
-  margin-bottom: -30px; margin-right: -30px;
-  padding-bottom: 30px;
-  height: 100%;
-  outline: none; /* Prevent dragging from highlighting the element */
-  position: relative;
-}
-.CodeMirror-sizer {
-  position: relative;
-  border-right: 30px solid transparent;
-}
-
-/* The fake, visible scrollbars. Used to force redraw during scrolling
-   before actual scrolling happens, thus preventing shaking and
-   flickering artifacts. */
-.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  position: absolute;
-  z-index: 6;
-  display: none;
-}
-.CodeMirror-vscrollbar {
-  right: 0; top: 0;
-  overflow-x: hidden;
-  overflow-y: scroll;
-}
-.CodeMirror-hscrollbar {
-  bottom: 0; left: 0;
-  overflow-y: hidden;
-  overflow-x: scroll;
-}
-.CodeMirror-scrollbar-filler {
-  right: 0; bottom: 0;
-}
-.CodeMirror-gutter-filler {
-  left: 0; bottom: 0;
-}
-
-.CodeMirror-gutters {
-  position: absolute; left: 0; top: 0;
-  min-height: 100%;
-  z-index: 3;
-}
-.CodeMirror-gutter {
-  white-space: normal;
-  height: 100%;
-  display: inline-block;
-  vertical-align: top;
-  margin-bottom: -30px;
-}
-.CodeMirror-gutter-wrapper {
-  position: absolute;
-  z-index: 4;
-  background: none !important;
-  border: none !important;
-}
-.CodeMirror-gutter-background {
-  position: absolute;
-  top: 0; bottom: 0;
-  z-index: 4;
-}
-.CodeMirror-gutter-elt {
-  position: absolute;
-  cursor: default;
-  z-index: 4;
-}
-.CodeMirror-gutter-wrapper ::selection { background-color: transparent }
-.CodeMirror-gutter-wrapper ::-moz-selection { background-color: transparent }
-
-.CodeMirror-lines {
-  cursor: text;
-  min-height: 1px; /* prevents collapsing before first draw */
-}
-.CodeMirror pre {
-  /* Reset some styles that the rest of the page might have set */
-  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
-  border-width: 0;
-  background: transparent;
-  font-family: inherit;
-  font-size: inherit;
-  margin: 0;
-  white-space: pre;
-  word-wrap: normal;
-  line-height: inherit;
-  color: inherit;
-  z-index: 2;
-  position: relative;
-  overflow: visible;
-  -webkit-tap-highlight-color: transparent;
-  -webkit-font-variant-ligatures: contextual;
-  font-variant-ligatures: contextual;
-}
-.CodeMirror-wrap pre {
-  word-wrap: break-word;
-  white-space: pre-wrap;
-  word-break: normal;
-}
-
-.CodeMirror-linebackground {
-  position: absolute;
-  left: 0; right: 0; top: 0; bottom: 0;
-  z-index: 0;
-}
-
-.CodeMirror-linewidget {
-  position: relative;
-  z-index: 2;
-  padding: 0.1px; /* Force widget margins to stay inside of the container */
-}
-
-.CodeMirror-widget {}
-
-.CodeMirror-rtl pre { direction: rtl; }
-
-.CodeMirror-code {
-  outline: none;
-}
-
-/* Force content-box sizing for the elements where we expect it */
-.CodeMirror-scroll,
-.CodeMirror-sizer,
-.CodeMirror-gutter,
-.CodeMirror-gutters,
-.CodeMirror-linenumber {
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-}
-
-.CodeMirror-measure {
-  position: absolute;
-  width: 100%;
-  height: 0;
-  overflow: hidden;
-  visibility: hidden;
-}
-
-.CodeMirror-cursor {
-  position: absolute;
-  pointer-events: none;
-}
-.CodeMirror-measure pre { position: static; }
-
-div.CodeMirror-cursors {
-  visibility: hidden;
-  position: relative;
-  z-index: 3;
-}
-div.CodeMirror-dragcursors {
-  visibility: visible;
-}
-
-.CodeMirror-focused div.CodeMirror-cursors {
-  visibility: visible;
-}
-
-.CodeMirror-selected { background: #d9d9d9; }
-.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
-.CodeMirror-crosshair { cursor: crosshair; }
-.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
-.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
-
-.cm-searching {
-  background-color: #ffa;
-  background-color: rgba(255, 255, 0, .4);
-}
-
-/* Used to force a border model for a node */
-.cm-force-border { padding-right: .1px; }
-
-@media print {
-  /* Hide the cursor when printing */
-  .CodeMirror div.CodeMirror-cursors {
-    visibility: hidden;
-  }
-}
-
-/* See issue #2901 */
-.cm-tab-wrap-hack:after { content: ''; }
-
-/* Help users use markselection to safely style text background */
-span.CodeMirror-selectedtext { background: none; }
-
-.CodeMirror-fullscreen {
-  position: fixed;
-  top: 0; left: 0; right: 0; bottom: 0;
-  height: auto;
-  z-index: 9;
-}
-
-.CodeMirror-hints {
-  position: absolute;
-  z-index: 10;
-  overflow: hidden;
-  list-style: none;
-
-  margin: 0;
-  padding: 2px;
-
-  -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  border-radius: 3px;
-  border: 1px solid silver;
-
-  background: white;
-  font-size: 90%;
-  font-family: monospace;
-
-  max-height: 20em;
-  overflow-y: auto;
-}
-
-.CodeMirror-hint {
-  margin: 0;
-  padding: 0 4px;
-  border-radius: 2px;
-  white-space: pre;
-  color: black;
-  cursor: pointer;
-}
-
-li.CodeMirror-hint-active {
-  background: #08f;
-  color: white;
-}
-
 .CodeMirror-gutters {
     background-color: #ddd;
     /*border-left: 1px solid #bbb;*/
diff --git a/dist/block_mirror.js b/dist/block_mirror.js
index a2f73b2..d4decae 100644
--- a/dist/block_mirror.js
+++ b/dist/block_mirror.js
@@ -1,145 +1,132 @@
+"use strict";
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 /**
  * Initialise the database of variable names.
  * @param {!Blockly.Workspace} workspace Workspace to generate code from.
  */
 Blockly.Python.init = function (workspace) {
-    /**
-     * Empty loops or conditionals are not allowed in Python.
-     */
-    Blockly.Python.PASS = this.INDENT + 'pass\n';
-    // Create a dictionary of definitions to be printed before the code.
-    Blockly.Python.definitions_ = Object.create(null);
-    // Create a dictionary mapping desired function names in definitions_
-    // to actual function names (to avoid collisions with user functions).
-    Blockly.Python.functionNames_ = Object.create(null);
-
-    if (!Blockly.Python.variableDB_) {
-        Blockly.Python.variableDB_ =
-            new Blockly.Names(Blockly.Python.RESERVED_WORDS_);
-    } else {
-        Blockly.Python.variableDB_.reset();
-    }
+  /**
+   * Empty loops or conditionals are not allowed in Python.
+   */
+  Blockly.Python.PASS = this.INDENT + 'pass\n'; // Create a dictionary of definitions to be printed before the code.
 
-    Blockly.Python.variableDB_.setVariableMap(workspace.getVariableMap());
+  Blockly.Python.definitions_ = Object.create(null); // Create a dictionary mapping desired function names in definitions_
+  // to actual function names (to avoid collisions with user functions).
 
-    var defvars = [];
-    // Add developer variables (not created or named by the user).
-    /*
-    var devVarList = Blockly.Variables.allDeveloperVariables(workspace);
-    for (var i = 0; i < devVarList.length; i++) {
-        defvars.push(Blockly.Python.variableDB_.getName(devVarList[i],
-            Blockly.Names.DEVELOPER_VARIABLE_TYPE) + ' = None');
-    }
+  Blockly.Python.functionNames_ = Object.create(null);
 
-    // Add user variables, but only ones that are being used.
-    var variables = Blockly.Variables.allUsedVarModels(workspace);
-    for (var i = 0; i < variables.length; i++) {
-        defvars.push(Blockly.Python.variableDB_.getName(variables[i].getId(),
-            Blockly.Variables.NAME_TYPE) + ' = None');
-    }
+  if (!Blockly.Python.variableDB_) {
+    Blockly.Python.variableDB_ = new Blockly.Names(Blockly.Python.RESERVED_WORDS_);
+  } else {
+    Blockly.Python.variableDB_.reset();
+  }
 
-    Blockly.Python.definitions_['variables'] = defvars.join('\n');
-     */
-};
+  Blockly.Python.variableDB_.setVariableMap(workspace.getVariableMap());
+  var defvars = []; // Add developer variables (not created or named by the user).
 
+  /*
+  var devVarList = Blockly.Variables.allDeveloperVariables(workspace);
+  for (var i = 0; i < devVarList.length; i++) {
+      defvars.push(Blockly.Python.variableDB_.getName(devVarList[i],
+          Blockly.Names.DEVELOPER_VARIABLE_TYPE) + ' = None');
+  }
+   // Add user variables, but only ones that are being used.
+  var variables = Blockly.Variables.allUsedVarModels(workspace);
+  for (var i = 0; i < variables.length; i++) {
+      defvars.push(Blockly.Python.variableDB_.getName(variables[i].getId(),
+          Blockly.Variables.NAME_TYPE) + ' = None');
+  }
+   Blockly.Python.definitions_['variables'] = defvars.join('\n');
+   */
+};
 /**
  * Prepend the generated code with the variable definitions.
  * @param {string} code Generated code.
  * @return {string} Completed code.
  */
+
+
 Blockly.Python.finish = function (code) {
-    // Convert the definitions dictionary into a list.
-    var imports = [];
-    var definitions = [];
-    for (var name in Blockly.Python.definitions_) {
-        var def = Blockly.Python.definitions_[name];
-        if (def.match(/^(from\s+\S+\s+)?import\s+\S+/)) {
-            imports.push(def);
-        } else {
-            definitions.push(def);
-        }
+  // Convert the definitions dictionary into a list.
+  var imports = [];
+  var definitions = [];
+
+  for (var name in Blockly.Python.definitions_) {
+    var def = Blockly.Python.definitions_[name];
+
+    if (def.match(/^(from\s+\S+\s+)?import\s+\S+/)) {
+      imports.push(def);
+    } else {
+      definitions.push(def);
     }
-    // Clean up temporary data.
-    delete Blockly.Python.definitions_;
-    delete Blockly.Python.functionNames_;
-    Blockly.Python.variableDB_.reset();
-    // acbart: Don't actually inject initializations - we don't need 'em.
-    return code;
-};
+  } // Clean up temporary data.
 
-Blockly.Python.INDENT = '    ';
 
-Blockly.Python.RESERVED_WORDS_ = (
-    "False,None,True,and,as,assert,break,class," +
-    "continue,def,del,elif,else,except,finally,for," +
-    "from,global,if,import,in,is,lambda,nonlocal," +
-    "not,or,pass,raise,return,try,while,with,yield"
-);
+  delete Blockly.Python.definitions_;
+  delete Blockly.Python.functionNames_;
+  Blockly.Python.variableDB_.reset(); // acbart: Don't actually inject initializations - we don't need 'em.
+
+  return code;
+};
 
+Blockly.Python.INDENT = '    ';
+Blockly.Python.RESERVED_WORDS_ = "False,None,True,and,as,assert,break,class," + "continue,def,del,elif,else,except,finally,for," + "from,global,if,import,in,is,lambda,nonlocal," + "not,or,pass,raise,return,try,while,with,yield";
 /**
  * Naked values are top-level blocks with outputs that aren't plugged into
  * anything.
  * @param {string} line Line of generated code.
  * @return {string} Legal line of code.
  */
+
 Blockly.Python.scrubNakedValue = function (line) {
-    // acbart: Remove extra new line
-    return line;
+  // acbart: Remove extra new line
+  return line;
 };
-
-
 /**
  * Construct the blocks required by the flyout for the variable category.
  * @param {!Blockly.Workspace} workspace The workspace containing variables.
  * @return {!Array.<!Element>} Array of XML block elements.
  */
+
+
 Blockly.Variables.flyoutCategoryBlocks = function (workspace) {
-    var variableModelList = workspace.getVariablesOfType('');
-
-    var xmlList = [];
-    if (variableModelList.length > 0) {
-        // New variables are added to the end of the variableModelList.
-        var mostRecentVariableFieldXmlString =
-                variableModelList[variableModelList.length - 1];
-        if (Blockly.Blocks['ast_Assign']) {
-            var gap = Blockly.Blocks['ast_AugAssign'] ? 8 : 24;
-            var blockText = '<xml>' +
-                '<block type="ast_Assign" gap="' + gap + '">' +
-                mostRecentVariableFieldXmlString +
-                '</block>' +
-                '</xml>';
-            var block = Blockly.Xml.textToDom(blockText).firstChild;
-            xmlList.push(block);
-        }
-        if (Blockly.Blocks['ast_AugAssign']) {
-            var gap = Blockly.Blocks['ast_Name'] ? 20 : 8;
-            var blockText = '<xml>' +
-                '<block type="ast_AugAssign" gap="' + gap + '">' +
-                mostRecentVariableFieldXmlString +
-                '<value name="VALUE">' +
-                '<shadow type="ast_Num">' +
-                '<field name="NUM">1</field>' +
-                '</shadow>' +
-                '</value>' +
-                '<mutation options="false" simple="true"></mutation>' +
-                '</block>' +
-                '</xml>';
-            var block = Blockly.Xml.textToDom(blockText).firstChild;
-            xmlList.push(block);
-        }
+  var variableModelList = workspace.getVariablesOfType('');
+  var xmlList = [];
 
-        if (Blockly.Blocks['ast_Name']) {
-            variableModelList.sort(Blockly.VariableModel.compareByName);
-            for (var i = 0, variable; variable = variableModelList[i]; i++) {
-                var block = Blockly.utils.xml.createElement('block');
-                block.setAttribute('type', 'ast_Name');
-                block.setAttribute('gap', 8);
-                block.appendChild(Blockly.Variables.generateVariableFieldDom(variable));
-                xmlList.push(block);
-            }
-        }
+  if (variableModelList.length > 0) {
+    // New variables are added to the end of the variableModelList.
+    var mostRecentVariableFieldXmlString = variableModelList[variableModelList.length - 1];
+
+    if (Blockly.Blocks['ast_Assign']) {
+      var gap = Blockly.Blocks['ast_AugAssign'] ? 8 : 24;
+      var blockText = '<xml>' + '<block type="ast_Assign" gap="' + gap + '">' + mostRecentVariableFieldXmlString + '</block>' + '</xml>';
+      var block = Blockly.Xml.textToDom(blockText).firstChild;
+      xmlList.push(block);
+    }
+
+    if (Blockly.Blocks['ast_AugAssign']) {
+      var gap = Blockly.Blocks['ast_Name'] ? 20 : 8;
+      var blockText = '<xml>' + '<block type="ast_AugAssign" gap="' + gap + '">' + mostRecentVariableFieldXmlString + '<value name="VALUE">' + '<shadow type="ast_Num">' + '<field name="NUM">1</field>' + '</shadow>' + '</value>' + '<mutation options="false" simple="true"></mutation>' + '</block>' + '</xml>';
+      var block = Blockly.Xml.textToDom(blockText).firstChild;
+      xmlList.push(block);
+    }
+
+    if (Blockly.Blocks['ast_Name']) {
+      variableModelList.sort(Blockly.VariableModel.compareByName);
+
+      for (var i = 0, variable; variable = variableModelList[i]; i++) {
+        var block = Blockly.utils.xml.createElement('block');
+        block.setAttribute('type', 'ast_Name');
+        block.setAttribute('gap', 8);
+        block.appendChild(Blockly.Variables.generateVariableFieldDom(variable));
+        xmlList.push(block);
+      }
     }
-    return xmlList;
+  }
+
+  return xmlList;
 };
 /**
 
@@ -172,345 +159,390 @@ Blockly.Variables.flyoutCategoryBlocks = function (workspace) {
 /**
  *
  */
+
+
 function BlockMirror(configuration) {
-    this.validateConfiguration(configuration);
-    this.initializeVariables();
-    this.textEditor = new BlockMirrorTextEditor(this);
-    this.blockEditor = new BlockMirrorBlockEditor(this);
-    this.textToBlocks = new BlockMirrorTextToBlocks(this);
+  this.validateConfiguration(configuration);
+  this.initializeVariables();
+  this.textEditor = new BlockMirrorTextEditor(this);
+  this.blockEditor = new BlockMirrorBlockEditor(this);
+  this.textToBlocks = new BlockMirrorTextToBlocks(this);
+
+  if (!this.configuration.skipSkulpt) {
+    this.loadSkulpt();
+  }
 
-    if (!this.configuration.skipSkulpt) {
-        this.loadSkulpt();
-    }
+  this.setMode(this.configuration.viewMode);
+}
 
-    this.setMode(this.configuration.viewMode);
-};
+;
 
 BlockMirror.prototype.validateConfiguration = function (configuration) {
-    this.configuration = {};
+  this.configuration = {}; // Container
 
-    // Container
-    if ('container' in configuration) {
-        this.configuration.container = configuration.container;
-    } else {
-        throw new Error('Invalid configuration: Missing "container" property.')
-    }
+  if ('container' in configuration) {
+    this.configuration.container = configuration.container;
+  } else {
+    throw new Error('Invalid configuration: Missing "container" property.');
+  } // blocklyPath
 
-    // blocklyPath
-    if ('blocklyMediaPath' in configuration) {
-        this.configuration.blocklyMediaPath = configuration.blocklyMediaPath;
-    } else {
-        this.configuration.blocklyMediaPath = '../../blockly/media/';
-    }
 
-    // Run function
-    if ('run' in configuration) {
-        this.configuration.run = configuration.run;
-    } else {
-        this.configuration.run = function () {
-            console.log('Ran!');
-        };
-    }
+  if ('blocklyMediaPath' in configuration) {
+    this.configuration.blocklyMediaPath = configuration.blocklyMediaPath;
+  } else {
+    this.configuration.blocklyMediaPath = '../../blockly/media/';
+  } // Run function
 
-    // readOnly
-    this.configuration['readOnly'] = configuration['readOnly'] || false;
 
-    // height
-    this.configuration.height = configuration.height || '500px';
+  if ('run' in configuration) {
+    this.configuration.run = configuration.run;
+  } else {
+    this.configuration.run = function () {
+      console.log('Ran!');
+    };
+  } // readOnly
 
-    // viewMode
-    this.configuration.viewMode = configuration.viewMode || 'split';
 
-    // Need to load skulpt?
-    this.configuration.skipSkulpt = configuration.skipSkulpt || false;
+  this.configuration['readOnly'] = configuration['readOnly'] || false; // height
 
-    // Delay?
-    this.configuration.blockDelay = configuration.blockDelay || false;
-}
+  this.configuration.height = configuration.height || 500; // viewMode
+
+  this.configuration.viewMode = configuration.viewMode || 'split'; // Need to load skulpt?
+
+  this.configuration.skipSkulpt = configuration.skipSkulpt || false; // Delay?
+
+  this.configuration.blockDelay = configuration.blockDelay || false; // Toolbox
+
+  this.configuration.toolbox = configuration.toolbox || "normal";
+};
 
 BlockMirror.prototype.initializeVariables = function () {
-    this.tags = {
-        'toolbar': document.createElement('div'),
-        'blockContainer': document.createElement('div'),
-        'blockEditor': document.createElement('div'),
-        'blockArea': document.createElement('div'),
-        'textSidebar': document.createElement('div'),
-        'textContainer': document.createElement('div'),
-        'textArea': document.createElement('textarea'),
-    };
-    // Toolbar
-    this.configuration.container.appendChild(this.tags.toolbar);
-    // Block side
-    this.configuration.container.appendChild(this.tags.blockContainer);
-    this.tags.blockContainer.appendChild(this.tags.blockEditor);
-    this.tags.blockContainer.appendChild(this.tags.blockArea);
-    // Text side
-    this.configuration.container.appendChild(this.tags.textContainer);
-    this.tags.textContainer.appendChild(this.tags.textSidebar);
-    this.tags.textContainer.appendChild(this.tags.textArea);
-
-    for (var name in this.tags) {
-        this.tags[name].style['box-sizing'] = 'border-box';
-    }
-
-    // Files
-    this.code_ = "";
-    this.mode_ = null;
-
-    // Update Flags
-    this.silenceBlock = false;
-    this.silenceBlockTimer = null;
-    this.silenceText = false;
-    this.silenceModel = 0;
-    this.blocksFailed = false;
-    this.blocksFailedTimeout = null;
-    this.triggerOnChange = null;
-    this.firstEdit = true;
-
-    // Toolbox width
-    this.blocklyToolboxWidth = 0;
-
-    // Listeners
-    this.listeners_ = [];
-}
+  this.tags = {
+    'toolbar': document.createElement('div'),
+    'blockContainer': document.createElement('div'),
+    'blockEditor': document.createElement('div'),
+    'blockArea': document.createElement('div'),
+    'textSidebar': document.createElement('div'),
+    'textContainer': document.createElement('div'),
+    'textArea': document.createElement('textarea')
+  }; // Toolbar
+
+  this.configuration.container.appendChild(this.tags.toolbar); // Block side
+
+  this.configuration.container.appendChild(this.tags.blockContainer);
+  this.tags.blockContainer.appendChild(this.tags.blockEditor);
+  this.tags.blockContainer.appendChild(this.tags.blockArea); // Text side
+
+  this.configuration.container.appendChild(this.tags.textContainer);
+  this.tags.textContainer.appendChild(this.tags.textSidebar);
+  this.tags.textContainer.appendChild(this.tags.textArea);
+
+  for (var name in this.tags) {
+    this.tags[name].style['box-sizing'] = 'border-box';
+  } // Files
+
+
+  this.code_ = "";
+  this.mode_ = null; // Update Flags
+
+  this.silenceBlock = false;
+  this.silenceBlockTimer = null;
+  this.silenceText = false;
+  this.silenceModel = 0;
+  this.blocksFailed = false;
+  this.blocksFailedTimeout = null;
+  this.triggerOnChange = null;
+  this.firstEdit = true; // Toolbox width
+
+  this.blocklyToolboxWidth = 0; // Listeners
+
+  this.listeners_ = [];
+};
 
 BlockMirror.prototype.loadSkulpt = function () {
-    Sk.configure({
-        __future__: Sk.python3,
-        read: function (filename) {
-            if (Sk.builtinFiles === undefined ||
-                Sk.builtinFiles["files"][filename] === undefined) {
-                throw "File not found: '" + filename + "'";
-            }
-            return Sk.builtinFiles["files"][filename];
-        }
-    });
+  Sk.configure({
+    __future__: Sk.python3,
+    read: function read(filename) {
+      if (Sk.builtinFiles === undefined || Sk.builtinFiles["files"][filename] === undefined) {
+        throw "File not found: '" + filename + "'";
+      }
+
+      return Sk.builtinFiles["files"][filename];
+    }
+  });
+};
+
+BlockMirror.prototype.removeAllChangeListeners = function () {
+  this.listeners_.length = 0;
+};
+
+BlockMirror.prototype.removeChangeListener = function (callback) {
+  var index = this.listeners_.indexOf(callback);
+
+  if (index !== -1) {
+    this.listeners_.splice(index, 1);
+  }
 };
 
 BlockMirror.prototype.addChangeListener = function (callback) {
-    this.listeners_.push(callback);
+  this.listeners_.push(callback);
 };
 
 BlockMirror.prototype.fireChangeListener = function (event) {
-    for (let i = 0, func; func = this.listeners_[i]; i++) {
-        func(event);
-    }
+  for (var i = 0, func; func = this.listeners_[i]; i++) {
+    func(event);
+  }
 };
 
 BlockMirror.prototype.setCode = function (code, quietly) {
-    this.code_ = code;
-    if (!quietly) {
-        this.blockEditor.setCode(code, true);
-        this.textEditor.setCode(code, true);
-    }
-    this.fireChangeListener({'name': 'changed', 'value': code});
+  this.code_ = code;
+
+  if (!quietly) {
+    this.blockEditor.setCode(code, true);
+    this.textEditor.setCode(code, true);
+  }
+
+  this.fireChangeListener({
+    'name': 'changed',
+    'value': code
+  });
 };
 
 BlockMirror.prototype.getCode = function () {
-    return this.code_;
+  return this.code_;
 };
 
 BlockMirror.prototype.getMode = function () {
-    return this.mode_;
+  return this.mode_;
 };
 
 BlockMirror.prototype.setMode = function (mode) {
-    this.mode_ = mode;
-    this.blockEditor.setMode(mode);
-    this.textEditor.setMode(mode);
+  this.mode_ = mode;
+  this.blockEditor.setMode(mode);
+  this.textEditor.setMode(mode);
 };
 
 BlockMirror.prototype.setReadOnly = function (isReadOnly) {
-    this.textEditor.setReadOnly(isReadOnly);
-    this.blockEditor.setReadOnly(isReadOnly);
-    this.configuration.container.toggleClass("block-mirror-read-only", isReadOnly);
+  this.textEditor.setReadOnly(isReadOnly);
+  this.blockEditor.setReadOnly(isReadOnly);
+  this.configuration.container.toggleClass("block-mirror-read-only", isReadOnly);
+};
+
+BlockMirror.prototype.refresh = function () {
+  this.blockEditor.resized();
+  this.textEditor.codeMirror.refresh();
+};
+
+BlockMirror.prototype.forceBlockRefresh = function () {
+  this.blockEditor.setCode(this.code_, true);
 };
 
 BlockMirror.prototype.VISIBLE_MODES = {
-    'block': ['block', 'split'],
-    'text': ['text', 'split']
+  'block': ['block', 'split'],
+  'text': ['text', 'split']
 };
+BlockMirror.prototype.BREAK_WIDTH = 675;
 
-exports = BlockMirror;
 function BlockMirrorTextEditor(blockMirror) {
-    this.blockMirror = blockMirror;
-    this.textContainer = blockMirror.tags.textContainer;
-    this.textArea = blockMirror.tags.textArea;
-    this.textSidebar = blockMirror.tags.textSidebar;
-
-    // notification
-    this.silentEvents_ = false;
+  this.blockMirror = blockMirror;
+  this.textContainer = blockMirror.tags.textContainer;
+  this.textArea = blockMirror.tags.textArea;
+  this.textSidebar = blockMirror.tags.textSidebar; // notification
 
-    // Do we need to force an update?
-    this.outOfDate_ = null;
+  this.silentEvents_ = false; // Do we need to force an update?
 
-    // Use a timer to swallow updates
-    this.updateTimer_ = null;
-
-    let codeMirrorOptions = {
-        mode: {
-            name: 'python',
-            version: 3,
-            singleLineStringErrors: false
-        },
-        readOnly: blockMirror.configuration.readOnly,
-        showCursorWhenSelecting: true,
-        lineNumbers: true,
-        firstLineNumber: 1,
-        indentUnit: 4,
-        tabSize: 4,
-        indentWithTabs: false,
-        matchBrackets: true,
-        extraKeys: {
-            'Tab': 'indentMore',
-            'Shift-Tab': 'indentLess',
-            'Ctrl-Enter': blockMirror.run,
-            'Esc': function(cm) {
-                if (cm.getOption("fullScreen")) {
-                    cm.setOption("fullScreen", false);
-                } else {
-                    cm.display.input.blur();
-                }
-            },
-            "F11": function(cm) {
-                cm.setOption("fullScreen", !cm.getOption("fullScreen"));
-            },
-            "Esc": function(cm) {
+  this.outOfDate_ = null; // Use a timer to swallow updates
 
-            }
-        },
-        foldGutter: true,
-        gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
-    };
-    this.codeMirror = CodeMirror.fromTextArea(this.textArea, codeMirrorOptions);
-    this.codeMirror.on('change', this.changed.bind(this));
-    this.codeMirror.setSize(null, '100%');
-    this.textContainer.style.border = '1px solid lightgray';
-    this.textContainer.style.float = 'left';
-    this.updateWidth();
-    this.textContainer.style.height = blockMirror.configuration.height;
-    // Style sidebar
-    this.textSidebar.style.height = '100%';
-    this.textSidebar.style.float = 'left';
-    this.textSidebar.style.backgroundColor = '#ddd';
-
-    // TODO: Finish implementing code completion
-    /*this.codeMirror.on('inputRead', function onChange(editor, input) {
-        if (input.text[0] === ';' || input.text[0] === ' ' || input.text[0] === ":") {
-            return;
-        }
-        editor.showHint({
-            hint: CodeMirror.pythonHint
-        });
-    });*/
+  this.updateTimer_ = null;
+  var codeMirrorOptions = {
+    mode: {
+      name: 'python',
+      version: 3,
+      singleLineStringErrors: false
+    },
+    readOnly: blockMirror.configuration.readOnly,
+    showCursorWhenSelecting: true,
+    lineNumbers: true,
+    firstLineNumber: 1,
+    indentUnit: 4,
+    tabSize: 4,
+    indentWithTabs: false,
+    matchBrackets: true,
+    extraKeys: _defineProperty({
+      'Tab': 'indentMore',
+      'Shift-Tab': 'indentLess',
+      'Ctrl-Enter': blockMirror.run,
+      'Esc': function Esc(cm) {
+        if (cm.getOption("fullScreen")) {
+          cm.setOption("fullScreen", false);
+        } else {
+          cm.display.input.blur();
+        }
+      },
+      "F11": function F11(cm) {
+        cm.setOption("fullScreen", !cm.getOption("fullScreen"));
+      }
+    }, "Esc", function Esc(cm) {}),
+    foldGutter: true,
+    gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
+  };
+  this.codeMirror = CodeMirror.fromTextArea(this.textArea, codeMirrorOptions);
+  this.codeMirror.on('change', this.changed.bind(this));
+  this.codeMirror.setSize(null, '100%');
+  this.textContainer.style.border = '1px solid lightgray';
+  this.textContainer.style["float"] = 'left';
+  this.updateWidth();
+  this.textContainer.style.height = blockMirror.configuration.height; // Style sidebar
+
+  this.textSidebar.style.height = '100%';
+  this.textSidebar.style["float"] = 'left';
+  this.textSidebar.style.backgroundColor = '#ddd';
+  window.addEventListener('resize', this.resizeResponsively.bind(this), false); // TODO: Finish implementing code completion
+
+  /*this.codeMirror.on('inputRead', function onChange(editor, input) {
+      if (input.text[0] === ';' || input.text[0] === ' ' || input.text[0] === ":") {
+          return;
+      }
+      editor.showHint({
+          hint: CodeMirror.pythonHint
+      });
+  });*/
 }
 
 BlockMirrorTextEditor.prototype.defocus = function () {
-    this.codeMirror.display.input.blur();
-}
+  this.codeMirror.display.input.blur();
+};
 
 BlockMirrorTextEditor.prototype.updateWidth = function () {
-    var newWidth = '0%';
-    /*if (this.blockMirror.views.includes('text')) {
-        newWidth = (100 / this.blockMirror.views.length)+'%';
-    }
-    this.textContainer.style.width = newWidth;*/
-}
+  var newWidth = '0%';
+  /*if (this.blockMirror.views.includes('text')) {
+      newWidth = (100 / this.blockMirror.views.length)+'%';
+  }
+  this.textContainer.style.width = newWidth;*/
+};
 
 BlockMirrorTextEditor.prototype.setReadOnly = function (isReadOnly) {
-    this.codeMirror.setOption('readOnly', isReadOnly);
+  this.codeMirror.setOption('readOnly', isReadOnly);
 };
 
 BlockMirrorTextEditor.prototype.VIEW_CONFIGURATIONS = {
-    'split': {
-        'width': '40%',
-        'visible': true,
-        'indentSidebar': false
-    },
-    'text': {
-        'width': '100%',
-        'visible': true,
-        'indentSidebar': true
-    },
-    'block': {
-        'width': '0%',
-        'visible': false,
-        'indentSidebar': false
-    }
+  'split': {
+    'width': '40%',
+    'visible': true,
+    'indentSidebar': false
+  },
+  'text': {
+    'width': '100%',
+    'visible': true,
+    'indentSidebar': true
+  },
+  'block': {
+    'width': '0%',
+    'visible': false,
+    'indentSidebar': false
+  }
 };
 
-BlockMirrorTextEditor.prototype.setMode = function (mode) {
-    mode = mode.toLowerCase();
-    let configuration = this.VIEW_CONFIGURATIONS[mode];
-    // If there is an update waiting and we're visible, then update
-    if (this.outOfDate_ !== null && this.isVisible()) {
-        this.setCode(this.outOfDate_, true);
-    }
-    // Show/hide editor
-    this.textContainer.style.width = configuration.width;
-    if (configuration.visible) {
-        this.textContainer.style.height = this.blockMirror.configuration.height;
-        this.textContainer.style.display = 'block';
-        this.codeMirror.getWrapperElement().style.display = 'block';
-        this.codeMirror.refresh();
-    } else {
-        this.textContainer.style.height = '0%';
-        this.textContainer.style.display = 'none';
-        this.codeMirror.getWrapperElement().style.display = 'none';
-    }
-    // Should we indent the toolbox
-    if (configuration.indentSidebar) {
-        let gutters = this.textContainer.querySelector('.CodeMirror-gutters');
-        let gutterWidth = gutters.offsetWidth;
-        let toolbarWidth = this.blockMirror.blockEditor.getToolbarWidth();
-        let newGutterWidth = toolbarWidth - gutterWidth - 2;
-        this.textSidebar.style.width = newGutterWidth + 'px';
-        this.textSidebar.style.display = 'block';
+BlockMirrorTextEditor.prototype.resizeResponsively = function () {
+  var mode = this.blockMirror.mode_;
+  var configuration = this.VIEW_CONFIGURATIONS[mode];
+  var width = configuration.width;
+  var height = this.blockMirror.configuration.height;
+
+  if (mode === 'split') {
+    if (window.innerWidth >= this.blockMirror.BREAK_WIDTH) {
+      this.textContainer.style.width = width;
+      this.textContainer.style.height = height + "px";
     } else {
-        this.textSidebar.style.display = 'none';
-        this.textSidebar.style.width = '0px';
+      this.textContainer.style.width = '100%';
+      this.textContainer.style.height = height / 2 + "px";
     }
-}
+  } else {
+    this.textContainer.style.width = width;
+    this.textContainer.style.height = height + "px";
+  }
+};
+
+BlockMirrorTextEditor.prototype.setMode = function (mode) {
+  mode = mode.toLowerCase();
+  var configuration = this.VIEW_CONFIGURATIONS[mode]; // If there is an update waiting and we're visible, then update
+
+  if (this.outOfDate_ !== null && this.isVisible()) {
+    this.setCode(this.outOfDate_, true);
+  } // Show/hide editor
+
+
+  this.resizeResponsively();
+
+  if (configuration.visible) {
+    this.textContainer.style.display = 'block';
+    this.codeMirror.getWrapperElement().style.display = 'block';
+    this.codeMirror.refresh();
+  } else {
+    this.textContainer.style.height = '0%';
+    this.textContainer.style.display = 'none';
+    this.codeMirror.getWrapperElement().style.display = 'none';
+  } // Should we indent the toolbox
+
+
+  if (configuration.indentSidebar) {
+    var gutters = this.textContainer.querySelector('.CodeMirror-gutters');
+    var gutterWidth = gutters.offsetWidth;
+    var toolbarWidth = this.blockMirror.blockEditor.getToolbarWidth();
+    var newGutterWidth = toolbarWidth - gutterWidth - 2;
+    this.textSidebar.style.width = newGutterWidth + 'px';
+    this.textSidebar.style.display = 'block';
+  } else {
+    this.textSidebar.style.display = 'none';
+    this.textSidebar.style.width = '0px';
+  }
+};
 
 BlockMirrorTextEditor.prototype.setCode = function (code, quietly) {
-    this.silentEvents_ = quietly;
+  this.silentEvents_ = quietly; // Defaults to a single blank line
 
-    // Defaults to a single blank line
-    code = (code === undefined || code.trim() === "") ? "\n" : code;
+  code = code === undefined || code.trim() === "" ? "\n" : code;
 
-    if (this.isVisible()) {
-        this.codeMirror.setValue(code);
-        this.outOfDate_ = null;
-    } else {
-        this.outOfDate_ = code;
-    }
+  if (this.isVisible()) {
+    this.codeMirror.setValue(code);
+    this.outOfDate_ = null;
+  } else {
+    this.outOfDate_ = code;
+  }
 };
 
 BlockMirrorTextEditor.prototype.getCode = function () {
-    return this.codeMirror.getValue();
+  return this.codeMirror.getValue();
 };
 
 BlockMirrorTextEditor.prototype.changed = function (codeMirror, event) {
-    if (!this.silentEvents_) {
-        let handleChange = () => {
-            let newCode = this.getCode();
-            this.blockMirror.blockEditor.setCode(newCode, true);
-            this.blockMirror.code_ = newCode;
-        };
-        if (this.blockMirror.configuration.blockDelay === false) {
-            handleChange();
-        } else {
-            if (this.updateTimer_ !== null) {
-                clearTimeout(this.updateTimer_);
-            }
-            this.updateTimer_ = setTimeout(handleChange, this.blockMirror.configuration.blockDelay);
-        }
+  var _this = this;
+
+  if (!this.silentEvents_) {
+    var handleChange = function handleChange() {
+      var newCode = _this.getCode();
+
+      _this.blockMirror.blockEditor.setCode(newCode, true);
+
+      _this.blockMirror.setCode(newCode, true);
+    };
+
+    if (this.blockMirror.configuration.blockDelay === false) {
+      handleChange();
+    } else {
+      if (this.updateTimer_ !== null) {
+        clearTimeout(this.updateTimer_);
+      }
+
+      this.updateTimer_ = setTimeout(handleChange, this.blockMirror.configuration.blockDelay);
     }
-    this.silentEvents_ = false;
+  }
+
+  this.silentEvents_ = false;
 };
 
 BlockMirrorTextEditor.prototype.isVisible = function () {
-    return this.blockMirror.VISIBLE_MODES.text.indexOf(this.blockMirror.mode_) !== -1;
+  return this.blockMirror.VISIBLE_MODES.text.indexOf(this.blockMirror.mode_) !== -1;
 };
 /**
  * Worth noting - Blockly uses a setTimeOut of 0 steps to make events
@@ -519,1212 +551,1977 @@ BlockMirrorTextEditor.prototype.isVisible = function () {
  * @constructor
  */
 
-function BlockMirrorBlockEditor(blockMirror) {
-    this.blockMirror = blockMirror;
-    this.blockContainer = blockMirror.tags.blockContainer;
-    this.blockEditor = blockMirror.tags.blockEditor;
-    this.blockArea = blockMirror.tags.blockArea;
-
-    // Null, or the source of the last update
-    this.outOfDate_ = null;
-
-    // Inject Blockly
-    let blocklyOptions = {
-        media: blockMirror.configuration.blocklyMediaPath,
-        // We use special comment blocks
-        zoom: {controls: true},
-        comments: false,
-        disable: false,
-        oneBasedIndex: false,
-        readOnly: blockMirror.configuration.readOnly,
-        scrollbars: true,
-        toolbox: this.makeToolbox()
-    }
-    this.workspace = Blockly.inject(blockMirror.tags.blockEditor,
-        blocklyOptions);
-    // Configure Blockly
-    this.workspace.addChangeListener(this.changed.bind(this));
-
-    // Configure Blockly DIV
-    //blockMirror.tags.blockEditor.style.resize = 'horizontal';
-    this.blockContainer.style.float = 'left';
-    this.blockEditor.style.position = 'absolute';
-    this.blockEditor.style.width = '100%';
-    this.blockArea.style.height = blockMirror.configuration.height;
 
-    window.addEventListener('resize', this.resized.bind(this), false);
-    this.resized();
+function BlockMirrorBlockEditor(blockMirror) {
+  this.blockMirror = blockMirror;
+  this.blockContainer = blockMirror.tags.blockContainer;
+  this.blockEditor = blockMirror.tags.blockEditor;
+  this.blockArea = blockMirror.tags.blockArea; // Null, or the source of the last update
+
+  this.outOfDate_ = null; // Inject Blockly
+
+  var blocklyOptions = {
+    media: blockMirror.configuration.blocklyMediaPath,
+    // We use special comment blocks
+    zoom: {
+      controls: true
+    },
+    comments: false,
+    disable: false,
+    oneBasedIndex: false,
+    readOnly: blockMirror.configuration.readOnly,
+    scrollbars: true,
+    toolbox: this.makeToolbox()
+  };
+  this.workspace = Blockly.inject(blockMirror.tags.blockEditor, blocklyOptions); // Configure Blockly
+
+  this.workspace.addChangeListener(this.changed.bind(this)); // Configure Blockly DIV
+  //blockMirror.tags.blockEditor.style.resize = 'horizontal';
+
+  this.blockContainer.style["float"] = 'left';
+  this.blockEditor.style.position = 'absolute';
+  this.blockEditor.style.width = '100%';
+  this.blockArea.style.height = blockMirror.configuration.height + "px";
+  window.addEventListener('resize', this.resized.bind(this), false);
+  this.resized();
 }
 
 BlockMirrorBlockEditor.prototype.updateWidth = function () {
-    var newWidth = '0%';
-    this.resized();
-}
+  var newWidth = '0%';
+  this.resized();
+};
 
 BlockMirrorBlockEditor.prototype.resized = function (e) {
-    // Compute the absolute coordinates and dimensions of blocklyArea.
-    var blockArea = this.blockMirror.tags.blockArea;
-    var current = blockArea;
-    var x = 0;
-    var y = 0;
-    do {
-        x += current.offsetLeft;
-        y += current.offsetTop;
-        current = current.offsetParent;
-    } while (current);
-    // Position blocklyDiv over blockArea.
-    var blockEditor = this.blockMirror.tags.blockEditor;
-    blockEditor.style.left = x + 'px';
-    blockEditor.style.top = y + 'px';
-    blockEditor.style.width = blockArea.offsetWidth + 'px';
-    blockEditor.style.height = blockArea.offsetHeight + 'px';
-    Blockly.svgResize(this.workspace);
-}
+  this.resizeResponsively(); // Compute the absolute coordinates and dimensions of blocklyArea.
+
+  var blockArea = this.blockMirror.tags.blockArea;
+  /*var current = blockArea;
+  var x = 0;
+  var y = 0;
+  do {
+      x += current.offsetLeft;
+      y += current.offsetTop;
+      current = current.offsetParent;
+  } while (current);*/
+  // Position blocklyDiv over blockArea.
+
+  var blockEditor = this.blockMirror.tags.blockEditor;
+  /*blockEditor.style.left = x + 'px';
+  blockEditor.style.top = y + 'px';*/
+
+  blockEditor.style.width = blockArea.offsetWidth + 'px';
+  blockEditor.style.height = blockArea.offsetHeight + 'px';
+  Blockly.svgResize(this.workspace);
+};
 
 BlockMirrorBlockEditor.prototype.makeToolbox = function () {
-    var xml = '<xml id="toolbox" style="display: none">';
-    xml += '<category name="Variables" custom="VARIABLE" colour="240">' +
-        '</category>';
-    xml += '<category name="Iteration" colour="300">' +
-        '<block type="ast_For"></block>' +
-        '<block type="ast_ForElse"></block>' +
-        '</category>';
-    xml += '<category name="Values" colour="300">' +
-        '<block type="ast_Num"></block>' +
-        '</category>';
-    //xml += '<category name="Values" colour="300"><button value="From Code">From Code</button></category>';
-    xml += '</xml>';
-    return xml;
+  var toolbox = this.blockMirror.configuration.toolbox;
+
+  if (toolbox in this.TOOLBOXES) {
+    toolbox = this.TOOLBOXES[toolbox];
+  }
+
+  for (var name in BlockMirrorBlockEditor.EXTRA_TOOLS) {
+    toolbox += BlockMirrorBlockEditor.EXTRA_TOOLS[name];
+  }
+
+  return '<xml id="toolbox" style="display:none">' + toolbox + '</xml>';
 };
 
 BlockMirrorBlockEditor.prototype.remakeToolbox = function () {
-    this.workspace.updateToolbox(this.makeToolbox());
-    this.resized();
+  this.workspace.updateToolbox(this.makeToolbox());
+  this.resized();
 };
-
 /**
  * Retrieves the current width of the Blockly Toolbox, unless
  * we're in read-only mode (when there is no toolbox).
  * @returns {Number} The current width of the toolbox.
  */
+
+
 BlockMirrorBlockEditor.prototype.getToolbarWidth = function () {
-    if (this.blockMirror.configuration.readOnly) {
-        return 0;
-    } else {
-        return this.workspace.toolbox_.width;
-    }
-}
+  if (this.blockMirror.configuration.readOnly) {
+    return 0;
+  } else {
+    return this.workspace.toolbox_.width;
+  }
+};
 
 BlockMirrorBlockEditor.prototype.VIEW_CONFIGURATIONS = {
-    'split': {
-        'width': '60%',
-        'visible': true
-    },
-    'block': {
-        'width': '100%',
-        'visible': true
-    },
-    'text': {
-        'width': '0%',
-        'visible': false
-    }
-}
+  'split': {
+    'width': '60%',
+    'visible': true
+  },
+  'block': {
+    'width': '100%',
+    'visible': true
+  },
+  'text': {
+    'width': '0%',
+    'visible': false
+  }
+};
 
-BlockMirrorBlockEditor.prototype.setMode = function (mode) {
-    mode = mode.toLowerCase();
-    let configuration = this.VIEW_CONFIGURATIONS[mode];
+BlockMirrorBlockEditor.prototype.resizeResponsively = function () {
+  var mode = this.blockMirror.mode_;
+  var configuration = this.VIEW_CONFIGURATIONS[mode];
 
-    // Show/hide editor
-    this.blockContainer.style.width = configuration.width;
-    this.workspace.setVisible(configuration.visible);
-    if (configuration.visible) {
-        this.blockContainer.style.height = this.blockMirror.configuration.height;
-        this.blockEditor.style.width = '100%';
-        this.resized();
+  if (mode === 'split') {
+    if (window.innerWidth >= this.blockMirror.BREAK_WIDTH) {
+      this.blockContainer.style.width = configuration.width;
+      this.blockContainer.style.height = this.blockMirror.configuration.height + "px";
+      this.blockArea.style.height = this.blockMirror.configuration.height + "px";
     } else {
-        this.blockContainer.style.height = '0%';
-    }
-
-    // If there is an update waiting and we're visible, then update
-    if (this.outOfDate_ !== null && this.isVisible()) {
-        this.setCode(this.outOfDate_, true);
+      this.blockContainer.style.width = '100%';
+      this.blockContainer.style.height = this.blockMirror.configuration.height / 2 + "px";
+      this.blockArea.style.height = this.blockMirror.configuration.height / 2 + "px";
     }
+  } else if (mode === 'block') {
+    this.blockContainer.style.width = configuration.width;
+    this.blockContainer.style.height = this.blockMirror.configuration.height + "px";
+    this.blockArea.style.height = this.blockMirror.configuration.height + "px";
+  }
 };
 
+BlockMirrorBlockEditor.prototype.setMode = function (mode) {
+  mode = mode.toLowerCase();
+  var configuration = this.VIEW_CONFIGURATIONS[mode]; // Show/hide editor
+
+  this.workspace.setVisible(configuration.visible);
+
+  if (configuration.visible) {
+    this.blockEditor.style.width = '100%';
+    this.resized();
+  } else {
+    this.blockContainer.style.height = '0%';
+    this.blockArea.style.height = '0%';
+  } // If there is an update waiting and we're visible, then update
+
+
+  if (this.outOfDate_ !== null && this.isVisible()) {
+    this.setCode(this.outOfDate_, true);
+  }
+};
 /**
  * Attempts to update the model for the current code file from the
  * block workspace. Might be prevented if an update event was already
  * percolating.
  */
+
+
 BlockMirrorBlockEditor.prototype.getCode = function () {
-    return Blockly.Python.workspaceToCode(this.workspace);
+  return Blockly.Python.workspaceToCode(this.workspace);
 };
-
 /**
  * Attempts to update the model for the current code file from the
  * block workspace. Might be prevented if an update event was already
  * percolating.
  */
+
+
 BlockMirrorBlockEditor.prototype.setCode = function (code, quietly) {
-    if (this.isVisible()) {
-        let result = this.blockMirror.textToBlocks.convertSource('__main__.py', code);
-        if (quietly) {
-            Blockly.Events.disable();
-        }
-        try {
-            let xml_code = Blockly.Xml.textToDom(result.xml);
-            this.workspace.clear();
-            Blockly.Xml.domToWorkspace(xml_code, this.workspace);
-            this.workspace.cleanUp();
-        } catch (error) {
-            console.error(error);
-        }
-        if (quietly) {
-            Blockly.Events.enable();
-        }
-        this.outOfDate_ = null;
+  if (this.isVisible()) {
+    var result = this.blockMirror.textToBlocks.convertSource('__main__.py', code);
+
+    if (quietly) {
+      Blockly.Events.disable();
+    }
+
+    try {
+      var xml_code = Blockly.Xml.textToDom(result.xml);
+      this.workspace.clear();
+      Blockly.Xml.domToWorkspace(xml_code, this.workspace);
+      this.workspace.cleanUp();
+    } catch (error) {
+      console.error(error);
+    }
+
+    if (quietly) {
+      Blockly.Events.enable();
     } else {
-        this.outOfDate_ = code;
+      this.blockMirror.setCode(code, true);
     }
-}
 
-BlockMirrorBlockEditor.prototype.BLOCKLY_CHANGE_EVENTS = [
-    Blockly.Events.CREATE, Blockly.Events.DELETE, Blockly.Events.CHANGE, Blockly.Events.MOVE
-];
+    this.outOfDate_ = null;
+  } else {
+    this.outOfDate_ = code;
+  }
+};
+
+BlockMirrorBlockEditor.prototype.BLOCKLY_CHANGE_EVENTS = [Blockly.Events.CREATE, Blockly.Events.DELETE, Blockly.Events.CHANGE, Blockly.Events.MOVE];
 
 BlockMirrorBlockEditor.prototype.changed = function (event) {
-    if ((event === undefined || this.BLOCKLY_CHANGE_EVENTS.indexOf(event.type) !== -1) &&
-        !this.workspace.isDragging()) {
-        let newCode = this.getCode();
-        this.blockMirror.textEditor.setCode(newCode, true);
-        this.blockMirror.code_ = newCode;
-    }
+  if ((event === undefined || this.BLOCKLY_CHANGE_EVENTS.indexOf(event.type) !== -1) && !this.workspace.isDragging()) {
+    var newCode = this.getCode();
+    this.blockMirror.textEditor.setCode(newCode, true);
+    this.blockMirror.setCode(newCode, true);
+  }
 };
 
 BlockMirrorBlockEditor.prototype.isVisible = function () {
-    return this.blockMirror.VISIBLE_MODES.block.indexOf(this.blockMirror.mode_) !== -1;
+  return this.blockMirror.VISIBLE_MODES.block.indexOf(this.blockMirror.mode_) !== -1;
 };
-function BlockMirrorTextToBlocks(blockMirror) {
-    this.blockMirror = blockMirror;
-    this.strictAnnotations = ['int', 'float', 'str', 'bool'];
-    Blockly.defineBlocksWithJsonArray(BlockMirrorTextToBlocks.BLOCKS);
-}
 
-BlockMirrorTextToBlocks.xmlToString = function (xml) {
-    return new XMLSerializer().serializeToString(xml);
-}
+BlockMirrorBlockEditor.prototype.DOCTYPE = '<?xml version="1.0" standalone="no"?> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">';
+BlockMirrorBlockEditor.prototype.BLOCKLY_LOADED_CSS = null;
 
-BlockMirrorTextToBlocks.prototype.convertSourceToCodeBlock = function (python_source) {
-    var xml = document.createElement("xml");
-    xml.appendChild(BlockMirrorTextToBlocks.raw_block(python_source));
-    return BlockMirrorTextToBlocks.xmlToString(xml);
-}
+BlockMirrorBlockEditor.prototype.loadBlocklyCSS = function () {
+  if (this.BLOCKLY_LOADED_CSS === null) {
+    var result = [".blocklyDraggable {}"];
+    result = result.concat(Blockly.Css.CONTENT);
+
+    if (Blockly.FieldDate) {
+      result = result.concat(Blockly.FieldDate.CSS);
+    }
+
+    result = result.join("\n"); // Strip off any trailing slash (either Unix or Windows).
 
+    result = result.replace(/<<<PATH>>>/g, Blockly.Css.mediaPath_);
+    this.BLOCKLY_LOADED_CSS = result;
+  }
+};
 /**
- * The main function for converting a string representation of Python
- * code to the Blockly XML representation.
+ * Generates a PNG version of the current workspace. This PNG is stored in a Base-64 encoded
+ * string as part of a data URL (e.g., "data:image/png;base64,...").
+ * TODO: There seems to be some problems capturing blocks that don't start with
+ * statement level blocks (e.g., expression blocks).
  *
- * @param {string} filename - The filename being parsed.
- * @param {string} python_source - The string representation of Python
- *      code (e.g., "a = 0").
- * @returns {Object} An object which will either have the converted
- *      source code or an error message and the code as a code-block.
+ * @param {Function} callback - A function to be called with the results.
+ *  This function should take two parameters, the URL (as a string) of the generated
+ *  base64-encoded PNG and the IMG tag.
  */
-BlockMirrorTextToBlocks.prototype.convertSource = function (filename, python_source) {
-    var xml = document.createElement("xml");
-    // Attempt parsing - might fail!
-    var parse, ast = null, symbol_table, error;
-    let badChunks = [];
-    let originalSource = python_source;
-    this.source = python_source.split("\n");
-    let previousLine = 1+this.source.length;
-    while (ast === null) {
-        if (python_source.trim() === "") {
-            return {"xml": BlockMirrorTextToBlocks.xmlToString(xml), "error": null};
-        }
-        try {
-            parse = Sk.parse(filename, python_source);
-            ast = Sk.astFromParse(parse.cst, filename, parse.flags);
-        } catch (e) {
-            error = e;
-            if (e.traceback && e.traceback.length && e.traceback[0].lineno &&
-                e.traceback[0].lineno < previousLine) {
-                previousLine = e.traceback[0].lineno - 1;
-                badChunks = badChunks.concat(this.source.slice(previousLine));
-                this.source = this.source.slice(0, previousLine);
-                python_source = this.source.join("\n");
-            } else {
-                xml.appendChild(BlockMirrorTextToBlocks.raw_block(originalSource));
-                return {"xml": BlockMirrorTextToBlocks.xmlToString(xml), "error": error};
-            }
+
+
+BlockMirrorBlockEditor.prototype.getPngFromBlocks = function (callback) {
+  this.loadBlocklyCSS();
+
+  try {
+    // Retreive the entire canvas, strip some unnecessary tags
+    var blocks = this.workspace.svgBlockCanvas_.cloneNode(true);
+    blocks.removeAttribute("width");
+    blocks.removeAttribute("height"); // Ensure that we have some content
+
+    if (blocks.childNodes[0] !== undefined) {
+      // Remove tags that offset
+      blocks.removeAttribute("transform");
+      blocks.childNodes[0].removeAttribute("transform");
+      blocks.childNodes[0].childNodes[0].removeAttribute("transform"); // Add in styles
+
+      var linkElm = document.createElementNS("http://www.w3.org/1999/xhtml", "style");
+      linkElm.textContent = this.BLOCKLY_LOADED_CSS + "\n\n";
+      blocks.insertBefore(linkElm, blocks.firstChild); // Get the bounding box
+
+      var bbox = document.getElementsByClassName("blocklyBlockCanvas")[0].getBBox(); // Create the XML representation of the SVG
+
+      var xml = new XMLSerializer().serializeToString(blocks);
+      xml = '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="' + bbox.width + '" height="' + bbox.height + '" viewBox="0 0 ' + bbox.width + " " + bbox.height + '"><rect width="100%" height="100%" fill="white"></rect>' + xml + "</svg>"; // create a file blob of our SVG.
+      // Unfortunately, this crashes modern chrome for unknown reasons.
+      //var blob = new Blob([ this.DOCTYPE + xml], { type: 'image/svg+xml' });
+      //var url = window.URL.createObjectURL(blob);
+      // Old method: this failed on IE
+
+      var url = "data:image/svg+xml;base64," + btoa(unescape(encodeURIComponent(xml))); // Create an IMG tag to hold the new element
+
+      var img = document.createElement("img");
+      img.style.display = "block";
+
+      img.onload = function () {
+        var canvas = document.createElement("canvas");
+        canvas.width = bbox.width;
+        canvas.height = bbox.height;
+        var ctx = canvas.getContext("2d");
+        ctx.drawImage(img, 0, 0);
+        var canvasUrl;
+
+        try {
+          canvasUrl = canvas.toDataURL("image/png");
+        } catch (e) {
+          canvasUrl = url;
         }
+
+        img.onload = null;
+        callback(canvasUrl, img);
+      };
+
+      img.onerror = function () {
+        callback("", img);
+      };
+
+      img.setAttribute("src", url);
+    } else {
+      callback("", document.createElement("img"));
     }
-    this.comments = {};
-    for (var commentLocation in parse.comments) {
-        var lineColumn = commentLocation.split(",");
-        var yLocation = parseInt(lineColumn[0], 10);
-        this.comments[yLocation] = parse.comments[commentLocation];
-    }
-    this.highestLineSeen = 0;
-    this.levelIndex = 0;
-    this.nextExpectedLine = 0;
-    this.measureNode(ast);
-    var converted = this.convert(ast);
-    if (converted !== null) {
-        for (var block = 0; block < converted.length; block += 1) {
-            xml.appendChild(converted[block]);
-        }
+  } catch (e) {
+    callback("", document.createElement("img"));
+    console.error("PNG image creation not supported!", e);
+  }
+};
+
+function BlockMirrorTextToBlocks(blockMirror) {
+  this.blockMirror = blockMirror;
+  this.strictAnnotations = ['int', 'float', 'str', 'bool'];
+  Blockly.defineBlocksWithJsonArray(BlockMirrorTextToBlocks.BLOCKS);
+}
+
+BlockMirrorTextToBlocks.xmlToString = function (xml) {
+  return new XMLSerializer().serializeToString(xml);
+};
+
+BlockMirrorTextToBlocks.prototype.convertSourceToCodeBlock = function (python_source) {
+  var xml = document.createElement("xml");
+  xml.appendChild(BlockMirrorTextToBlocks.raw_block(python_source));
+  return BlockMirrorTextToBlocks.xmlToString(xml);
+};
+/**
+ * The main function for converting a string representation of Python
+ * code to the Blockly XML representation.
+ *
+ * @param {string} filename - The filename being parsed.
+ * @param {string} python_source - The string representation of Python
+ *      code (e.g., "a = 0").
+ * @returns {Object} An object which will either have the converted
+ *      source code or an error message and the code as a code-block.
+ */
+
+
+BlockMirrorTextToBlocks.prototype.convertSource = function (filename, python_source) {
+  var xml = document.createElement("xml"); // Attempt parsing - might fail!
+
+  var parse,
+      ast = null,
+      symbol_table,
+      error;
+  var badChunks = [];
+  var originalSource = python_source;
+  this.source = python_source.split("\n");
+  var previousLine = 1 + this.source.length;
+
+  while (ast === null) {
+    if (python_source.trim() === "") {
+      return {
+        "xml": BlockMirrorTextToBlocks.xmlToString(xml),
+        "error": null
+      };
     }
-    if (badChunks.length) {
-        xml.appendChild(BlockMirrorTextToBlocks.raw_block(badChunks.join("\n")));
+
+    try {
+      parse = Sk.parse(filename, python_source);
+      ast = Sk.astFromParse(parse.cst, filename, parse.flags);
+    } catch (e) {
+      error = e;
+
+      if (e.traceback && e.traceback.length && e.traceback[0].lineno && e.traceback[0].lineno < previousLine) {
+        previousLine = e.traceback[0].lineno - 1;
+        badChunks = badChunks.concat(this.source.slice(previousLine));
+        this.source = this.source.slice(0, previousLine);
+        python_source = this.source.join("\n");
+      } else {
+        console.error(e);
+        xml.appendChild(BlockMirrorTextToBlocks.raw_block(originalSource));
+        return {
+          "xml": BlockMirrorTextToBlocks.xmlToString(xml),
+          "error": error
+        };
+      }
     }
-    return {
-        "xml": BlockMirrorTextToBlocks.xmlToString(xml), "error": null,
-        "lineMap": this.lineMap, 'comments': this.comments
-    };
-}
+  }
 
-BlockMirrorTextToBlocks.prototype.recursiveMeasure = function (node, nextBlockLine) {
-    if (node === undefined) {
-        return;
+  this.comments = {};
+
+  for (var commentLocation in parse.comments) {
+    var lineColumn = commentLocation.split(",");
+    var yLocation = parseInt(lineColumn[0], 10);
+    this.comments[yLocation] = parse.comments[commentLocation];
+  }
+
+  this.highestLineSeen = 0;
+  this.levelIndex = 0;
+  this.nextExpectedLine = 0;
+  this.measureNode(ast);
+  var converted = this.convert(ast);
+
+  if (converted !== null) {
+    for (var block = 0; block < converted.length; block += 1) {
+      xml.appendChild(converted[block]);
     }
-    var myNext = nextBlockLine;
-    if ("orelse" in node && node.orelse.length > 0) {
-        if (node.orelse.length == 1 && node.orelse[0]._astname == "If") {
-            myNext = node.orelse[0].lineno - 1;
-        } else {
-            myNext = node.orelse[0].lineno - 1 - 1;
-        }
+  }
+
+  if (badChunks.length) {
+    xml.appendChild(BlockMirrorTextToBlocks.raw_block(badChunks.join("\n")));
+  }
+
+  return {
+    "xml": BlockMirrorTextToBlocks.xmlToString(xml),
+    "error": null,
+    "lineMap": this.lineMap,
+    'comments': this.comments
+  };
+};
+
+BlockMirrorTextToBlocks.prototype.recursiveMeasure = function (node, nextBlockLine) {
+  if (node === undefined) {
+    return;
+  }
+
+  var myNext = nextBlockLine;
+
+  if ("orelse" in node && node.orelse.length > 0) {
+    if (node.orelse.length == 1 && node.orelse[0]._astname == "If") {
+      myNext = node.orelse[0].lineno - 1;
+    } else {
+      myNext = node.orelse[0].lineno - 1 - 1;
     }
-    this.heights.push(nextBlockLine);
-    if ("body" in node) {
-        for (var i = 0; i < node.body.length; i++) {
-            var next;
-            if (i + 1 == node.body.length) {
-                next = myNext;
-            } else {
-                next = node.body[i + 1].lineno - 1;
-            }
-            this.recursiveMeasure(node.body[i], next);
-        }
+  }
+
+  this.heights.push(nextBlockLine);
+
+  if ("body" in node) {
+    for (var i = 0; i < node.body.length; i++) {
+      var next;
+
+      if (i + 1 == node.body.length) {
+        next = myNext;
+      } else {
+        next = node.body[i + 1].lineno - 1;
+      }
+
+      this.recursiveMeasure(node.body[i], next);
     }
-    if ("orelse" in node) {
-        for (var i = 0; i < node.orelse.length; i++) {
-            var next;
-            if (i == node.orelse.length) {
-                next = nextBlockLine;
-            } else {
-                next = 1 + (node.orelse[i].lineno - 1);
-            }
-            this.recursiveMeasure(node.orelse[i], next);
-        }
+  }
+
+  if ("orelse" in node) {
+    for (var i = 0; i < node.orelse.length; i++) {
+      var next;
+
+      if (i == node.orelse.length) {
+        next = nextBlockLine;
+      } else {
+        next = 1 + (node.orelse[i].lineno - 1);
+      }
+
+      this.recursiveMeasure(node.orelse[i], next);
     }
-}
+  }
+};
 
 BlockMirrorTextToBlocks.prototype.measureNode = function (node) {
-    this.heights = [];
-    this.recursiveMeasure(node, this.source.length - 1);
-    this.heights.shift();
-}
+  this.heights = [];
+  this.recursiveMeasure(node, this.source.length - 1);
+  this.heights.shift();
+};
 
 BlockMirrorTextToBlocks.prototype.getSourceCode = function (frm, to) {
-    var lines = this.source.slice(frm - 1, to);
-    // Strip out any starting indentation.
-    if (lines.length > 0) {
-        var indentation = lines[0].search(/\S/);
-        for (var i = 0; i < lines.length; i++) {
-            lines[i] = lines[i].substring(indentation);
-        }
+  var lines = this.source.slice(frm - 1, to); // Strip out any starting indentation.
+
+  if (lines.length > 0) {
+    var indentation = lines[0].search(/\S/);
+
+    for (var i = 0; i < lines.length; i++) {
+      lines[i] = lines[i].substring(indentation);
     }
-    return lines.join("\n");
-}
+  }
+
+  return lines.join("\n");
+};
 
 BlockMirrorTextToBlocks.prototype.convertBody = function (node, parent) {
-    this.levelIndex += 1;
-    let is_top_level = this.isTopLevel(parent);
-    // Empty body, return nothing
-    /*if (node.length === 0) {
-        return null;
-    }*/
+  this.levelIndex += 1;
+  var is_top_level = this.isTopLevel(parent); // Empty body, return nothing
+
+  /*if (node.length === 0) {
+      return null;
+  }*/
+  // Final result list
+
+  var children = [],
+      // The complete set of peers
+  root = null,
+      // The top of the current peer
+  current = null,
+      // The bottom of the current peer
+  levelIndex = this.levelIndex;
+
+  function addPeer(peer) {
+    if (root == null) {
+      children.push(peer);
+    } else {
+      children.push(root);
+    }
 
-    // Final result list
-    var children = [], // The complete set of peers
-        root = null, // The top of the current peer
-        current = null, // The bottom of the current peer
-        levelIndex = this.levelIndex;
+    root = peer;
+    current = peer;
+  }
 
-    function addPeer(peer) {
-        if (root == null) {
-            children.push(peer);
-        } else {
-            children.push(root);
-        }
-        root = peer;
-        current = peer;
+  function finalizePeers() {
+    if (root != null) {
+      children.push(root);
     }
+  }
 
-    function finalizePeers() {
-        if (root != null) {
-            children.push(root);
-        }
+  function nestChild(child) {
+    if (root == null) {
+      root = child;
+      current = child;
+    } else if (current == null) {
+      root = current;
+    } else {
+      var nextElement = document.createElement("next");
+      nextElement.appendChild(child);
+      current.appendChild(nextElement);
+      current = child;
     }
+  }
 
-    function nestChild(child) {
-        if (root == null) {
-            root = child;
-            current = child;
-        } else if (current == null) {
-            root = current;
-        } else {
-            var nextElement = document.createElement("next");
-            nextElement.appendChild(child);
-            current.appendChild(nextElement);
-            current = child;
-        }
-    }
+  var lineNumberInBody = 0,
+      lineNumberInProgram,
+      previousLineInProgram = null,
+      distance,
+      skipped_line,
+      commentCount,
+      previousHeight = null,
+      previousWasStatement = false,
+      visitedFirstLine = false,
+      wasFirstLine = false; // Iterate through each node
 
-    var lineNumberInBody = 0,
-        lineNumberInProgram,
-        previousLineInProgram = null,
-        distance,
-        skipped_line,
-        commentCount,
-        previousHeight = null,
-        previousWasStatement = false;
-    visitedFirstLine = false;
-
-    // Iterate through each node
-    for (var i = 0; i < node.length; i++) {
-        lineNumberInBody += 1;
-
-        lineNumberInProgram = node[i].lineno;
-        distance = 0, wasFirstLine = true;
-        if (previousLineInProgram != null) {
-            distance = lineNumberInProgram - previousLineInProgram - 1;
-            wasFirstLine = false;
-        }
-        lineNumberInBody += distance;
-
-        // Handle earlier comments
-        commentCount = 0;
-        for (var commentLineInProgram in this.comments) {
-            if (commentLineInProgram < lineNumberInProgram) {
-                commentChild = this.ast_Comment(this.comments[commentLineInProgram], commentLineInProgram);
-                if (previousLineInProgram == null) {
-                    nestChild(commentChild);
-                } else {
-                    skipped_previous_line = Math.abs(previousLineInProgram - commentLineInProgram) > 1;
-                    if (is_top_level && skipped_previous_line) {
-                        addPeer(commentChild);
-                    } else {
-                        nestChild(commentChild);
-                    }
-                }
-                previousLineInProgram = commentLineInProgram;
-                this.highestLineSeen = Math.max(this.highestLineSeen, parseInt(commentLineInProgram, 10));
-                distance = lineNumberInProgram - previousLineInProgram;
-                delete this.comments[commentLineInProgram];
-                commentCount += 1;
-            }
-        }
+  for (var i = 0; i < node.length; i++) {
+    lineNumberInBody += 1;
+    lineNumberInProgram = node[i].lineno;
+    distance = 0, wasFirstLine = true;
+
+    if (previousLineInProgram != null) {
+      distance = lineNumberInProgram - previousLineInProgram - 1;
+      wasFirstLine = false;
+    }
 
-        distance = lineNumberInProgram - this.highestLineSeen;
-        this.highestLineSeen = Math.max(lineNumberInProgram, this.highestLineSeen);
+    lineNumberInBody += distance; // Handle earlier comments
 
-        // Now convert the actual node
-        var height = this.heights.shift();
-        var originalSourceCode = this.getSourceCode(lineNumberInProgram, height);
-        var newChild = this.convertStatement(node[i], originalSourceCode, parent);
+    commentCount = 0;
 
-        // Skip null blocks (e.g., imports)
-        if (newChild == null) {
-            continue;
-        }
+    for (var commentLineInProgram in this.comments) {
+      if (commentLineInProgram < lineNumberInProgram) {
+        var commentChild = this.ast_Comment(this.comments[commentLineInProgram], commentLineInProgram);
 
-        skipped_line = distance > 1;
-        previousLineInProgram = lineNumberInProgram;
-        previousHeight = height;
-
-        // Handle top-level expression blocks
-        if (is_top_level && newChild.constructor == Array) {
-            addPeer(newChild[0]);
-            // Handle skipped line
-        } else if (is_top_level && skipped_line && visitedFirstLine) {
-            addPeer(newChild);
-            // The previous line was not a Peer
-        } else if (is_top_level && !previousWasStatement) {
-            addPeer(newChild);
-            // Otherwise, always embed it in there.
+        if (previousLineInProgram == null) {
+          nestChild(commentChild);
         } else {
-            nestChild(newChild);
+          var skipped_previous_line = Math.abs(previousLineInProgram - commentLineInProgram) > 1;
+
+          if (is_top_level && skipped_previous_line) {
+            addPeer(commentChild);
+          } else {
+            nestChild(commentChild);
+          }
         }
-        previousWasStatement = newChild.constructor !== Array;
 
-        visitedFirstLine = true;
+        previousLineInProgram = commentLineInProgram;
+        this.highestLineSeen = Math.max(this.highestLineSeen, parseInt(commentLineInProgram, 10));
+        distance = lineNumberInProgram - previousLineInProgram;
+        delete this.comments[commentLineInProgram];
+        commentCount += 1;
+      }
     }
 
+    distance = lineNumberInProgram - this.highestLineSeen;
+    this.highestLineSeen = Math.max(lineNumberInProgram, this.highestLineSeen); // Now convert the actual node
+
+    var height = this.heights.shift();
+    var originalSourceCode = this.getSourceCode(lineNumberInProgram, height);
+    var newChild = this.convertStatement(node[i], originalSourceCode, parent); // Skip null blocks (e.g., imports)
 
-    // Handle comments that are on the very last line
-    var lastLineNumber = lineNumberInProgram + 1;
-    if (lastLineNumber in this.comments) {
-        commentChild = this.ast_Comment(this.comments[lastLineNumber], lastLineNumber);
-        nestChild(commentChild);
-        delete this.comments[lastLineNumber];
+    if (newChild == null) {
+      continue;
     }
 
-    // Handle any extra comments that stuck around
-    if (is_top_level) {
-        for (var commentLineInProgram in this.comments) {
-            commentChild = this.ast_Comment(this.comments[commentLineInProgram], commentLineInProgram);
-            distance = commentLineInProgram - previousLineInProgram;
-            if (previousLineInProgram == null) {
-                addPeer(commentChild);
-            } else if (distance > 1) {
-                addPeer(commentChild);
-            } else {
-                nestChild(commentChild);
-            }
-            previousLineInProgram = commentLineInProgram;
-            delete this.comments[lastLineNumber];
-        }
+    skipped_line = distance > 1;
+    previousLineInProgram = lineNumberInProgram;
+    previousHeight = height; // Handle top-level expression blocks
+
+    if (is_top_level && newChild.constructor === Array) {
+      addPeer(newChild[0]); // Handle skipped line
+    } else if (is_top_level && skipped_line && visitedFirstLine) {
+      addPeer(newChild); // The previous line was not a Peer
+    } else if (is_top_level && !previousWasStatement) {
+      addPeer(newChild); // Otherwise, always embed it in there.
+    } else {
+      nestChild(newChild);
     }
 
+    previousWasStatement = newChild.constructor !== Array;
+    visitedFirstLine = true;
+  } // Handle comments that are on the very last line
 
-    finalizePeers();
 
-    this.levelIndex -= 1;
+  var lastLineNumber = lineNumberInProgram + 1;
+
+  if (lastLineNumber in this.comments) {
+    var _commentChild = this.ast_Comment(this.comments[lastLineNumber], lastLineNumber);
+
+    nestChild(_commentChild);
+    delete this.comments[lastLineNumber];
+  } // Handle any extra comments that stuck around
+
+
+  if (is_top_level) {
+    for (var commentLineInProgram in this.comments) {
+      var _commentChild2 = this.ast_Comment(this.comments[commentLineInProgram], commentLineInProgram);
+
+      distance = commentLineInProgram - previousLineInProgram;
+
+      if (previousLineInProgram == null) {
+        addPeer(_commentChild2);
+      } else if (distance > 1) {
+        addPeer(_commentChild2);
+      } else {
+        nestChild(_commentChild2);
+      }
+
+      previousLineInProgram = commentLineInProgram;
+      delete this.comments[lastLineNumber];
+    }
+  }
 
-    return children;
+  finalizePeers();
+  this.levelIndex -= 1;
+  return children;
 };
 
 BlockMirrorTextToBlocks.prototype.TOP_LEVEL_NODES = ['Module', 'Expression', 'Interactive', 'Suite'];
 
 BlockMirrorTextToBlocks.prototype.isTopLevel = function (parent) {
-
-    return !parent || this.TOP_LEVEL_NODES.indexOf(parent._astname) !== -1;
+  return !parent || this.TOP_LEVEL_NODES.indexOf(parent._astname) !== -1;
 };
 
 BlockMirrorTextToBlocks.prototype.convert = function (node, parent) {
-    let functionName = 'ast_' + node._astname;
-    if (this[functionName] === undefined) {
-        throw new Error("Could not find function: " + functionName);
-    }
-    node._parent = parent;
-    return this[functionName](node, parent);
+  var functionName = 'ast_' + node._astname;
+
+  if (this[functionName] === undefined) {
+    throw new Error("Could not find function: " + functionName);
+  }
+
+  node._parent = parent;
+  return this[functionName](node, parent);
 };
 
 function arrayMax(array) {
-    return array.reduce(function (a, b) {
-        return Math.max(a, b);
-    });
+  return array.reduce(function (a, b) {
+    return Math.max(a, b);
+  });
 }
 
 function arrayMin(array) {
-    return array.reduce(function (a, b) {
-        return Math.min(a, b);
-    });
+  return array.reduce(function (a, b) {
+    return Math.min(a, b);
+  });
 }
 
 BlockMirrorTextToBlocks.prototype.convertStatement = function (node, full_source, parent) {
-    try {
-        return this.convert(node, parent);
-    } catch (e) {
-        heights = this.getChunkHeights(node);
-        extractedSource = this.getSourceCode(arrayMin(heights), arrayMax(heights));
-        console.error(e);
-        return BlockMirrorTextToBlocks.raw_block(extractedSource);
-    }
-}
+  try {
+    return this.convert(node, parent);
+  } catch (e) {
+    var heights = this.getChunkHeights(node);
+    var extractedSource = this.getSourceCode(arrayMin(heights), arrayMax(heights));
+    console.error(e);
+    return BlockMirrorTextToBlocks.raw_block(extractedSource);
+  }
+};
 
 BlockMirrorTextToBlocks.prototype.getChunkHeights = function (node) {
-    var lineNumbers = [];
-    if (node.hasOwnProperty("lineno")) {
-        lineNumbers.push(node.lineno);
-    }
-    if (node.hasOwnProperty("body")) {
-        for (var i = 0; i < node.body.length; i += 1) {
-            var subnode = node.body[i];
-            lineNumbers = lineNumbers.concat(this.getChunkHeights(subnode));
-        }
+  var lineNumbers = [];
+
+  if (node.hasOwnProperty("lineno")) {
+    lineNumbers.push(node.lineno);
+  }
+
+  if (node.hasOwnProperty("body")) {
+    for (var i = 0; i < node.body.length; i += 1) {
+      var subnode = node.body[i];
+      lineNumbers = lineNumbers.concat(this.getChunkHeights(subnode));
     }
-    if (node.hasOwnProperty("orelse")) {
-        for (var i = 0; i < node.orelse.length; i += 1) {
-            var subnode = node.orelse[i];
-            lineNumbers = lineNumbers.concat(this.getChunkHeights(subnode));
-        }
+  }
+
+  if (node.hasOwnProperty("orelse")) {
+    for (var i = 0; i < node.orelse.length; i += 1) {
+      var subnode = node.orelse[i];
+      lineNumbers = lineNumbers.concat(this.getChunkHeights(subnode));
     }
-    return lineNumbers;
-}
+  }
+
+  return lineNumbers;
+};
 
 BlockMirrorTextToBlocks.create_block = function (type, lineNumber, fields, values, settings, mutations, statements) {
-    var newBlock = document.createElement("block");
-    // Settings
-    newBlock.setAttribute("type", type);
-    newBlock.setAttribute("line_number", lineNumber);
-    for (var setting in settings) {
-        var settingValue = settings[setting];
-        newBlock.setAttribute(setting, settingValue);
-    }
-    // Mutations
-    if (mutations !== undefined && Object.keys(mutations).length > 0) {
-        var newMutation = document.createElement("mutation");
-        for (let mutation in mutations) {
-            var mutationValue = mutations[mutation];
-            if (mutation.charAt(0) === '@') {
-                newMutation.setAttribute(mutation.substr(1), mutationValue);
-            } else if (mutationValue != null && mutationValue.constructor === Array) {
-                for (var i = 0; i < mutationValue.length; i++) {
-                    let mutationNode = document.createElement(mutation);
-                    mutationNode.setAttribute("name", mutationValue[i]);
-                    newMutation.appendChild(mutationNode);
-                }
-            } else {
-                let mutationNode = document.createElement("arg");
-                if (mutation.charAt(0) === '!') {
-                    mutationNode.setAttribute("name", "");
-                } else {
-                    mutationNode.setAttribute("name", mutation);
-                }
-                if (mutationValue !== null) {
-                    mutationNode.appendChild(mutationValue);
-                }
-                newMutation.appendChild(mutationNode);
-            }
+  var newBlock = document.createElement("block"); // Settings
+
+  newBlock.setAttribute("type", type);
+  newBlock.setAttribute("line_number", lineNumber);
+
+  for (var setting in settings) {
+    var settingValue = settings[setting];
+    newBlock.setAttribute(setting, settingValue);
+  } // Mutations
+
+
+  if (mutations !== undefined && Object.keys(mutations).length > 0) {
+    var newMutation = document.createElement("mutation");
+
+    for (var mutation in mutations) {
+      var mutationValue = mutations[mutation];
+
+      if (mutation.charAt(0) === '@') {
+        newMutation.setAttribute(mutation.substr(1), mutationValue);
+      } else if (mutationValue != null && mutationValue.constructor === Array) {
+        for (var i = 0; i < mutationValue.length; i++) {
+          var mutationNode = document.createElement(mutation);
+          mutationNode.setAttribute("name", mutationValue[i]);
+          newMutation.appendChild(mutationNode);
+        }
+      } else {
+        var _mutationNode = document.createElement("arg");
+
+        if (mutation.charAt(0) === '!') {
+          _mutationNode.setAttribute("name", "");
+        } else {
+          _mutationNode.setAttribute("name", mutation);
         }
-        newBlock.appendChild(newMutation);
-    }
-    // Fields
-    for (var field in fields) {
-        var fieldValue = fields[field];
-        var newField = document.createElement("field");
-        newField.setAttribute("name", field);
-        newField.appendChild(document.createTextNode(fieldValue));
-        newBlock.appendChild(newField);
-    }
-    // Values
-    for (var value in values) {
-        var valueValue = values[value];
-        var newValue = document.createElement("value");
-        if (valueValue !== null) {
-            newValue.setAttribute("name", value);
-            newValue.appendChild(valueValue);
-            newBlock.appendChild(newValue);
+
+        if (mutationValue !== null) {
+          _mutationNode.appendChild(mutationValue);
         }
+
+        newMutation.appendChild(_mutationNode);
+      }
     }
-    // Statements
-    if (statements !== undefined && Object.keys(statements).length > 0) {
-        for (var statement in statements) {
-            var statementValue = statements[statement];
-            if (statementValue == null) {
-                continue;
-            } else {
-                for (var i = 0; i < statementValue.length; i += 1) {
-                    // In most cases, you really shouldn't ever have more than
-                    //  one statement in this list. I'm not sure Blockly likes
-                    //  that.
-                    var newStatement = document.createElement("statement");
-                    newStatement.setAttribute("name", statement);
-                    newStatement.appendChild(statementValue[i]);
-                    newBlock.appendChild(newStatement);
-                }
-            }
+
+    newBlock.appendChild(newMutation);
+  } // Fields
+
+
+  for (var field in fields) {
+    var fieldValue = fields[field];
+    var newField = document.createElement("field");
+    newField.setAttribute("name", field);
+    newField.appendChild(document.createTextNode(fieldValue));
+    newBlock.appendChild(newField);
+  } // Values
+
+
+  for (var value in values) {
+    var valueValue = values[value];
+    var newValue = document.createElement("value");
+
+    if (valueValue !== null) {
+      newValue.setAttribute("name", value);
+      newValue.appendChild(valueValue);
+      newBlock.appendChild(newValue);
+    }
+  } // Statements
+
+
+  if (statements !== undefined && Object.keys(statements).length > 0) {
+    for (var statement in statements) {
+      var statementValue = statements[statement];
+
+      if (statementValue == null) {
+        continue;
+      } else {
+        for (var i = 0; i < statementValue.length; i += 1) {
+          // In most cases, you really shouldn't ever have more than
+          //  one statement in this list. I'm not sure Blockly likes
+          //  that.
+          var newStatement = document.createElement("statement");
+          newStatement.setAttribute("name", statement);
+          newStatement.appendChild(statementValue[i]);
+          newBlock.appendChild(newStatement);
         }
+      }
     }
-    return newBlock;
-}
+  }
+
+  return newBlock;
+};
 
 BlockMirrorTextToBlocks.raw_block = function (txt) {
-    // TODO: lineno as second parameter!
-    return BlockMirrorTextToBlocks.create_block("ast_Raw", 0, {"TEXT": txt});
+  // TODO: lineno as second parameter!
+  return BlockMirrorTextToBlocks.create_block("ast_Raw", 0, {
+    "TEXT": txt
+  });
 };
 
 BlockMirrorTextToBlocks.BLOCKS = [];
 
 BlockMirrorTextToBlocks.prototype['ast_Module'] = function (node) {
-    return this.convertBody(node.body, node);
+  return this.convertBody(node.body, node);
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Interactive'] = function (node) {
-    return this.convertBody(node.body, node);
+  return this.convertBody(node.body, node);
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Expression'] = BlockMirrorTextToBlocks.prototype['ast_Interactive'];
 BlockMirrorTextToBlocks.prototype['ast_Suite'] = BlockMirrorTextToBlocks.prototype['ast_Module'];
 
 BlockMirrorTextToBlocks.prototype['ast_Pass'] = function () {
-    return null; //block("controls_pass");
+  return null; //block("controls_pass");
 };
 
-
 BlockMirrorTextToBlocks.prototype.convertElements = function (key, values, parent) {
-    var output = {};
-    for (var i = 0; i < values.length; i++) {
-        output[key + i] = this.convert(values[i], parent);
-    }
-    return output;
+  var output = {};
+
+  for (var i = 0; i < values.length; i++) {
+    output[key + i] = this.convert(values[i], parent);
+  }
+
+  return output;
 };
 
 Blockly.Python['blank'] = '___';
-
 BlockMirrorTextToBlocks.prototype.LOCKED_BLOCK = {
-    "inline": "true",
-    'deletable': "false",
-    "movable": "false"
+  "inline": "true",
+  'deletable': "false",
+  "movable": "false"
 };
-
 BlockMirrorTextToBlocks.COLOR = {
-    VARIABLES: 225,
-    FUNCTIONS: 210,
-    OO: 240,
-    CONTROL: 270,
-    MATH: 150,
-    TEXT: 120,
-    FILE: 125,
-    PLOTTING: 135,
-    LOGIC: 345,
-    PYTHON: 60,
-    EXCEPTIONS: 300,
-    SEQUENCES: 15,
-    LIST: 30,
-    DICTIONARY: 0,
-    SET: 10,
-    TUPLE: 20
-}
+  VARIABLES: 225,
+  FUNCTIONS: 210,
+  OO: 240,
+  CONTROL: 270,
+  MATH: 150,
+  TEXT: 120,
+  FILE: 125,
+  PLOTTING: 135,
+  LOGIC: 345,
+  PYTHON: 60,
+  EXCEPTIONS: 300,
+  SEQUENCES: 15,
+  LIST: 30,
+  DICTIONARY: 0,
+  SET: 10,
+  TUPLE: 20
+};
 BlockMirrorTextToBlocks.prototype.FUNCTION_SIGNATURES = {
-    'abs': {
-        'returns': true,
-        'full': ['x'], colour: BlockMirrorTextToBlocks.COLOR.MATH
+  'abs': {
+    'returns': true,
+    'full': ['x'],
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'all': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.LOGIC
+  },
+  'any': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.LOGIC
+  },
+  'ascii': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'bin': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'bool': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.LOGIC,
+    simple: ['x']
+  },
+  'breakpoint': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.PYTHON
+  },
+  'bytearray': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'bytes': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'callable': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.LOGIC
+  },
+  'chr': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'classmethod': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.OO
+  },
+  'compile': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.PYTHON
+  },
+  'complex': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'delattr': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.VARIABLES
+  },
+  'dict': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY
+  },
+  'dir': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.PYTHON
+  },
+  'divmod': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'enumerate': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  'eval': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.PYTHON
+  },
+  'exec': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.PYTHON
+  },
+  'filter': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  'float': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH,
+    simple: ['x']
+  },
+  'format': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'frozenset': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  'getattr': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.OO
+  },
+  'globals': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.VARIABLES
+  },
+  'hasattr': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.OO
+  },
+  'hash': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'help': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.PYTHON
+  },
+  'hex': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'id': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.PYTHON
+  },
+  'input': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT,
+    simple: ['prompt']
+  },
+  'int': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH,
+    simple: ['x']
+  },
+  'isinstance': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.LOGIC
+  },
+  'issubclass': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.LOGIC
+  },
+  'iter': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  'len': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  'list': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.LIST
+  },
+  'locals': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.VARIABLES
+  },
+  'map': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  'max': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'memoryview': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.PYTHON
+  },
+  'min': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'next': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  'object': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.OO
+  },
+  'oct': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'open': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.FILE
+  },
+  'ord': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'pow': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'print': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT,
+    simple: ['message'],
+    full: ['*messages', 'sep', 'end', 'file', 'flush']
+  },
+  'property': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.OO
+  },
+  'range': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES,
+    simple: ['stop'],
+    full: ['start', 'stop', 'step']
+  },
+  'repr': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'reversed': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  'round': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH,
+    full: ['x', 'ndigits'],
+    simple: ['x']
+  },
+  'set': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SET
+  },
+  'setattr': {
+    'returns': false,
+    'full': ['object', 'name', 'value'],
+    colour: BlockMirrorTextToBlocks.COLOR.OO
+  },
+  'slice': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  'sorted': {
+    'full': ['iterable', '*', '**key', '**reverse'],
+    'simple': ['iterable'],
+    'returns': true,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  'staticmethod': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.OO
+  },
+  'str': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT,
+    simple: ['x']
+  },
+  'sum': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'super': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.OO
+  },
+  'tuple': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TUPLE
+  },
+  'type': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.OO
+  },
+  'vars': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.VARIABLES
+  },
+  'zip': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  '__import__': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.PYTHON
+  }
+};
+BlockMirrorTextToBlocks.prototype.METHOD_SIGNATURES = {
+  'conjugate': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'trunc': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'floor': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'ceil': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'bit_length': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'to_bytes': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'from_bytes': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'as_integer_ratio': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'is_integer': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'hex': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  'fromhex': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.MATH
+  },
+  '__iter__': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  '__next__': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  'index': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.LIST
+  },
+  'count': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.LIST
+  },
+  'append': {
+    'returns': false,
+    'full': ['x'],
+    'message': 'append',
+    'premessage': 'to list',
+    colour: BlockMirrorTextToBlocks.COLOR.LIST
+  },
+  'clear': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  'copy': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.LIST
+  },
+  'extend': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.LIST
+  },
+  'insert': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.LIST
+  },
+  'pop': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  'remove': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  'reverse': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.LIST
+  },
+  'sort': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.LIST
+  },
+  'capitalize': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'casefold': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'center': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'encode': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'endswith': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'expandtabs': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'find': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'format': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'format_map': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'isalnum': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'isalpha': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'isascii': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'isdecimal': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'isdigit': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'isidentifier': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'islower': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'isnumeric': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'isprintable': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'isspace': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'istitle': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'isupper': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'join': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'ljust': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'lower': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'lstrip': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'maketrans': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'partition': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'replace': {
+    'returns': true,
+    'full': ['old', 'new', 'count'],
+    'simple': ['old', 'new'],
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'rfind': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'rindex': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'rjust': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'rpartition': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'rsplit': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'rstrip': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'split': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'splitlines': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'startswith': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'strip': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'swapcase': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'title': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'translate': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'upper': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'zfill': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  'decode': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.TEXT
+  },
+  '__eq__': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.LOGIC
+  },
+  'tobytes': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.PYTHON
+  },
+  'tolist': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.PYTHON
+  },
+  'release': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.PYTHON
+  },
+  'cast': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.PYTHON
+  },
+  'isdisjoint': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SET
+  },
+  'issubset': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SET
+  },
+  'issuperset': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SET
+  },
+  'union': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SET
+  },
+  'intersection': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SET
+  },
+  'difference': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SET
+  },
+  'symmetric_difference': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.SET
+  },
+  'update': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.SET
+  },
+  'intersection_update': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.SET
+  },
+  'difference_update': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.SET
+  },
+  'symmetric_difference_update': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.SET
+  },
+  'add': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.SET
+  },
+  'discard': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.SET
+  },
+  'fromkeys': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY
+  },
+  'get': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY
+  },
+  'items': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY
+  },
+  'keys': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY
+  },
+  'popitem': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY
+  },
+  'setdefault': {
+    returns: false,
+    colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY
+  },
+  'values': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY
+  },
+  '__enter__': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.CONTROL
+  },
+  '__exit__': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.CONTROL
+  },
+  'mro': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.OO
+  },
+  '__subclasses__': {
+    returns: true,
+    colour: BlockMirrorTextToBlocks.COLOR.OO
+  }
+};
+BlockMirrorTextToBlocks.prototype.MODULE_FUNCTION_SIGNATURES = {
+  'plt': {
+    'show': {
+      returns: false,
+      simple: [],
+      message: 'show plot canvas',
+      colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
     },
-    'all': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LOGIC},
-    'any': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LOGIC},
-    'ascii': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'bin': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'bool': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LOGIC},
-    'breakpoint': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
-    'bytearray': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'bytes': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'callable': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LOGIC},
-    'chr': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'classmethod': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.OO},
-    'compile': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
-    'complex': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'delattr': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.VARIABLES},
-    'dict': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY},
-    'dir': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
-    'divmod': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'enumerate': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'eval': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
-    'exec': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
-    'filter': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'float': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'format': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'frozenset': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'getattr': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.OO},
-    'globals': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.VARIABLES},
-    'hasattr': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.OO},
-    'hash': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'help': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
-    'hex': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'id': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
-    'input': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'int': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'isinstance': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LOGIC},
-    'issubclass': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LOGIC},
-    'iter': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'len': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'list': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LIST},
-    'locals': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.VARIABLES},
-    'map': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'max': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'memoryview': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
-    'min': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'next': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'object': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.OO},
-    'oct': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'open': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.FILE},
-    'ord': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'pow': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'print': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'property': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.OO},
-    'range': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'repr': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'reversed': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'round': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'set': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SET},
-    'setattr': {
-        'returns': false,
-        'full': ['object', 'name', 'value'], colour: BlockMirrorTextToBlocks.COLOR.OO
+    'hist': {
+      returns: false,
+      simple: ['values'],
+      message: 'plot histogram',
+      colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
     },
-    'slice': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'sorted': {
-        'full': ['iterable', '*', '**key', '**reverse'],
-        'simple': ['iterable'],
-        'returns': true,
-        colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+    'plot': {
+      returns: false,
+      simple: ['values'],
+      message: 'plot line',
+      colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
     },
-    'staticmethod': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.OO},
-    'str': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'sum': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'super': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.OO},
-    'tuple': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TUPLE},
-    'type': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.OO},
-    'vars': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.VARIABLES},
-    'zip': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    '__import__': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.PYTHON}
-};
-
-BlockMirrorTextToBlocks.prototype.METHOD_SIGNATURES = {
-    'conjugate': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'trunc': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'floor': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'ceil': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'bit_length': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'to_bytes': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'from_bytes': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'as_integer_ratio': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'is_integer': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'hex': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'fromhex': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    '__iter__': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    '__next__': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'index': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LIST},
-    'count': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LIST},
-    'append': {
-        'returns': false,
-        'full': ['x'],
-        'message': 'append',
-        'premessage': 'to list', colour: BlockMirrorTextToBlocks.COLOR.LIST
+    'scatter': {
+      returns: false,
+      simple: ['xs', 'ys'],
+      message: 'plot scatter',
+      colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
     },
-    'clear': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'copy': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LIST},
-    'extend': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.LIST},
-    'insert': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.LIST},
-    'pop': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'remove': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'reverse': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.LIST},
-    'sort': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.LIST},
-    'capitalize': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'casefold': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'center': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'encode': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'endswith': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'expandtabs': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'find': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'format': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'format_map': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'isalnum': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'isalpha': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'isascii': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'isdecimal': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'isdigit': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'isidentifier': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'islower': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'isnumeric': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'isprintable': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'isspace': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'istitle': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'isupper': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'join': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'ljust': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'lower': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'lstrip': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'maketrans': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'partition': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'replace': {
-        'returns': true,
-        'full': ['old', 'new', 'count'],
-        'simple': ['old', 'new'], colour: BlockMirrorTextToBlocks.COLOR.TEXT
+    'title': {
+      returns: false,
+      simple: ['label'],
+      message: "make plot's title",
+      colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
     },
-    'rfind': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'rindex': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'rjust': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'rpartition': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'rsplit': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'rstrip': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'split': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'splitlines': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'startswith': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'strip': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'swapcase': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'title': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'translate': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'upper': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'zfill': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'decode': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    '__eq__': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LOGIC},
-    'tobytes': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
-    'tolist': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
-    'release': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
-    'cast': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
-    'isdisjoint': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SET},
-    'issubset': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SET},
-    'issuperset': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SET},
-    'union': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SET},
-    'intersection': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SET},
-    'difference': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SET},
-    'symmetric_difference': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SET},
-    'update': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.SET},
-    'intersection_update': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.SET},
-    'difference_update': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.SET},
-    'symmetric_difference_update': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.SET},
-    'add': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.SET},
-    'discard': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.SET},
-    'fromkeys': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY},
-    'get': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY},
-    'items': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY},
-    'keys': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY},
-    'popitem': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY},
-    'setdefault': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY},
-    'values': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.DICTIONARY},
-    '__enter__': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.CONTROL},
-    '__exit__': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.CONTROL},
-    'mro': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.OO},
-    '__subclasses__': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.OO},
+    'xlabel': {
+      returns: false,
+      simple: ['label'],
+      message: "make plot's x-axis label",
+      colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
+    },
+    'ylabel': {
+      returns: false,
+      simple: ['label'],
+      message: "make plot's y-axis label",
+      colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
+    }
+  }
 };
+BlockMirrorTextToBlocks.prototype.MODULE_FUNCTION_SIGNATURES['matplotlib.pyplot'] = BlockMirrorTextToBlocks.prototype.MODULE_FUNCTION_SIGNATURES['plt'];
 
-BlockMirrorTextToBlocks.prototype.MODULE_FUNCTION_SIGNATURES = {
-    'plt': {
-        'show': {
-            returns: false,
-            message: 'show plot canvas',
-            colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
-        },
-        'hist': {
-            returns: false,
-            message: 'plot histogram',
-            colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
-        },
-        'plot': {
-            returns: false,
-            message: 'plot line',
-            colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
-        },
-        'scatter': {
-            returns: false,
-            message: 'plot scatter',
-            colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
-        },
-        'title': {
-            returns: false,
-            message: "make plot's title",
-            colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
-        },
-        'xlabel': {
-            returns: false,
-            message: "make plot's x-axis label",
-            colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
-        },
-        'ylabel': {
-            returns: false,
-            message: "make plot's y-axis label",
-            colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
-        }
-    }
+BlockMirrorTextToBlocks.getFunctionBlock = function (name, values, module) {
+  if (values === undefined) {
+    values = {};
+  } // TODO: hack, we shouldn't be accessing the prototype like this
+
+
+  var signature;
+  var method = false;
+
+  if (module !== undefined) {
+    signature = BlockMirrorTextToBlocks.prototype.MODULE_FUNCTION_SIGNATURES[module][name];
+  } else if (name.startsWith('.')) {
+    signature = BlockMirrorTextToBlocks.prototype.METHOD_SIGNATURES[name.substr(1)];
+    method = true;
+  } else {
+    signature = BlockMirrorTextToBlocks.prototype.FUNCTION_SIGNATURES[name];
+  }
+
+  var args = signature.simple !== undefined ? signature.simple : signature.full !== undefined ? signature.full : [];
+  var argumentsMutation = {
+    "@arguments": args.length,
+    "@returns": signature.returns || false,
+    "@parameters": true,
+    "@method": method,
+    "@name": name,
+    "@message": signature.message ? signature.message : name,
+    "@premessage": signature.premessage ? signature.premessage : "",
+    "@colour": signature.colour ? signature.colour : 0
+  };
+
+  for (var i = 0; i < args.length; i += 1) {
+    argumentsMutation["UNKNOWN_ARG:" + i] = null;
+  }
+
+  var newBlock = BlockMirrorTextToBlocks.create_block("ast_Call", null, {}, values, {
+    inline: true
+  }, argumentsMutation); // Return as either statement or expression
+
+  return BlockMirrorTextToBlocks.xmlToString(newBlock);
+};
+
+var ZERO_BLOCK = BlockMirrorTextToBlocks.create_block('ast_Num', null, {
+  'NUM': 0
+});
+BlockMirrorBlockEditor.EXTRA_TOOLS = {};
+
+BlockMirrorBlockEditor.getDefaultBlocks = function () {
+  return "<category name=\"Variables\" custom=\"VARIABLE\" colour=\"".concat(BlockMirrorTextToBlocks.COLOR.VARIABLES, "\"></category>\n        <category name=\"Decisions\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.LOGIC, "\">\n            <block type=\"ast_If\"></block>\n            <block type=\"ast_If\"><mutation orelse=\"true\"></mutation></block>\n            <block type=\"ast_Compare\"></block>\n            <block type=\"ast_BoolOp\"></block>\n            <block type=\"ast_UnaryOpNot\"></block>\n        </category>\n        <category name=\"Iteration\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.CONTROL, "\">\n            <block type=\"ast_For\"></block>        \n        </category>\n        <sep></sep>\n        <category name=\"Calculation\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.MATH, "\">\n            <block type=\"ast_BinOp\"></block>\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("round"), "\n        </category>\n        <category name=\"Output\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.PLOTTING, "\">\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("print"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("plot", {}, "plt"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("scatter", {}, "plt"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("hist", {}, "plt"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("show", {}, "plt"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("title", {}, "plt"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("xlabel", {}, "plt"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("ylabel", {}, "plt"), "\n        </category>\n        <category name=\"Input\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.TEXT, "\">\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("input"), "\n        </category>\n        <sep></sep>\n        <category name=\"Values\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.TEXT, "\">\n            <block type=\"ast_Str\"></block>\n            <block type=\"ast_Num\"></block>\n            <block type=\"ast_NameConstantBoolean\"></block>\n        </category>\n        <category name=\"Conversion\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.TEXT, "\">\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("int"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("float"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("str"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("bool"), "\n        </category>\n        <category name=\"Lists\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.LIST, "\">\n            <block type=\"ast_List\"><mutation items=\"3\"></mutation>\n                <value name=\"ADD0\"><block type=\"ast_Num\"><field name=\"NUM\">0</field></block></value>\n                <value name=\"ADD1\"><block type=\"ast_Num\"><field name=\"NUM\">0</field></block></value>\n                <value name=\"ADD2\"><block type=\"ast_Num\"><field name=\"NUM\">0</field></block></value>\n            </block>\n            <block type=\"ast_List\"><mutation items=\"3\"></mutation>\n                <value name=\"ADD0\"></value>\n                <value name=\"ADD1\"></value>\n                <value name=\"ADD2\"></value>\n            </block>\n            <block type=\"ast_List\"><mutation items=\"0\"></mutation></block>\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock(".append"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("range", {
+    'ARG0': ZERO_BLOCK
+  }), "\n        </category>\n        <category name=\"Dictionaries\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.DICTIONARY, "\">\n            <block type=\"ast_Dict\">\n                <mutation items=\"3\"></mutation>\n                <value name=\"ADD0\"><block type=\"ast_DictItem\" deletable=\"false\" movable=\"false\">\n                    <value name=\"KEY\"><block type=\"ast_Str\"><field name=\"TEXT\">1st key</field></block></value>\n                </block></value>\n                <value name=\"ADD1\"><block type=\"ast_DictItem\" deletable=\"false\" movable=\"false\">\n                    <value name=\"KEY\"><block type=\"ast_Str\"><field name=\"TEXT\">2nd key</field></block></value>\n                </block></value>\n                <value name=\"ADD2\"><block type=\"ast_DictItem\" deletable=\"false\" movable=\"false\">\n                    <value name=\"KEY\"><block type=\"ast_Str\"><field name=\"TEXT\">3rd key</field></block></value>\n                </block></value>\n            </block>\n            <block type=\"ast_Subscript\">\n                <mutation><arg name=\"I\"></arg></mutation>\n                <value name=\"INDEX0\"><block type=\"ast_Str\"><field name=\"TEXT\">key</field></block></value>\n            </block>\n        </category>\n        <sep></sep>");
 };
 
-BlockMirrorTextToBlocks.prototype.MODULE_FUNCTION_SIGNATURES['matplotlib.pyplot'] =
-    BlockMirrorTextToBlocks.prototype.MODULE_FUNCTION_SIGNATURES['plt'];
+BlockMirrorBlockEditor.prototype.TOOLBOXES = {
+  'normal': BlockMirrorBlockEditor.getDefaultBlocks()
+}; // TODO: fix these to be more interesting
+
+BlockMirrorBlockEditor.prototype.TOOLBOXES['minimal'] = BlockMirrorBlockEditor.prototype.TOOLBOXES['normal'];
+BlockMirrorBlockEditor.prototype.TOOLBOXES['full'] = BlockMirrorBlockEditor.prototype.TOOLBOXES['normal'];
+/*
+xml += '<category name="Iteration" colour="300">' +
+
+    '<block type="ast_ForElse"></block>' +
+    '</category>';
+xml += '<category name="Values" colour="300">' +
+    '<block type="ast_Num"></block>' +
+    '</category>';
+//xml += '<category name="Values" colour="300"><button value="From Code">From Code</button></category>';
+xml += '</xml>';*/
+
 BlockMirrorTextToBlocks.BLOCKS.push({
   "type": "ast_For",
   "message0": "for each item %1 in list %2 : %3 %4",
-  "args0": [
-    { "type": "input_value", "name": "TARGET" },
-    { "type": "input_value", "name": "ITER" },
-    { "type": "input_dummy" },
-    { "type": "input_statement", "name": "BODY" }
-  ],
+  "args0": [{
+    "type": "input_value",
+    "name": "TARGET"
+  }, {
+    "type": "input_value",
+    "name": "ITER"
+  }, {
+    "type": "input_dummy"
+  }, {
+    "type": "input_statement",
+    "name": "BODY"
+  }],
   "inputsInline": true,
   "previousStatement": null,
   "nextStatement": null,
-  "colour": BlockMirrorTextToBlocks.COLOR.CONTROL,
-})
-
+  "colour": BlockMirrorTextToBlocks.COLOR.CONTROL
+});
 BlockMirrorTextToBlocks.BLOCKS.push({
   "type": "ast_ForElse",
   "message0": "for each item %1 in list %2 : %3 %4 else: %5 %6",
-  "args0": [
-    { "type": "input_value", "name": "TARGET" },
-    { "type": "input_value", "name": "ITER" },
-    { "type": "input_dummy" },
-    { "type": "input_statement", "name": "BODY" },
-    { "type": "input_dummy" },
-    { "type": "input_statement", "name": "ELSE" }
-  ],
+  "args0": [{
+    "type": "input_value",
+    "name": "TARGET"
+  }, {
+    "type": "input_value",
+    "name": "ITER"
+  }, {
+    "type": "input_dummy"
+  }, {
+    "type": "input_statement",
+    "name": "BODY"
+  }, {
+    "type": "input_dummy"
+  }, {
+    "type": "input_statement",
+    "name": "ELSE"
+  }],
   "inputsInline": true,
   "previousStatement": null,
   "nextStatement": null,
-  "colour": BlockMirrorTextToBlocks.COLOR.CONTROL,
-})
+  "colour": BlockMirrorTextToBlocks.COLOR.CONTROL
+});
 
-Blockly.Python['ast_For'] = function(block) {
+Blockly.Python['ast_For'] = function (block) {
   // For each loop.
-  var argument0 = Blockly.Python.valueToCode(block, 'TARGET',
-      Blockly.Python.ORDER_RELATIONAL) || Blockly.Python.blank;
-  var argument1 = Blockly.Python.valueToCode(block, 'ITER',
-      Blockly.Python.ORDER_RELATIONAL) || Blockly.Python.blank;
+  var argument0 = Blockly.Python.valueToCode(block, 'TARGET', Blockly.Python.ORDER_RELATIONAL) || Blockly.Python.blank;
+  var argument1 = Blockly.Python.valueToCode(block, 'ITER', Blockly.Python.ORDER_RELATIONAL) || Blockly.Python.blank;
   var branchBody = Blockly.Python.statementToCode(block, 'BODY') || Blockly.Python.PASS;
   var branchElse = Blockly.Python.statementToCode(block, 'ELSE');
   var code = 'for ' + argument0 + ' in ' + argument1 + ':\n' + branchBody;
+
   if (branchElse) {
-      code += 'else:\n' + branchElse;
+    code += 'else:\n' + branchElse;
   }
+
   return code;
 };
 
 BlockMirrorTextToBlocks.prototype['ast_For'] = function (node, parent) {
-    var target = node.target;
-    var iter = node.iter;
-    var body = node.body;
-    var orelse = node.orelse;
-    
-    var blockName = 'ast_For';
-    var bodies = {'BODY': this.convertBody(body, node)};
-    
-    if (orelse.length > 0) {
-        blockName = "ast_ForElse";
-        bodies['ELSE'] = this.convertBody(orelse, node);
-    }
-
-    return BlockMirrorTextToBlocks.create_block(blockName, node.lineno, {
-    }, {
-        "ITER": this.convert(iter, node),
-        "TARGET": this.convert(target, node)
-    }, {}, {}, bodies);
-}
+  var target = node.target;
+  var iter = node.iter;
+  var body = node.body;
+  var orelse = node.orelse;
+  var blockName = 'ast_For';
+  var bodies = {
+    'BODY': this.convertBody(body, node)
+  };
+
+  if (orelse.length > 0) {
+    blockName = "ast_ForElse";
+    bodies['ELSE'] = this.convertBody(orelse, node);
+  }
+
+  return BlockMirrorTextToBlocks.create_block(blockName, node.lineno, {}, {
+    "ITER": this.convert(iter, node),
+    "TARGET": this.convert(target, node)
+  }, {}, {}, bodies);
+};
 
 Blockly.Python['ast_ForElse'] = Blockly.Python['ast_For'];
 BlockMirrorTextToBlocks.prototype['ast_ForElse'] = BlockMirrorTextToBlocks.prototype['ast_For'];
-
 Blockly.Blocks['ast_If'] = {
-    init: function () {
-        this.orelse_ = 0;
-        this.elifs_ = 0;
-        this.appendValueInput('TEST')
-            .appendField("if");
-        this.appendStatementInput("BODY")
-            .setCheck(null)
-            .setAlign(Blockly.ALIGN_RIGHT);
-        this.setInputsInline(false);
-        this.setPreviousStatement(true, null);
-        this.setNextStatement(true, null);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.LOGIC);
-        this.updateShape_();
-    },
-    // TODO: Not mutable currently
-    updateShape_: function () {
-        let latestInput = "BODY";
-        for (var i = 0; i < this.elifs_; i++) {
-            if (!this.getInput('ELIF' + i)) {
-                this.appendValueInput('ELIFTEST' + i)
-                    .appendField('elif');
-                this.appendStatementInput("ELIFBODY" + i)
-                    .setCheck(null);
-            }
-        }
-        // Remove deleted inputs.
-        while (this.getInput('ELIFTEST' + i)) {
-            this.removeInput('ELIFTEST' + i);
-            this.removeInput('ELIFBODY' + i);
-            i++;
-        }
+  init: function init() {
+    this.orelse_ = 0;
+    this.elifs_ = 0;
+    this.appendValueInput('TEST').appendField("if");
+    this.appendStatementInput("BODY").setCheck(null).setAlign(Blockly.ALIGN_RIGHT);
+    this.setInputsInline(false);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.LOGIC);
+    this.updateShape_();
+  },
+  // TODO: Not mutable currently
+  updateShape_: function updateShape_() {
+    var latestInput = "BODY";
+
+    for (var i = 0; i < this.elifs_; i++) {
+      if (!this.getInput('ELIF' + i)) {
+        this.appendValueInput('ELIFTEST' + i).appendField('elif');
+        this.appendStatementInput("ELIFBODY" + i).setCheck(null);
+      }
+    } // Remove deleted inputs.
+
+
+    while (this.getInput('ELIFTEST' + i)) {
+      this.removeInput('ELIFTEST' + i);
+      this.removeInput('ELIFBODY' + i);
+      i++;
+    }
+
+    if (this.orelse_ && !this.getInput('ELSE')) {
+      this.appendDummyInput('ORELSETEST').appendField("else:");
+      this.appendStatementInput("ORELSEBODY").setCheck(null);
+    } else if (!this.orelse_ && this.getInput('ELSE')) {
+      block.removeInput('ORELSETEST');
+      block.removeInput('ORELSEBODY');
+    }
+
+    for (i = 0; i < this.elifs_; i++) {
+      if (this.orelse_) {
+        this.moveInputBefore('ELIFTEST' + i, 'ORELSETEST');
+        this.moveInputBefore('ELIFBODY' + i, 'ORELSETEST');
+      } else if (i + 1 < this.elifs_) {
+        this.moveInputBefore('ELIFTEST' + i, 'ELIFTEST' + (i + 1));
+        this.moveInputBefore('ELIFBODY' + i, 'ELIFBODY' + (i + 1));
+      }
+    }
+  },
+
+  /**
+   * Create XML to represent the (non-editable) name and arguments.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('orelse', this.orelse_);
+    container.setAttribute('elifs', this.elifs_);
+  },
+
+  /**
+   * Parse XML to restore the (non-editable) name and parameters.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.orelse_ = "true" === xmlElement.getAttribute('orelse');
+    this.elifs_ = parseInt(xmlElement.getAttribute('elifs'), 10);
+    this.updateShape_();
+  }
+};
 
-        if (this.orelse_ && !this.getInput('ELSE')) {
-            this.appendDummyInput('ORELSETEST')
-                .appendField("else:");
-            this.appendStatementInput("ORELSEBODY")
-                .setCheck(null);
-        } else if (!this.orelse_ && this.getInput('ELSE')) {
-            block.removeInput('ORELSETEST');
-            block.removeInput('ORELSEBODY');
-        }
+Blockly.Python['ast_If'] = function (block) {
+  // Test
+  var test = "if " + (Blockly.Python.valueToCode(block, 'TEST', Blockly.Python.ORDER_NONE) || Blockly.Python.blank) + ":\n"; // Body:
 
-        for (i = 0; i < this.elifs_; i++) {
-            if (this.orelse_) {
-                this.moveInputBefore('ELIFTEST' + i, 'ORELSETEST');
-                this.moveInputBefore('ELIFBODY' + i, 'ORELSETEST');
-            } else if (i+1 < this.elifs_) {
-                this.moveInputBefore('ELIFTEST' + i, 'ELIFTEST' + (i+1));
-                this.moveInputBefore('ELIFBODY' + i, 'ELIFBODY' + (i+1));
-            }
-        }
-    },
-    /**
-     * Create XML to represent the (non-editable) name and arguments.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        let container = document.createElement('mutation');
-        container.setAttribute('orelse', this.orelse_);
-        container.setAttribute('elifs', this.elifs_);
-    },
-    /**
-     * Parse XML to restore the (non-editable) name and parameters.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.orelse_ = "true" === xmlElement.getAttribute('orelse');
-        this.elifs_ = parseInt(xmlElement.getAttribute('elifs'), 10);
-        this.updateShape_();
-    },
-};
+  var body = Blockly.Python.statementToCode(block, 'BODY') || Blockly.Python.PASS; // Elifs
 
-Blockly.Python['ast_If'] = function (block) {
-    // Test
-    let test = "if " + (Blockly.Python.valueToCode(block, 'TEST',
-        Blockly.Python.ORDER_NONE) || Blockly.Python.blank) + ":\n";
-    // Body:
-    let body = Blockly.Python.statementToCode(block, 'BODY') || Blockly.Python.PASS;
-    // Elifs
+  var elifs = new Array(block.elifs_);
 
-    let elifs = new Array(block.elifs_);
-    for (let i = 0; i < block.elifs_; i++) {
-        let elif = block.elifs_[i];
-        let clause = "elif " + (Blockly.Python.valueToCode(block, 'ELIFTEST' + i,
-            Blockly.Python.ORDER_NONE) || Blockly.Python.blank);
-        clause += ":\n" + (Blockly.Python.statementToCode(block, 'ELIFBODY' + i) || Blockly.Python.PASS);
-        elifs[i] = clause;
-    }
-    // Orelse:
-    let orelse = "";
-    if (this.orelse_) {
-        orelse = "else:\n" + (Blockly.Python.statementToCode(block, 'ORELSEBODY') || Blockly.Python.PASS);
-    }
-    return test + body + elifs.join("") + orelse;
+  for (var i = 0; i < block.elifs_; i++) {
+    var elif = block.elifs_[i];
+    var clause = "elif " + (Blockly.Python.valueToCode(block, 'ELIFTEST' + i, Blockly.Python.ORDER_NONE) || Blockly.Python.blank);
+    clause += ":\n" + (Blockly.Python.statementToCode(block, 'ELIFBODY' + i) || Blockly.Python.PASS);
+    elifs[i] = clause;
+  } // Orelse:
+
+
+  var orelse = "";
+
+  if (this.orelse_) {
+    orelse = "else:\n" + (Blockly.Python.statementToCode(block, 'ORELSEBODY') || Blockly.Python.PASS);
+  }
+
+  return test + body + elifs.join("") + orelse;
 };
 
 BlockMirrorTextToBlocks.prototype['ast_If'] = function (node, parent) {
-    let test = node.test;
-    let body = node.body;
-    let orelse = node.orelse;
-
-    let hasOrelse = false;
-    let elifCount = 0;
-
-    let values = {"TEST": this.convert(test, node)};
-    let statements = {"BODY": this.convertBody(body, node)};
-
-    while (orelse !== undefined && orelse.length > 0) {
-        if (orelse.length === 1) {
-            if (orelse[0]._astname === "If") {
-                // This is an ELIF
-                this.heights.shift();
-                values['ELIFTEST' + elifCount] = this.convert(orelse[0].test, node);
-                statements['ELIFBODY' + elifCount] = this.convertBody(orelse[0].body, node);
-                elifCount++;
-            } else {
-                hasOrelse = true;
-                statements['ORELSEBODY'] = this.convertBody(orelse, node);
-            }
-        } else {
-            hasOrelse = true;
-            statements['ORELSEBODY'] = this.convertBody(orelse, node);
-        }
-        orelse = orelse[0].orelse;
+  var test = node.test;
+  var body = node.body;
+  var orelse = node.orelse;
+  var hasOrelse = false;
+  var elifCount = 0;
+  var values = {
+    "TEST": this.convert(test, node)
+  };
+  var statements = {
+    "BODY": this.convertBody(body, node)
+  };
+
+  while (orelse !== undefined && orelse.length > 0) {
+    if (orelse.length === 1) {
+      if (orelse[0]._astname === "If") {
+        // This is an ELIF
+        this.heights.shift();
+        values['ELIFTEST' + elifCount] = this.convert(orelse[0].test, node);
+        statements['ELIFBODY' + elifCount] = this.convertBody(orelse[0].body, node);
+        elifCount++;
+      } else {
+        hasOrelse = true;
+        statements['ORELSEBODY'] = this.convertBody(orelse, node);
+      }
+    } else {
+      hasOrelse = true;
+      statements['ORELSEBODY'] = this.convertBody(orelse, node);
     }
 
-    return BlockMirrorTextToBlocks.create_block("ast_If", node.lineno, {},
-        values, {}, {
-            "@orelse": hasOrelse,
-            "@elifs": elifCount
-        }, statements);
+    orelse = orelse[0].orelse;
+  }
+
+  return BlockMirrorTextToBlocks.create_block("ast_If", node.lineno, {}, values, {}, {
+    "@orelse": hasOrelse,
+    "@elifs": elifCount
+  }, statements);
 };
+
 Blockly.Blocks['ast_While'] = {
-    init: function () {
-        this.orelse_ = 0;
-        this.appendValueInput('TEST')
-            .appendField("while");
-        this.appendStatementInput("BODY")
-            .setCheck(null)
-            .setAlign(Blockly.ALIGN_RIGHT);
-        this.setInputsInline(false);
-        this.setPreviousStatement(true, null);
-        this.setNextStatement(true, null);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.CONTROL);
-        this.updateShape_();
-    },
-    // TODO: Not mutable currently
-    updateShape_: function () {
-        let latestInput = "BODY";
-
-        if (this.orelse_ && !this.getInput('ELSE')) {
-            this.appendDummyInput('ORELSETEST')
-                .appendField("else:");
-            this.appendStatementInput("ORELSEBODY")
-                .setCheck(null);
-        } else if (!this.orelse_ && this.getInput('ELSE')) {
-            block.removeInput('ORELSETEST');
-            block.removeInput('ORELSEBODY');
-        }
-    },
-    /**
-     * Create XML to represent the (non-editable) name and arguments.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        let container = document.createElement('mutation');
-        container.setAttribute('orelse', this.orelse_);
-    },
-    /**
-     * Parse XML to restore the (non-editable) name and parameters.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.orelse_ = "true" === xmlElement.getAttribute('orelse');
-        this.updateShape_();
-    },
+  init: function init() {
+    this.orelse_ = 0;
+    this.appendValueInput('TEST').appendField("while");
+    this.appendStatementInput("BODY").setCheck(null).setAlign(Blockly.ALIGN_RIGHT);
+    this.setInputsInline(false);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.CONTROL);
+    this.updateShape_();
+  },
+  // TODO: Not mutable currently
+  updateShape_: function updateShape_() {
+    var latestInput = "BODY";
+
+    if (this.orelse_ && !this.getInput('ELSE')) {
+      this.appendDummyInput('ORELSETEST').appendField("else:");
+      this.appendStatementInput("ORELSEBODY").setCheck(null);
+    } else if (!this.orelse_ && this.getInput('ELSE')) {
+      block.removeInput('ORELSETEST');
+      block.removeInput('ORELSEBODY');
+    }
+  },
+
+  /**
+   * Create XML to represent the (non-editable) name and arguments.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('orelse', this.orelse_);
+  },
+
+  /**
+   * Parse XML to restore the (non-editable) name and parameters.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.orelse_ = "true" === xmlElement.getAttribute('orelse');
+    this.updateShape_();
+  }
 };
 
 Blockly.Python['ast_While'] = function (block) {
-    // Test
-    let test = "while " + (Blockly.Python.valueToCode(block, 'TEST',
-        Blockly.Python.ORDER_NONE) || Blockly.Python.blank) + ":\n";
-    // Body:
-    let body = Blockly.Python.statementToCode(block, 'BODY') || Blockly.Python.PASS;
-    // Orelse:
-    let orelse = "";
-    if (this.orelse_) {
-        orelse = "else:\n" + (Blockly.Python.statementToCode(block, 'ORELSEBODY') || Blockly.Python.PASS);
-    }
-    return test + body + orelse;
-};
+  // Test
+  var test = "while " + (Blockly.Python.valueToCode(block, 'TEST', Blockly.Python.ORDER_NONE) || Blockly.Python.blank) + ":\n"; // Body:
 
-BlockMirrorTextToBlocks.prototype['ast_While'] = function (node, parent) {
-    let test = node.test;
-    let body = node.body;
-    let orelse = node.orelse;
+  var body = Blockly.Python.statementToCode(block, 'BODY') || Blockly.Python.PASS; // Orelse:
 
-    let values = {"TEST": this.convert(test, node)};
-    let statements = {"BODY": this.convertBody(body, node)};
+  var orelse = "";
 
-    let hasOrelse = false;
-    if (orelse !== null && orelse.length > 0) {
-        statements['ORELSEBODY'] = this.convertBody(orelse, node);
-        hasOrelse = true;
-    }
+  if (this.orelse_) {
+    orelse = "else:\n" + (Blockly.Python.statementToCode(block, 'ORELSEBODY') || Blockly.Python.PASS);
+  }
+
+  return test + body + orelse;
+};
+
+BlockMirrorTextToBlocks.prototype['ast_While'] = function (node, parent) {
+  var test = node.test;
+  var body = node.body;
+  var orelse = node.orelse;
+  var values = {
+    "TEST": this.convert(test, node)
+  };
+  var statements = {
+    "BODY": this.convertBody(body, node)
+  };
+  var hasOrelse = false;
+
+  if (orelse !== null && orelse.length > 0) {
+    statements['ORELSEBODY'] = this.convertBody(orelse, node);
+    hasOrelse = true;
+  }
 
-    return BlockMirrorTextToBlocks.create_block("ast_While", node.lineno, {},
-        values, {}, {
-            "@orelse": hasOrelse
-        }, statements);
+  return BlockMirrorTextToBlocks.create_block("ast_While", node.lineno, {}, values, {}, {
+    "@orelse": hasOrelse
+  }, statements);
 };
+
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_Num",
-    "message0": "%1",
-    "args0": [
-        { "type": "field_number", "name": "NUM", "value": 0}
-    ],
-    "output": "Number",
-    "colour": BlockMirrorTextToBlocks.COLOR.MATH
-})
-
-Blockly.Python['ast_Num'] = function(block) {
+  "type": "ast_Num",
+  "message0": "%1",
+  "args0": [{
+    "type": "field_number",
+    "name": "NUM",
+    "value": 0
+  }],
+  "output": "Number",
+  "colour": BlockMirrorTextToBlocks.COLOR.MATH
+});
+
+Blockly.Python['ast_Num'] = function (block) {
   // Numeric value.
   var code = parseFloat(block.getFieldValue('NUM'));
   var order;
+
   if (code == Infinity) {
     code = 'float("inf")';
     order = Blockly.Python.ORDER_FUNCTION_CALL;
@@ -1732,135 +2529,118 @@ Blockly.Python['ast_Num'] = function(block) {
     code = '-float("inf")';
     order = Blockly.Python.ORDER_UNARY_SIGN;
   } else {
-    order = code < 0 ? Blockly.Python.ORDER_UNARY_SIGN :
-            Blockly.Python.ORDER_ATOMIC;
+    order = code < 0 ? Blockly.Python.ORDER_UNARY_SIGN : Blockly.Python.ORDER_ATOMIC;
   }
+
   return [code, order];
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Num'] = function (node, parent) {
-    var n = node.n;
-    return BlockMirrorTextToBlocks.create_block("ast_Num", node.lineno, {
-        "NUM": Sk.ffi.remapToJs(n)
-    });
-}
+  var n = node.n;
+  return BlockMirrorTextToBlocks.create_block("ast_Num", node.lineno, {
+    "NUM": Sk.ffi.remapToJs(n)
+  });
+};
 
-BlockMirrorTextToBlocks.BINOPS = [
-    ["+", "Add", Blockly.Python.ORDER_ADDITIVE, 'Return the sum of the two numbers.', 'increase', 'by'],
-    ["-", "Sub", Blockly.Python.ORDER_ADDITIVE, 'Return the difference of the two numbers.', 'decrease', 'by'],
-    ["*", "Mult", Blockly.Python.ORDER_MULTIPLICATIVE, 'Return the product of the two numbers.', 'multiply', 'by'],
-    ["/", "Div", Blockly.Python.ORDER_MULTIPLICATIVE, 'Return the quotient of the two numbers.', 'divide', 'by'],
-    ["%", "Mod", Blockly.Python.ORDER_MULTIPLICATIVE, 'Return the remainder of the first number divided by the second number.',
-    'modulo', 'by'],
-    ["**", "Pow", Blockly.Python.ORDER_EXPONENTIATION, 'Return the first number raised to the power of the second number.',
-    'raise', 'to'],
-    ["//", "FloorDiv", Blockly.Python.ORDER_MULTIPLICATIVE, 'Return the truncated quotient of the two numbers.',
-    'floor divide', 'by'],
-    ["<<", "LShift", Blockly.Python.ORDER_BITWISE_SHIFT, 'Return the left number left shifted by the right number.',
-    'left shift', 'by'],
-    [">>", "RShift", Blockly.Python.ORDER_BITWISE_SHIFT, 'Return the left number right shifted by the right number.',
-    'right shift', 'by'],
-    ["|", "BitOr", Blockly.Python.ORDER_BITWISE_OR, 'Returns the bitwise OR of the two values.',
-    'bitwise OR', 'using'],
-    ["^", "BitXor", Blockly.Python.ORDER_BITWISE_XOR, 'Returns the bitwise XOR of the two values.',
-    'bitwise XOR', 'using'],
-    ["&", "BitAnd", Blockly.Python.ORDER_BITWISE_AND, 'Returns the bitwise AND of the two values.',
-    'bitwise AND', 'using'],
-    ["@", "MatMult", Blockly.Python.ORDER_MULTIPLICATIVE, 'Return the matrix multiplication of the two numbers.',
-    'matrix multiply', 'by']
-];
+BlockMirrorTextToBlocks.BINOPS = [["+", "Add", Blockly.Python.ORDER_ADDITIVE, 'Return the sum of the two numbers.', 'increase', 'by'], ["-", "Sub", Blockly.Python.ORDER_ADDITIVE, 'Return the difference of the two numbers.', 'decrease', 'by'], ["*", "Mult", Blockly.Python.ORDER_MULTIPLICATIVE, 'Return the product of the two numbers.', 'multiply', 'by'], ["/", "Div", Blockly.Python.ORDER_MULTIPLICATIVE, 'Return the quotient of the two numbers.', 'divide', 'by'], ["%", "Mod", Blockly.Python.ORDER_MULTIPLICATIVE, 'Return the remainder of the first number divided by the second number.', 'modulo', 'by'], ["**", "Pow", Blockly.Python.ORDER_EXPONENTIATION, 'Return the first number raised to the power of the second number.', 'raise', 'to'], ["//", "FloorDiv", Blockly.Python.ORDER_MULTIPLICATIVE, 'Return the truncated quotient of the two numbers.', 'floor divide', 'by'], ["<<", "LShift", Blockly.Python.ORDER_BITWISE_SHIFT, 'Return the left number left shifted by the right number.', 'left shift', 'by'], [">>", "RShift", Blockly.Python.ORDER_BITWISE_SHIFT, 'Return the left number right shifted by the right number.', 'right shift', 'by'], ["|", "BitOr", Blockly.Python.ORDER_BITWISE_OR, 'Returns the bitwise OR of the two values.', 'bitwise OR', 'using'], ["^", "BitXor", Blockly.Python.ORDER_BITWISE_XOR, 'Returns the bitwise XOR of the two values.', 'bitwise XOR', 'using'], ["&", "BitAnd", Blockly.Python.ORDER_BITWISE_AND, 'Returns the bitwise AND of the two values.', 'bitwise AND', 'using'], ["@", "MatMult", Blockly.Python.ORDER_MULTIPLICATIVE, 'Return the matrix multiplication of the two numbers.', 'matrix multiply', 'by']];
 var BINOPS_SIMPLE = ['Add', 'Sub', 'Mult', 'Div', 'Mod', 'Pow'];
-var BINOPS_BLOCKLY_DISPLAY_FULL = BlockMirrorTextToBlocks.BINOPS.map(
-    binop => [binop[0], binop[1]]
-);
-var BINOPS_BLOCKLY_DISPLAY = BINOPS_BLOCKLY_DISPLAY_FULL.filter(
-    binop => BINOPS_SIMPLE.indexOf(binop[1]) >= 0
-);
-BlockMirrorTextToBlocks.BINOPS_AUGASSIGN_DISPLAY_FULL =BlockMirrorTextToBlocks.BINOPS.map(
-    binop => [binop[4], binop[1]]
-);
-BlockMirrorTextToBlocks.BINOPS_AUGASSIGN_DISPLAY = BlockMirrorTextToBlocks.BINOPS_AUGASSIGN_DISPLAY_FULL.filter(
-    binop => BINOPS_SIMPLE.indexOf(binop[1]) >= 0
-);
-
+var BINOPS_BLOCKLY_DISPLAY_FULL = BlockMirrorTextToBlocks.BINOPS.map(function (binop) {
+  return [binop[0], binop[1]];
+});
+var BINOPS_BLOCKLY_DISPLAY = BINOPS_BLOCKLY_DISPLAY_FULL.filter(function (binop) {
+  return BINOPS_SIMPLE.indexOf(binop[1]) >= 0;
+});
+BlockMirrorTextToBlocks.BINOPS_AUGASSIGN_DISPLAY_FULL = BlockMirrorTextToBlocks.BINOPS.map(function (binop) {
+  return [binop[4], binop[1]];
+});
+BlockMirrorTextToBlocks.BINOPS_AUGASSIGN_DISPLAY = BlockMirrorTextToBlocks.BINOPS_AUGASSIGN_DISPLAY_FULL.filter(function (binop) {
+  return BINOPS_SIMPLE.indexOf(binop[1]) >= 0;
+});
 var BINOPS_BLOCKLY_GENERATE = {};
 BlockMirrorTextToBlocks.BINOPS_AUGASSIGN_PREPOSITION = {};
 BlockMirrorTextToBlocks.BINOPS.forEach(function (binop) {
-    BINOPS_BLOCKLY_GENERATE[binop[1]] = [" " + binop[0], binop[2]];
-    BlockMirrorTextToBlocks.BINOPS_AUGASSIGN_PREPOSITION[binop[1]] = binop[5];
-    //Blockly.Constants.Math.TOOLTIPS_BY_OP[binop[1]] = binop[3];
+  BINOPS_BLOCKLY_GENERATE[binop[1]] = [" " + binop[0], binop[2]];
+  BlockMirrorTextToBlocks.BINOPS_AUGASSIGN_PREPOSITION[binop[1]] = binop[5]; //Blockly.Constants.Math.TOOLTIPS_BY_OP[binop[1]] = binop[3];
 });
-
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_BinOpFull",
-    "message0": "%1 %2 %3",
-    "args0": [
-        {"type": "input_value", "name": "A"},
-        {"type": "field_dropdown", "name": "OP", "options": BINOPS_BLOCKLY_DISPLAY_FULL},
-        {"type": "input_value", "name": "B"}
-    ],
-    "inputsInline": true,
-    "output": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.MATH
-    //"extensions": ["math_op_tooltip"]
-});
+  "type": "ast_BinOpFull",
+  "message0": "%1 %2 %3",
+  "args0": [{
+    "type": "input_value",
+    "name": "A"
+  }, {
+    "type": "field_dropdown",
+    "name": "OP",
+    "options": BINOPS_BLOCKLY_DISPLAY_FULL
+  }, {
+    "type": "input_value",
+    "name": "B"
+  }],
+  "inputsInline": true,
+  "output": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.MATH //"extensions": ["math_op_tooltip"]
 
+});
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_BinOp",
-    "message0": "%1 %2 %3",
-    "args0": [
-        {"type": "input_value", "name": "A"},
-        {"type": "field_dropdown", "name": "OP", "options": BINOPS_BLOCKLY_DISPLAY},
-        {"type": "input_value", "name": "B"}
-    ],
-    "inputsInline": true,
-    "output": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.MATH
-    //"extensions": ["math_op_tooltip"]
+  "type": "ast_BinOp",
+  "message0": "%1 %2 %3",
+  "args0": [{
+    "type": "input_value",
+    "name": "A"
+  }, {
+    "type": "field_dropdown",
+    "name": "OP",
+    "options": BINOPS_BLOCKLY_DISPLAY
+  }, {
+    "type": "input_value",
+    "name": "B"
+  }],
+  "inputsInline": true,
+  "output": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.MATH //"extensions": ["math_op_tooltip"]
+
 });
 
 Blockly.Python['ast_BinOp'] = function (block) {
-    // Basic arithmetic operators, and power.
-    var tuple = BINOPS_BLOCKLY_GENERATE[block.getFieldValue('OP')];
-    var operator = tuple[0]+" ";
-    var order = tuple[1];
-    var argument0 = Blockly.Python.valueToCode(block, 'A', order) || Blockly.Python.blank;
-    var argument1 = Blockly.Python.valueToCode(block, 'B', order) || Blockly.Python.blank;
-    var code = argument0 + operator + argument1;
-    return [code, order];
+  // Basic arithmetic operators, and power.
+  var tuple = BINOPS_BLOCKLY_GENERATE[block.getFieldValue('OP')];
+  var operator = tuple[0] + " ";
+  var order = tuple[1];
+  var argument0 = Blockly.Python.valueToCode(block, 'A', order) || Blockly.Python.blank;
+  var argument1 = Blockly.Python.valueToCode(block, 'B', order) || Blockly.Python.blank;
+  var code = argument0 + operator + argument1;
+  return [code, order];
 };
 
 BlockMirrorTextToBlocks.prototype['ast_BinOp'] = function (node, parent) {
-    let left = node.left;
-    let op = node.op.name;
-    let right = node.right;
-
-    let blockName = (BINOPS_SIMPLE.indexOf(op) >= 0) ? "ast_BinOp" : 'ast_BinOpFull';
-
-    return BlockMirrorTextToBlocks.create_block(blockName, node.lineno, {
-        "OP": op
-    }, {
-        "A": this.convert(left, node),
-        "B": this.convert(right, node)
-    }, {
-        "inline": true
-    });
-}
+  var left = node.left;
+  var op = node.op.name;
+  var right = node.right;
+  var blockName = BINOPS_SIMPLE.indexOf(op) >= 0 ? "ast_BinOp" : 'ast_BinOpFull';
+  return BlockMirrorTextToBlocks.create_block(blockName, node.lineno, {
+    "OP": op
+  }, {
+    "A": this.convert(left, node),
+    "B": this.convert(right, node)
+  }, {
+    "inline": true
+  });
+};
 
 Blockly.Python['ast_BinOpFull'] = Blockly.Python['ast_BinOp'];
 BlockMirrorTextToBlocks.prototype['ast_BinOpFull'] = BlockMirrorTextToBlocks.prototype['ast_BinOp'];
-
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_Name",
-    "message0": "%1",
-    "args0": [
-        {"type": "field_variable", "name": "VAR", "variable": "%{BKY_VARIABLES_DEFAULT_NAME}"}
-    ],
-    "output": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.VARIABLES,
-    "extensions": ["contextMenu_variableSetterGetter_forBlockMirror"]
-})
-
+  "type": "ast_Name",
+  "message0": "%1",
+  "args0": [{
+    "type": "field_variable",
+    "name": "VAR",
+    "variable": "%{BKY_VARIABLES_DEFAULT_NAME}"
+  }],
+  "output": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.VARIABLES,
+  "extensions": ["contextMenu_variableSetterGetter_forBlockMirror"]
+});
 /**
  * Mixin to add context menu items to create getter/setter blocks for this
  * setter/getter.
@@ -1870,4350 +2650,4734 @@ BlockMirrorTextToBlocks.BLOCKS.push({
  * @package
  * @readonly
  */
-Blockly.Constants.Variables.CUSTOM_CONTEXT_MENU_VARIABLE_GETTER_SETTER_MIXIN_FOR_BLOCK_MIRROR = {
-    /**
-     * Add menu option to create getter/setter block for this setter/getter.
-     * @param {!Array} options List of menu options to add to.
-     * @this Blockly.Block
-     */
-    customContextMenu: function(options) {
-        let name;
-        if (!this.isInFlyout){
-            // Getter blocks have the option to create a setter block, and vice versa.
-            let opposite_type, contextMenuMsg;
-            if (this.type === 'ast_Name') {
-                opposite_type = 'ast_Assign';
-                contextMenuMsg = Blockly.Msg['VARIABLES_GET_CREATE_SET'];
-            } else {
-                opposite_type = 'ast_Name';
-                contextMenuMsg = Blockly.Msg['VARIABLES_SET_CREATE_GET'];
-            }
 
-            var option = {enabled: this.workspace.remainingCapacity() > 0};
-            name = this.getField('VAR').getText();
-            option.text = contextMenuMsg.replace('%1', name);
-            var xmlField = document.createElement('field');
-            xmlField.setAttribute('name', 'VAR');
-            xmlField.appendChild(document.createTextNode(name));
-            var xmlBlock = document.createElement('block');
-            xmlBlock.setAttribute('type', opposite_type);
-            xmlBlock.appendChild(xmlField);
-            option.callback = Blockly.ContextMenu.callbackFactory(this, xmlBlock);
-            options.push(option);
-            // Getter blocks have the option to rename or delete that variable.
-        } else {
-            if (this.type === 'ast_Name' || this.type === 'variables_get_reporter'){
-                var renameOption = {
-                    text: Blockly.Msg.RENAME_VARIABLE,
-                    enabled: true,
-                    callback: Blockly.Constants.Variables.RENAME_OPTION_CALLBACK_FACTORY(this)
-                };
-                name = this.getField('VAR').getText();
-                var deleteOption = {
-                    text: Blockly.Msg.DELETE_VARIABLE.replace('%1', name),
-                    enabled: true,
-                    callback: Blockly.Constants.Variables.DELETE_OPTION_CALLBACK_FACTORY(this)
-                };
-                options.unshift(renameOption);
-                options.unshift(deleteOption);
-            }
-        }
+Blockly.Constants.Variables.CUSTOM_CONTEXT_MENU_VARIABLE_GETTER_SETTER_MIXIN_FOR_BLOCK_MIRROR = {
+  /**
+   * Add menu option to create getter/setter block for this setter/getter.
+   * @param {!Array} options List of menu options to add to.
+   * @this Blockly.Block
+   */
+  customContextMenu: function customContextMenu(options) {
+    var name;
+
+    if (!this.isInFlyout) {
+      // Getter blocks have the option to create a setter block, and vice versa.
+      var opposite_type, contextMenuMsg;
+
+      if (this.type === 'ast_Name') {
+        opposite_type = 'ast_Assign';
+        contextMenuMsg = Blockly.Msg['VARIABLES_GET_CREATE_SET'];
+      } else {
+        opposite_type = 'ast_Name';
+        contextMenuMsg = Blockly.Msg['VARIABLES_SET_CREATE_GET'];
+      }
+
+      var option = {
+        enabled: this.workspace.remainingCapacity() > 0
+      };
+      name = this.getField('VAR').getText();
+      option.text = contextMenuMsg.replace('%1', name);
+      var xmlField = document.createElement('field');
+      xmlField.setAttribute('name', 'VAR');
+      xmlField.appendChild(document.createTextNode(name));
+      var xmlBlock = document.createElement('block');
+      xmlBlock.setAttribute('type', opposite_type);
+      xmlBlock.appendChild(xmlField);
+      option.callback = Blockly.ContextMenu.callbackFactory(this, xmlBlock);
+      options.push(option); // Getter blocks have the option to rename or delete that variable.
+    } else {
+      if (this.type === 'ast_Name' || this.type === 'variables_get_reporter') {
+        var renameOption = {
+          text: Blockly.Msg.RENAME_VARIABLE,
+          enabled: true,
+          callback: Blockly.Constants.Variables.RENAME_OPTION_CALLBACK_FACTORY(this)
+        };
+        name = this.getField('VAR').getText();
+        var deleteOption = {
+          text: Blockly.Msg.DELETE_VARIABLE.replace('%1', name),
+          enabled: true,
+          callback: Blockly.Constants.Variables.DELETE_OPTION_CALLBACK_FACTORY(this)
+        };
+        options.unshift(renameOption);
+        options.unshift(deleteOption);
+      }
     }
+  }
 };
-
-Blockly.Extensions.registerMixin('contextMenu_variableSetterGetter_forBlockMirror',
-    Blockly.Constants.Variables.CUSTOM_CONTEXT_MENU_VARIABLE_GETTER_SETTER_MIXIN_FOR_BLOCK_MIRROR);
+Blockly.Extensions.registerMixin('contextMenu_variableSetterGetter_forBlockMirror', Blockly.Constants.Variables.CUSTOM_CONTEXT_MENU_VARIABLE_GETTER_SETTER_MIXIN_FOR_BLOCK_MIRROR);
 
 Blockly.Python['ast_Name'] = function (block) {
-    // Variable getter.
-    var code = Blockly.Python.variableDB_.getName(block.getFieldValue('VAR'),
-        Blockly.Variables.NAME_TYPE);
-    return [code, Blockly.Python.ORDER_ATOMIC];
+  // Variable getter.
+  var code = Blockly.Python.variableDB_.getName(block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+  return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Name'] = function (node, parent) {
-    var id = node.id;
-    var ctx = node.ctx;
-    if (id.v == Blockly.Python.blank) {
-        return null;
-    } else {
-        return BlockMirrorTextToBlocks.create_block('ast_Name', node.lineno, {
-            "VAR": id.v
-        });
-    }
-}
+  var id = node.id;
+  var ctx = node.ctx;
+
+  if (id.v == Blockly.Python.blank) {
+    return null;
+  } else {
+    return BlockMirrorTextToBlocks.create_block('ast_Name', node.lineno, {
+      "VAR": id.v
+    });
+  }
+};
 
 Blockly.Blocks['ast_Assign'] = {
-    init: function () {
-        this.setInputsInline(true);
-        this.setPreviousStatement(true, null);
-        this.setNextStatement(true, null);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
-        this.targetCount_ = 1;
-        this.simpleTarget_ = true;
-        this.updateShape_();
-        Blockly.Extensions.apply("contextMenu_variableSetterGetter", this, false);
-    },
-    updateShape_: function () {
-        if (!this.getInput('VALUE')) {
-            this.appendDummyInput()
-                .appendField("set");
-            this.appendValueInput('VALUE')
-                .appendField('=');
-        }
-        let i = 0;
-        if (this.targetCount_ === 1 && this.simpleTarget_) {
-            this.setInputsInline(true);
-            if (!this.getInput('VAR_ANCHOR')) {
-                this.appendDummyInput('VAR_ANCHOR')
-                    .appendField(new Blockly.FieldVariable("variable"), "VAR");
-            }
-            this.moveInputBefore('VAR_ANCHOR', 'VALUE');
-        } else {
-            this.setInputsInline(true);
-            // Add new inputs.
-            for (; i < this.targetCount_; i++) {
-                if (!this.getInput('TARGET' + i)) {
-                    var input = this.appendValueInput('TARGET' + i);
-                    if (i !== 0) {
-                        input.appendField('and').setAlign(Blockly.ALIGN_RIGHT);
-                    }
-                }
-                this.moveInputBefore('TARGET' + i, 'VALUE');
-            }
-            // Kill simple VAR
-            if (this.getInput('VAR_ANCHOR')) {
-                this.removeInput('VAR_ANCHOR');
-            }
-        }
-        // Remove deleted inputs.
-        while (this.getInput('TARGET' + i)) {
-            this.removeInput('TARGET' + i);
-            i++;
-        }
-    },
-    /**
-     * Create XML to represent list inputs.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        var container = document.createElement('mutation');
-        container.setAttribute('targets', this.targetCount_);
-        container.setAttribute('simple', this.simpleTarget_);
-        return container;
-    },
-    /**
-     * Parse XML to restore the list inputs.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.targetCount_ = parseInt(xmlElement.getAttribute('targets'), 10);
-        this.simpleTarget_ = "true" === xmlElement.getAttribute('simple');
-        this.updateShape_();
-    },
+  init: function init() {
+    this.setInputsInline(true);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
+    this.targetCount_ = 1;
+    this.simpleTarget_ = true;
+    this.updateShape_();
+    Blockly.Extensions.apply("contextMenu_variableSetterGetter", this, false);
+  },
+  updateShape_: function updateShape_() {
+    if (!this.getInput('VALUE')) {
+      this.appendDummyInput().appendField("set");
+      this.appendValueInput('VALUE').appendField('=');
+    }
+
+    var i = 0;
+
+    if (this.targetCount_ === 1 && this.simpleTarget_) {
+      this.setInputsInline(true);
+
+      if (!this.getInput('VAR_ANCHOR')) {
+        this.appendDummyInput('VAR_ANCHOR').appendField(new Blockly.FieldVariable("variable"), "VAR");
+      }
+
+      this.moveInputBefore('VAR_ANCHOR', 'VALUE');
+    } else {
+      this.setInputsInline(true); // Add new inputs.
+
+      for (; i < this.targetCount_; i++) {
+        if (!this.getInput('TARGET' + i)) {
+          var input = this.appendValueInput('TARGET' + i);
+
+          if (i !== 0) {
+            input.appendField('and').setAlign(Blockly.ALIGN_RIGHT);
+          }
+        }
+
+        this.moveInputBefore('TARGET' + i, 'VALUE');
+      } // Kill simple VAR
+
+
+      if (this.getInput('VAR_ANCHOR')) {
+        this.removeInput('VAR_ANCHOR');
+      }
+    } // Remove deleted inputs.
+
+
+    while (this.getInput('TARGET' + i)) {
+      this.removeInput('TARGET' + i);
+      i++;
+    }
+  },
+
+  /**
+   * Create XML to represent list inputs.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('targets', this.targetCount_);
+    container.setAttribute('simple', this.simpleTarget_);
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the list inputs.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.targetCount_ = parseInt(xmlElement.getAttribute('targets'), 10);
+    this.simpleTarget_ = "true" === xmlElement.getAttribute('simple');
+    this.updateShape_();
+  }
 };
 
 Blockly.Python['ast_Assign'] = function (block) {
-    // Create a list with any number of elements of any type.
-    let value = Blockly.Python.valueToCode(block, 'VALUE',
-        Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-    let targets = new Array(block.targetCount_);
-    if (block.targetCount_ === 1 && block.simpleTarget_) {
-        targets[0] = Blockly.Python.variableDB_.getName(block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
-    } else {
-        for (var i = 0; i < block.targetCount_; i++) {
-            targets[i] = (Blockly.Python.valueToCode(block, 'TARGET' + i,
-                Blockly.Python.ORDER_NONE) || Blockly.Python.blank);
-        }
+  // Create a list with any number of elements of any type.
+  var value = Blockly.Python.valueToCode(block, 'VALUE', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  var targets = new Array(block.targetCount_);
+
+  if (block.targetCount_ === 1 && block.simpleTarget_) {
+    targets[0] = Blockly.Python.variableDB_.getName(block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+  } else {
+    for (var i = 0; i < block.targetCount_; i++) {
+      targets[i] = Blockly.Python.valueToCode(block, 'TARGET' + i, Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
     }
-    return targets.join(' = ') + " = " + value + "\n";
+  }
+
+  return targets.join(' = ') + " = " + value + "\n";
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Assign'] = function (node, parent) {
-    let targets = node.targets;
-    let value = node.value;
-
-    let values;
-    let fields = {};
-    let simpleTarget = (targets.length === 1 && targets[0]._astname === 'Name');
-    if (simpleTarget) {
-        values = {};
-        fields['VAR'] = Sk.ffi.remapToJs(targets[0].id);
-    } else {
-        values = this.convertElements("TARGET", targets, node);
-    }
-    values['VALUE'] = this.convert(value, node);
+  var targets = node.targets;
+  var value = node.value;
+  var values;
+  var fields = {};
+  var simpleTarget = targets.length === 1 && targets[0]._astname === 'Name';
+
+  if (simpleTarget) {
+    values = {};
+    fields['VAR'] = Sk.ffi.remapToJs(targets[0].id);
+  } else {
+    values = this.convertElements("TARGET", targets, node);
+  }
 
-    return BlockMirrorTextToBlocks.create_block("ast_Assign", node.lineno, fields,
-        values,
-        {
-            "inline": "true",
-        }, {
-            "@targets": targets.length,
-            "@simple": simpleTarget
-        });
+  values['VALUE'] = this.convert(value, node);
+  return BlockMirrorTextToBlocks.create_block("ast_Assign", node.lineno, fields, values, {
+    "inline": "true"
+  }, {
+    "@targets": targets.length,
+    "@simple": simpleTarget
+  });
 };
+
 Blockly.Blocks['ast_AnnAssignFull'] = {
-    init: function () {
-        this.appendValueInput("TARGET")
-            .setCheck(null)
-            .appendField("set");
-        this.appendValueInput("ANNOTATION")
-            .setCheck(null)
-            .appendField(":");
-        this.setInputsInline(true);
-        this.setPreviousStatement(true, null);
-        this.setNextStatement(true, null);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
-        this.initialized_ = true;
-        this.updateShape_();
-    },
-    /**
-     * Create XML to represent list inputs.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        let container = document.createElement('mutation');
-        container.setAttribute('initialized', this.initialized_);
-        return container;
-    },
-    /**
-     * Parse XML to restore the list inputs.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.initialized_ = "true" === xmlElement.getAttribute('initialized');
-        this.updateShape_();
-    },
-    updateShape_: function (block) {
-        // Add new inputs.
-        if (this.initialized_ && !this.getInput('VALUE')) {
-            this.appendValueInput('VALUE')
-                .appendField('=')
-                .setAlign(Blockly.ALIGN_RIGHT);
-        }
-        if (!this.initialized_ && this.getInput('VALUE')) {
-            this.removeInput('VALUE');
-        }
+  init: function init() {
+    this.appendValueInput("TARGET").setCheck(null).appendField("set");
+    this.appendValueInput("ANNOTATION").setCheck(null).appendField(":");
+    this.setInputsInline(true);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
+    this.initialized_ = true;
+    this.updateShape_();
+  },
+
+  /**
+   * Create XML to represent list inputs.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('initialized', this.initialized_);
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the list inputs.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.initialized_ = "true" === xmlElement.getAttribute('initialized');
+    this.updateShape_();
+  },
+  updateShape_: function updateShape_(block) {
+    // Add new inputs.
+    if (this.initialized_ && !this.getInput('VALUE')) {
+      this.appendValueInput('VALUE').appendField('=').setAlign(Blockly.ALIGN_RIGHT);
+    }
+
+    if (!this.initialized_ && this.getInput('VALUE')) {
+      this.removeInput('VALUE');
     }
+  }
 };
-
-BlockMirrorTextToBlocks.ANNOTATION_OPTIONS = [
-    ["int", "int"],
-    ["float", "float"],
-    ["str", "str"],
-    ["bool", "bool"],
-    ["None", "None"]
-];
-
+BlockMirrorTextToBlocks.ANNOTATION_OPTIONS = [["int", "int"], ["float", "float"], ["str", "str"], ["bool", "bool"], ["None", "None"]];
 BlockMirrorTextToBlocks.ANNOTATION_GENERATE = {};
 BlockMirrorTextToBlocks.ANNOTATION_OPTIONS.forEach(function (ann) {
-    BlockMirrorTextToBlocks.ANNOTATION_GENERATE[ann[1]] = ann[0];
+  BlockMirrorTextToBlocks.ANNOTATION_GENERATE[ann[1]] = ann[0];
 });
-
 Blockly.Blocks['ast_AnnAssign'] = {
-    init: function () {
-        this.appendDummyInput()
-            .appendField("set")
-            .appendField(new Blockly.FieldVariable("item"), "TARGET")
-            .appendField(":")
-            .appendField(new Blockly.FieldDropdown(BlockMirrorTextToBlocks.ANNOTATION_OPTIONS), "ANNOTATION");
-        this.appendValueInput("VALUE")
-            .setCheck(null)
-            .appendField("=");
-        this.setInputsInline(true);
-        this.setPreviousStatement(true, null);
-        this.setNextStatement(true, null);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
-        this.strAnnotations_ = false;
-        this.initialized_ = true;
-    },
-    /**
-     * Create XML to represent list inputs.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        let container = document.createElement('mutation');
-        container.setAttribute('str', this.strAnnotations_);
-        container.setAttribute('initialized', this.initialized_);
-        return container;
-    },
-    /**
-     * Parse XML to restore the list inputs.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.strAnnotations_ = "true" === xmlElement.getAttribute('str');
-        this.initialized_ = "true" === xmlElement.getAttribute('initialized');
-        this.updateShape_();
-    },
-    updateShape_: function (block) {
-        // Add new inputs.
-        if (this.initialized_ && !this.getInput('VALUE')) {
-            this.appendValueInput('VALUE')
-                .appendField('=')
-                .setAlign(Blockly.ALIGN_RIGHT);
-        }
-        if (!this.initialized_ && this.getInput('VALUE')) {
-            this.removeInput('VALUE');
-        }
+  init: function init() {
+    this.appendDummyInput().appendField("set").appendField(new Blockly.FieldVariable("item"), "TARGET").appendField(":").appendField(new Blockly.FieldDropdown(BlockMirrorTextToBlocks.ANNOTATION_OPTIONS), "ANNOTATION");
+    this.appendValueInput("VALUE").setCheck(null).appendField("=");
+    this.setInputsInline(true);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
+    this.strAnnotations_ = false;
+    this.initialized_ = true;
+  },
+
+  /**
+   * Create XML to represent list inputs.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('str', this.strAnnotations_);
+    container.setAttribute('initialized', this.initialized_);
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the list inputs.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.strAnnotations_ = "true" === xmlElement.getAttribute('str');
+    this.initialized_ = "true" === xmlElement.getAttribute('initialized');
+    this.updateShape_();
+  },
+  updateShape_: function updateShape_(block) {
+    // Add new inputs.
+    if (this.initialized_ && !this.getInput('VALUE')) {
+      this.appendValueInput('VALUE').appendField('=').setAlign(Blockly.ALIGN_RIGHT);
+    }
+
+    if (!this.initialized_ && this.getInput('VALUE')) {
+      this.removeInput('VALUE');
     }
+  }
 };
 
 Blockly.Python['ast_AnnAssignFull'] = function (block) {
-    // Create a list with any number of elements of any type.
-    let target = Blockly.Python.valueToCode(block, 'TARGET',
-        Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-    let annotation = Blockly.Python.valueToCode(block, 'ANNOTATION',
-        Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-    let value = "";
-    if (this.initialized_) {
-        value = " = " + Blockly.Python.valueToCode(block, 'VALUE',
-            Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-    }
-    return target + ": " + annotation + value + "\n";
+  // Create a list with any number of elements of any type.
+  var target = Blockly.Python.valueToCode(block, 'TARGET', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  var annotation = Blockly.Python.valueToCode(block, 'ANNOTATION', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  var value = "";
+
+  if (this.initialized_) {
+    value = " = " + Blockly.Python.valueToCode(block, 'VALUE', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  }
+
+  return target + ": " + annotation + value + "\n";
 };
 
 Blockly.Python['ast_AnnAssign'] = function (block) {
-    // Create a list with any number of elements of any type.
-    var target = Blockly.Python.variableDB_.getName(block.getFieldValue('TARGET'),
-        Blockly.Variables.NAME_TYPE);
-    let annotation = block.getFieldValue('ANNOTATION');
-    if (block.strAnnotations_) {
-        annotation = Blockly.Python.quote_(annotation);
-    }
-    let value = "";
-    if (this.initialized_) {
-        value = " = " + Blockly.Python.valueToCode(block, 'VALUE',
-            Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-    }
-    return target + ": " + annotation + value + "\n";
+  // Create a list with any number of elements of any type.
+  var target = Blockly.Python.variableDB_.getName(block.getFieldValue('TARGET'), Blockly.Variables.NAME_TYPE);
+  var annotation = block.getFieldValue('ANNOTATION');
+
+  if (block.strAnnotations_) {
+    annotation = Blockly.Python.quote_(annotation);
+  }
+
+  var value = "";
+
+  if (this.initialized_) {
+    value = " = " + Blockly.Python.valueToCode(block, 'VALUE', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  }
+
+  return target + ": " + annotation + value + "\n";
 };
 
 BlockMirrorTextToBlocks.prototype.getBuiltinAnnotation = function (annotation) {
-    let result = false;
-    // Can we turn it into a basic type?
-    if (annotation._astname === 'Name') {
-        result = Sk.ffi.remapToJs(annotation.id);
-    } else if (annotation._astname === 'Str') {
-        result = Sk.ffi.remapToJs(annotation.s);
-    }
-
-    // Potentially filter out unknown annotations
-    if (result !== false && this.strictAnnotations) {
-        if (this.strictAnnotations.indexOf(result) !== -1) {
-            return result;
-        } else {
-            return false;
-        }
+  var result = false; // Can we turn it into a basic type?
+
+  if (annotation._astname === 'Name') {
+    result = Sk.ffi.remapToJs(annotation.id);
+  } else if (annotation._astname === 'Str') {
+    result = Sk.ffi.remapToJs(annotation.s);
+  } // Potentially filter out unknown annotations
+
+
+  if (result !== false && this.strictAnnotations) {
+    if (this.strictAnnotations.indexOf(result) !== -1) {
+      return result;
     } else {
-        return result;
+      return false;
     }
-}
+  } else {
+    return result;
+  }
+};
 
 BlockMirrorTextToBlocks.prototype['ast_AnnAssign'] = function (node, parent) {
-    let target = node.target;
-    let annotation = node.annotation;
-    let value = node.value;
-
-    let values = {};
-    let mutations = {'@initialized': false};
-    if (value !== null) {
-        values['VALUE'] = this.convert(value, node);
-        mutations['@initialized'] = true;
-    }
-
-    // TODO: This controls whether the annotation is stored in __annotations__
-    let simple = node.simple;
-
-    let builtinAnnotation = this.getBuiltinAnnotation(annotation);
-
-    if (target._astname === 'Name' && target.id.v !== Blockly.Python.blank && builtinAnnotation !== false) {
-        mutations['@str'] = annotation._astname === 'Str'
-        return BlockMirrorTextToBlocks.create_block("ast_AnnAssign", node.lineno, {
-                'TARGET': target.id.v,
-                'ANNOTATION': builtinAnnotation,
-            },
-            values,
-            {
-                "inline": "true",
-            }, mutations);
+  var target = node.target;
+  var annotation = node.annotation;
+  var value = node.value;
+  var values = {};
+  var mutations = {
+    '@initialized': false
+  };
+
+  if (value !== null) {
+    values['VALUE'] = this.convert(value, node);
+    mutations['@initialized'] = true;
+  } // TODO: This controls whether the annotation is stored in __annotations__
+
+
+  var simple = node.simple;
+  var builtinAnnotation = this.getBuiltinAnnotation(annotation);
+
+  if (target._astname === 'Name' && target.id.v !== Blockly.Python.blank && builtinAnnotation !== false) {
+    mutations['@str'] = annotation._astname === 'Str';
+    return BlockMirrorTextToBlocks.create_block("ast_AnnAssign", node.lineno, {
+      'TARGET': target.id.v,
+      'ANNOTATION': builtinAnnotation
+    }, values, {
+      "inline": "true"
+    }, mutations);
+  } else {
+    values['TARGET'] = this.convert(target, node);
+    values['ANNOTATION'] = this.convert(annotation, node);
+    return BlockMirrorTextToBlocks.create_block("ast_AnnAssignFull", node.lineno, {}, values, {
+      "inline": "true"
+    }, mutations);
+  }
+};
+
+Blockly.Blocks['ast_AugAssign'] = {
+  init: function init() {
+    var block = this;
+    this.simpleTarget_ = true;
+    this.allOptions_ = false;
+    this.initialPreposition_ = "by";
+    this.appendDummyInput("OP").appendField(new Blockly.FieldDropdown(function () {
+      return block.allOptions_ ? BlockMirrorTextToBlocks.BINOPS_AUGASSIGN_DISPLAY_FULL : BlockMirrorTextToBlocks.BINOPS_AUGASSIGN_DISPLAY;
+    }, function (value) {
+      var block = this.sourceBlock_;
+      block.updatePreposition_(value);
+    }), "OP_NAME").appendField(" ");
+    this.appendDummyInput('PREPOSITION_ANCHOR').setAlign(Blockly.ALIGN_RIGHT).appendField("by", 'PREPOSITION');
+    this.appendValueInput('VALUE');
+    this.setInputsInline(true);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
+    this.updateShape_();
+    this.updatePreposition_(this.initialPreposition_);
+  },
+  updatePreposition_: function updatePreposition_(value) {
+    var preposition = BlockMirrorTextToBlocks.BINOPS_AUGASSIGN_PREPOSITION[value];
+    this.setFieldValue(preposition, 'PREPOSITION');
+  },
+
+  /**
+   * Create XML to represent list inputs.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('simple', this.simpleTarget_);
+    container.setAttribute('options', this.allOptions_);
+    container.setAttribute('preposition', this.initialPreposition_);
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the list inputs.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.simpleTarget_ = "true" === xmlElement.getAttribute('simple');
+    this.allOptions_ = "true" === xmlElement.getAttribute('options');
+    this.initialPreposition_ = xmlElement.getAttribute('preposition');
+    this.updateShape_();
+    this.updatePreposition_(this.initialPreposition_);
+  },
+  updateShape_: function updateShape_(block) {
+    // Add new inputs.
+    if (this.simpleTarget_) {
+      if (!this.getInput('VAR_ANCHOR')) {
+        this.appendDummyInput('VAR_ANCHOR').appendField(new Blockly.FieldVariable("variable"), "VAR");
+        this.moveInputBefore('VAR_ANCHOR', 'PREPOSITION_ANCHOR');
+      }
+
+      if (this.getInput('TARGET')) {
+        this.removeInput('TARGET');
+      }
     } else {
-        values['TARGET'] = this.convert(target, node);
-        values['ANNOTATION'] = this.convert(annotation, node);
-        return BlockMirrorTextToBlocks.create_block("ast_AnnAssignFull", node.lineno, {},
-            values,
-            {
-                "inline": "true",
-            }, mutations);
+      if (this.getInput('VAR_ANCHOR')) {
+        this.removeInput('VAR_ANCHOR');
+      }
+
+      if (!this.getInput('TARGET')) {
+        this.appendValueInput('TARGET');
+        this.moveInputBefore('TARGET', 'PREPOSITION_ANCHOR');
+      }
     }
+  }
+};
+
+Blockly.Python['ast_AugAssign'] = function (block) {
+  // Create a list with any number of elements of any type.
+  var target;
+
+  if (block.simpleTarget_) {
+    target = Blockly.Python.variableDB_.getName(block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+  } else {
+    target = Blockly.Python.valueToCode(block, 'TARGET', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  }
+
+  var operator = BINOPS_BLOCKLY_GENERATE[block.getFieldValue('OP_NAME')][0];
+  var value = Blockly.Python.valueToCode(block, 'VALUE', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  return target + operator + "= " + value + "\n";
+};
+
+BlockMirrorTextToBlocks.prototype['ast_AugAssign'] = function (node, parent) {
+  var target = node.target;
+  var op = node.op.name;
+  var value = node.value;
+  var values = {
+    'VALUE': this.convert(value, node)
+  };
+  var fields = {
+    'OP_NAME': op
+  };
+  var simpleTarget = target._astname === 'Name';
+
+  if (simpleTarget) {
+    fields['VAR'] = Sk.ffi.remapToJs(target.id);
+  } else {
+    values['TARGET'] = this.convert(value, node);
+  }
+
+  var preposition = op;
+  var allOptions = BINOPS_SIMPLE.indexOf(op) === -1;
+  return BlockMirrorTextToBlocks.create_block("ast_AugAssign", node.lineno, fields, values, {
+    "inline": "true"
+  }, {
+    "@options": allOptions,
+    "@simple": simpleTarget,
+    "@preposition": preposition
+  });
 };
+
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_Str",
-    "message0": "%1",
-    "args0": [
-        {"type": "field_input", "name": "TEXT", "value": ''}
-    ],
-    "output": "String",
-    "colour": BlockMirrorTextToBlocks.COLOR.TEXT,
-    "extensions": ["text_quotes"]
+  "type": "ast_Str",
+  "message0": "%1",
+  "args0": [{
+    "type": "field_input",
+    "name": "TEXT",
+    "value": ''
+  }],
+  "output": "String",
+  "colour": BlockMirrorTextToBlocks.COLOR.TEXT,
+  "extensions": ["text_quotes"]
 });
-
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_StrMultiline",
-    "message0": "%1",
-    "args0": [
-        {"type": "field_multilinetext", "name": "TEXT", "value": ''}
-    ],
-    "output": "String",
-    "colour": BlockMirrorTextToBlocks.COLOR.TEXT,
-    "extensions": ["text_quotes"]
+  "type": "ast_StrMultiline",
+  "message0": "%1",
+  "args0": [{
+    "type": "field_multilinetext",
+    "name": "TEXT",
+    "value": ''
+  }],
+  "output": "String",
+  "colour": BlockMirrorTextToBlocks.COLOR.TEXT,
+  "extensions": ["text_quotes"]
 });
-
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_StrDocstring",
-    "message0": "Docstring: %1 %2",
-    "args0": [
-        {"type": "input_dummy"},
-        {"type": "field_multilinetext", "name": "TEXT", "value": ''}
-    ],
-    "previousStatement": null,
-    "nextStatement": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.TEXT
+  "type": "ast_StrDocstring",
+  "message0": "Docstring: %1 %2",
+  "args0": [{
+    "type": "input_dummy"
+  }, {
+    "type": "field_multilinetext",
+    "name": "TEXT",
+    "value": ''
+  }],
+  "previousStatement": null,
+  "nextStatement": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.TEXT
 });
 
 Blockly.Python['ast_Str'] = function (block) {
-    // Text value.
-    let code = Blockly.Python.quote_(block.getFieldValue('TEXT'));
-    return [code, Blockly.Python.ORDER_ATOMIC];
+  // Text value.
+  var code = Blockly.Python.quote_(block.getFieldValue('TEXT'));
+  return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
 Blockly.Python['ast_StrMultiline'] = function (block) {
-    // Text value.
-    let code = Blockly.Python.multiline_quote_(block.getFieldValue('TEXT'));
-    return [code, Blockly.Python.ORDER_ATOMIC];
+  // Text value.
+  var code = Blockly.Python.multiline_quote_(block.getFieldValue('TEXT'));
+  return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
 Blockly.Python['ast_StrDocstring'] = function (block) {
-    // Text value.
-    let code = block.getFieldValue('TEXT');
-    if (code.charAt(0) !== '\n') {
-        code = '\n' + code;
-    }
-    if (code.charAt(code.length-1) !== '\n') {
-        code = code + '\n';
-    }
-    return Blockly.Python.multiline_quote_(code);
+  // Text value.
+  var code = block.getFieldValue('TEXT');
+
+  if (code.charAt(0) !== '\n') {
+    code = '\n' + code;
+  }
+
+  if (code.charAt(code.length - 1) !== '\n') {
+    code = code + '\n';
+  }
+
+  return Blockly.Python.multiline_quote_(code);
 };
 
 BlockMirrorTextToBlocks.prototype.isDocString = function (node, parent) {
-    return (parent._astname === 'Expr' &&
-        parent._parent &&
-        ['FunctionDef', 'ClassDef'].indexOf(parent._parent._astname) !== -1 &&
-        parent._parent.body[0] === parent);
+  return parent._astname === 'Expr' && parent._parent && ['FunctionDef', 'ClassDef'].indexOf(parent._parent._astname) !== -1 && parent._parent.body[0] === parent;
 };
 
 BlockMirrorTextToBlocks.prototype.dedent = function (text, levels) {
-    let split = text.split("\n");
-    let indentation = "    ".repeat(levels);
-    let recombined = [];
-    for (let i = 0; i < split.length; i++) {
-        // Are all lines indented?
-        if (split[i] === '') {
-            if (i !== 0) {
-                recombined.push("");
-            }
-        } else if (split[i].startsWith(indentation)) {
-            let unindentedLine = split[i].substr(indentation.length);
-            if (unindentedLine !== '' || i !== split.length - 1) {
-                recombined.push(unindentedLine);
-            }
-        } else if (i === 0) {
-            recombined.push(split[i]);
-        } else {
-            return text;
-        }
+  var split = text.split("\n");
+  var indentation = "    ".repeat(levels);
+  var recombined = [];
+
+  for (var i = 0; i < split.length; i++) {
+    // Are all lines indented?
+    if (split[i] === '') {
+      if (i !== 0) {
+        recombined.push("");
+      }
+    } else if (split[i].startsWith(indentation)) {
+      var unindentedLine = split[i].substr(indentation.length);
+
+      if (unindentedLine !== '' || i !== split.length - 1) {
+        recombined.push(unindentedLine);
+      }
+    } else if (i === 0) {
+      recombined.push(split[i]);
+    } else {
+      return text;
     }
-    return recombined.join("\n");
-};
+  }
+
+  return recombined.join("\n");
+}; // TODO: Handle indentation intelligently
+
 
-// TODO: Handle indentation intelligently
 BlockMirrorTextToBlocks.prototype['ast_Str'] = function (node, parent) {
-    let s = node.s;
-    let text = Sk.ffi.remapToJs(s);
-    if (this.isDocString(node, parent)) {
-        let dedented = this.dedent(text, this.levelIndex - 1);
-        return [BlockMirrorTextToBlocks.create_block("ast_StrDocstring", node.lineno, {"TEXT": dedented})];
-    } else if (text.indexOf('\n') === -1) {
-        return BlockMirrorTextToBlocks.create_block("ast_Str", node.lineno, {"TEXT": text});
-    } else {
-        let dedented = this.dedent(text, this.levelIndex - 1);
-        return BlockMirrorTextToBlocks.create_block("ast_StrMultiline", node.lineno, {"TEXT": dedented});
-    }
+  var s = node.s;
+  var text = Sk.ffi.remapToJs(s);
+
+  if (this.isDocString(node, parent)) {
+    var dedented = this.dedent(text, this.levelIndex - 1);
+    return [BlockMirrorTextToBlocks.create_block("ast_StrDocstring", node.lineno, {
+      "TEXT": dedented
+    })];
+  } else if (text.indexOf('\n') === -1) {
+    return BlockMirrorTextToBlocks.create_block("ast_Str", node.lineno, {
+      "TEXT": text
+    });
+  } else {
+    var _dedented = this.dedent(text, this.levelIndex - 1);
+
+    return BlockMirrorTextToBlocks.create_block("ast_StrMultiline", node.lineno, {
+      "TEXT": _dedented
+    });
+  }
 };
 
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_Expr",
-    "message0": "do nothing with %1",
-    "args0": [
-        {"type": "input_value", "name": "VALUE"}
-    ],
-    "inputsInline": false,
-    "previousStatement": null,
-    "nextStatement": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.PYTHON,
+  "type": "ast_Expr",
+  "message0": "do nothing with %1",
+  "args0": [{
+    "type": "input_value",
+    "name": "VALUE"
+  }],
+  "inputsInline": false,
+  "previousStatement": null,
+  "nextStatement": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.PYTHON
 });
 
 Blockly.Python['ast_Expr'] = function (block) {
-    // Numeric value.
-    var value = Blockly.Python.valueToCode(block, 'VALUE', Blockly.Python.ORDER_ATOMIC) || Blockly.Python.blank;
-    // TODO: Assemble JavaScript into code variable.
-    return value+"\n";
+  // Numeric value.
+  var value = Blockly.Python.valueToCode(block, 'VALUE', Blockly.Python.ORDER_ATOMIC) || Blockly.Python.blank; // TODO: Assemble JavaScript into code variable.
+
+  return value + "\n";
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Expr'] = function (node, parent) {
-    var value = node.value;
+  var value = node.value;
+  var converted = this.convert(value, node);
 
-    var converted = this.convert(value, node);
-
-    if (converted.constructor === Array) {
-        return converted[0];
-    } else if (this.isTopLevel(parent)) {
-        return [this.convert(value, node)];
-    } else {
-        return BlockMirrorTextToBlocks.create_block("ast_Expr", node.lineno, {}, {
-            "VALUE": this.convert(value, node)
-        });
-    }
+  if (converted.constructor === Array) {
+    return converted[0];
+  } else if (this.isTopLevel(parent)) {
+    return [this.convert(value, node)];
+  } else {
+    return BlockMirrorTextToBlocks.create_block("ast_Expr", node.lineno, {}, {
+      "VALUE": this.convert(value, node)
+    });
+  }
 };
 
-BlockMirrorTextToBlocks.UNARYOPS = [
-    ["+", "UAdd", 'Do nothing to the number'],
-    ["-", "USub", 'Make the number negative'],
-    ["not", "Not", 'Return the logical opposite of the value.'],
-    ["~", "Invert", 'Take the bit inversion of the number']
-];
-
+BlockMirrorTextToBlocks.UNARYOPS = [["+", "UAdd", 'Do nothing to the number'], ["-", "USub", 'Make the number negative'], ["not", "Not", 'Return the logical opposite of the value.'], ["~", "Invert", 'Take the bit inversion of the number']];
 BlockMirrorTextToBlocks.UNARYOPS.forEach(function (unaryop) {
-    //Blockly.Constants.Math.TOOLTIPS_BY_OP[unaryop[1]] = unaryop[2];
-
-    let fullName = "ast_UnaryOp" + unaryop[1];
-
-    BlockMirrorTextToBlocks.BLOCKS.push({
-        "type": fullName,
-        "message0": unaryop[0] + " %1",
-        "args0": [
-            {"type": "input_value", "name": "VALUE"}
-        ],
-        "inputsInline": false,
-        "output": null,
-        "colour": (unaryop[1] == 'Not' ?
-            BlockMirrorTextToBlocks.COLOR.LOGIC :
-            BlockMirrorTextToBlocks.COLOR.MATH)
-    });
+  //Blockly.Constants.Math.TOOLTIPS_BY_OP[unaryop[1]] = unaryop[2];
+  var fullName = "ast_UnaryOp" + unaryop[1];
+  BlockMirrorTextToBlocks.BLOCKS.push({
+    "type": fullName,
+    "message0": unaryop[0] + " %1",
+    "args0": [{
+      "type": "input_value",
+      "name": "VALUE"
+    }],
+    "inputsInline": false,
+    "output": null,
+    "colour": unaryop[1] == 'Not' ? BlockMirrorTextToBlocks.COLOR.LOGIC : BlockMirrorTextToBlocks.COLOR.MATH
+  });
 
-    Blockly.Python[fullName] = function (block) {
-        // Basic arithmetic operators, and power.
-        var order = (unaryop[1] == 'Not' ? Blockly.Python.ORDER_LOGICAL_NOT : Blockly.Python.ORDER_UNARY_SIGN);
-        var argument1 = Blockly.Python.valueToCode(block, 'VALUE', order) || Blockly.Python.blank;
-        var code = unaryop[0] + (unaryop[1] == 'Not' ? ' ' : '') + argument1;
-        return [code, order];
-    };
+  Blockly.Python[fullName] = function (block) {
+    // Basic arithmetic operators, and power.
+    var order = unaryop[1] == 'Not' ? Blockly.Python.ORDER_LOGICAL_NOT : Blockly.Python.ORDER_UNARY_SIGN;
+    var argument1 = Blockly.Python.valueToCode(block, 'VALUE', order) || Blockly.Python.blank;
+    var code = unaryop[0] + (unaryop[1] == 'Not' ? ' ' : '') + argument1;
+    return [code, order];
+  };
 });
 
 BlockMirrorTextToBlocks.prototype['ast_UnaryOp'] = function (node, parent) {
-    let op = node.op.name;
-    let operand = node.operand;
-
-    return BlockMirrorTextToBlocks.create_block('ast_UnaryOp' + op, node.lineno, {}, {
-        "VALUE": this.convert(operand, node)
-    }, {
-        "inline": false
-    });
-}
-BlockMirrorTextToBlocks.BOOLOPS = [
-    ["and", "And", Blockly.Python.ORDER_LOGICAL_AND, 'Return whether the left and right both evaluate to True.'],
-    ["or", "Or", Blockly.Python.ORDER_LOGICAL_OR, 'Return whether either the left or right evaluate to True.']
-];
-var BOOLOPS_BLOCKLY_DISPLAY = BlockMirrorTextToBlocks.BOOLOPS.map(
-    boolop => [boolop[0], boolop[1]]
-);
+  var op = node.op.name;
+  var operand = node.operand;
+  return BlockMirrorTextToBlocks.create_block('ast_UnaryOp' + op, node.lineno, {}, {
+    "VALUE": this.convert(operand, node)
+  }, {
+    "inline": false
+  });
+};
+
+BlockMirrorTextToBlocks.BOOLOPS = [["and", "And", Blockly.Python.ORDER_LOGICAL_AND, 'Return whether the left and right both evaluate to True.'], ["or", "Or", Blockly.Python.ORDER_LOGICAL_OR, 'Return whether either the left or right evaluate to True.']];
+var BOOLOPS_BLOCKLY_DISPLAY = BlockMirrorTextToBlocks.BOOLOPS.map(function (boolop) {
+  return [boolop[0], boolop[1]];
+});
 var BOOLOPS_BLOCKLY_GENERATE = {};
 BlockMirrorTextToBlocks.BOOLOPS.forEach(function (boolop) {
-    BOOLOPS_BLOCKLY_GENERATE[boolop[1]] = [" " + boolop[0] + " ", boolop[2]];
+  BOOLOPS_BLOCKLY_GENERATE[boolop[1]] = [" " + boolop[0] + " ", boolop[2]];
 });
-
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_BoolOp",
-    "message0": "%1 %2 %3",
-    "args0": [
-        {"type": "input_value", "name": "A"},
-        {"type": "field_dropdown", "name": "OP", "options": BOOLOPS_BLOCKLY_DISPLAY},
-        {"type": "input_value", "name": "B"}
-    ],
-    "inputsInline": true,
-    "output": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
+  "type": "ast_BoolOp",
+  "message0": "%1 %2 %3",
+  "args0": [{
+    "type": "input_value",
+    "name": "A"
+  }, {
+    "type": "field_dropdown",
+    "name": "OP",
+    "options": BOOLOPS_BLOCKLY_DISPLAY
+  }, {
+    "type": "input_value",
+    "name": "B"
+  }],
+  "inputsInline": true,
+  "output": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
 });
 
 Blockly.Python['ast_BoolOp'] = function (block) {
-    // Operations 'and', 'or'.
-    var operator = (block.getFieldValue('OP') === 'And') ? 'and' : 'or';
-    var order = (operator === 'and') ? Blockly.Python.ORDER_LOGICAL_AND :
-        Blockly.Python.ORDER_LOGICAL_OR;
-    var argument0 = Blockly.Python.valueToCode(block, 'A', order) || Blockly.Python.blank;
-    var argument1 = Blockly.Python.valueToCode(block, 'B', order) || Blockly.Python.blank;
-    var code = argument0 + ' ' + operator + ' ' + argument1;
-    return [code, order];
+  // Operations 'and', 'or'.
+  var operator = block.getFieldValue('OP') === 'And' ? 'and' : 'or';
+  var order = operator === 'and' ? Blockly.Python.ORDER_LOGICAL_AND : Blockly.Python.ORDER_LOGICAL_OR;
+  var argument0 = Blockly.Python.valueToCode(block, 'A', order) || Blockly.Python.blank;
+  var argument1 = Blockly.Python.valueToCode(block, 'B', order) || Blockly.Python.blank;
+  var code = argument0 + ' ' + operator + ' ' + argument1;
+  return [code, order];
 };
 
 BlockMirrorTextToBlocks.prototype['ast_BoolOp'] = function (node, parent) {
-    var op = node.op;
-    var values = node.values;
-    var result_block = this.convert(values[0], node);
-    for (var i = 1; i < values.length; i += 1) {
-        result_block = BlockMirrorTextToBlocks.create_block("ast_BoolOp", node.lineno, {
-            "OP": op.name
-        }, {
-            "A": result_block,
-            "B": this.convert(values[i], node)
-        }, {
-            "inline": "true"
-        });
-    }
-    return result_block;
-};
-
-
-
-BlockMirrorTextToBlocks.COMPARES = [
-    ["==", "Eq", 'Return whether the two values are equal.'],
-    ["!=", "NotEq", 'Return whether the two values are not equal.'],
-    ["<", "Lt", 'Return whether the left value is less than the right value.'],
-    ["<=", "LtE", 'Return whether the left value is less than or equal to the right value.'],
-    [">", "Gt", 'Return whether the left value is greater than the right value.'],
-    [">=", "GtE", 'Return whether the left value is greater than or equal to the right value.'],
-    ["is", "Is", 'Return whether the left value is identical to the right value.'],
-    ["is not", "IsNot", 'Return whether the left value is not identical to the right value.'],
-    ["in", "In", 'Return whether the left value is in the right value.'],
-    ["not in", "NotIn", 'Return whether the left value is not in the right value.'],
-];
-
-var COMPARES_BLOCKLY_DISPLAY = BlockMirrorTextToBlocks.COMPARES.map(
-    boolop => [boolop[0], boolop[1]]
-);
+  var op = node.op;
+  var values = node.values;
+  var result_block = this.convert(values[0], node);
+
+  for (var i = 1; i < values.length; i += 1) {
+    result_block = BlockMirrorTextToBlocks.create_block("ast_BoolOp", node.lineno, {
+      "OP": op.name
+    }, {
+      "A": result_block,
+      "B": this.convert(values[i], node)
+    }, {
+      "inline": "true"
+    });
+  }
+
+  return result_block;
+};
+
+BlockMirrorTextToBlocks.COMPARES = [["==", "Eq", 'Return whether the two values are equal.'], ["!=", "NotEq", 'Return whether the two values are not equal.'], ["<", "Lt", 'Return whether the left value is less than the right value.'], ["<=", "LtE", 'Return whether the left value is less than or equal to the right value.'], [">", "Gt", 'Return whether the left value is greater than the right value.'], [">=", "GtE", 'Return whether the left value is greater than or equal to the right value.'], ["is", "Is", 'Return whether the left value is identical to the right value.'], ["is not", "IsNot", 'Return whether the left value is not identical to the right value.'], ["in", "In", 'Return whether the left value is in the right value.'], ["not in", "NotIn", 'Return whether the left value is not in the right value.']];
+var COMPARES_BLOCKLY_DISPLAY = BlockMirrorTextToBlocks.COMPARES.map(function (boolop) {
+  return [boolop[0], boolop[1]];
+});
 var COMPARES_BLOCKLY_GENERATE = {};
 BlockMirrorTextToBlocks.COMPARES.forEach(function (boolop) {
-    COMPARES_BLOCKLY_GENERATE[boolop[1]] = boolop[0];
+  COMPARES_BLOCKLY_GENERATE[boolop[1]] = boolop[0];
 });
-
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_Compare",
-    "message0": "%1 %2 %3",
-    "args0": [
-        {"type": "input_value", "name": "A"},
-        {"type": "field_dropdown", "name": "OP", "options": COMPARES_BLOCKLY_DISPLAY},
-        {"type": "input_value", "name": "B"}
-    ],
-    "inputsInline": true,
-    "output": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
+  "type": "ast_Compare",
+  "message0": "%1 %2 %3",
+  "args0": [{
+    "type": "input_value",
+    "name": "A"
+  }, {
+    "type": "field_dropdown",
+    "name": "OP",
+    "options": COMPARES_BLOCKLY_DISPLAY
+  }, {
+    "type": "input_value",
+    "name": "B"
+  }],
+  "inputsInline": true,
+  "output": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
 });
 
 Blockly.Python['ast_Compare'] = function (block) {
-    // Basic arithmetic operators, and power.
-    var tuple = COMPARES_BLOCKLY_GENERATE[block.getFieldValue('OP')];
-    var operator = ' ' + tuple + ' ';
-    var order = Blockly.Python.ORDER_RELATIONAL;
-    var argument0 = Blockly.Python.valueToCode(block, 'A', order) || Blockly.Python.blank;
-    var argument1 = Blockly.Python.valueToCode(block, 'B', order) || Blockly.Python.blank;
-    var code = argument0 + operator + argument1;
-    return [code, order];
+  // Basic arithmetic operators, and power.
+  var tuple = COMPARES_BLOCKLY_GENERATE[block.getFieldValue('OP')];
+  var operator = ' ' + tuple + ' ';
+  var order = Blockly.Python.ORDER_RELATIONAL;
+  var argument0 = Blockly.Python.valueToCode(block, 'A', order) || Blockly.Python.blank;
+  var argument1 = Blockly.Python.valueToCode(block, 'B', order) || Blockly.Python.blank;
+  var code = argument0 + operator + argument1;
+  return [code, order];
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Compare'] = function (node, parent) {
-    var ops = node.ops;
-    var left = node.left;
-    var values = node.comparators;
-    var result_block = this.convert(left, node);
-    for (var i = 0; i < values.length; i += 1) {
-        result_block = BlockMirrorTextToBlocks.create_block("ast_Compare", node.lineno, {
-            "OP": ops[i].name
-        }, {
-            "A": result_block,
-            "B": this.convert(values[i], node)
-        }, {
-            "inline": "true"
-        });
-    }
-    return result_block;
+  var ops = node.ops;
+  var left = node.left;
+  var values = node.comparators;
+  var result_block = this.convert(left, node);
+
+  for (var i = 0; i < values.length; i += 1) {
+    result_block = BlockMirrorTextToBlocks.create_block("ast_Compare", node.lineno, {
+      "OP": ops[i].name
+    }, {
+      "A": result_block,
+      "B": this.convert(values[i], node)
+    }, {
+      "inline": "true"
+    });
+  }
+
+  return result_block;
 };
+
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_AssertFull",
-    "message0": "assert %1 %2",
-    "args0": [
-        {"type": "input_value", "name": "TEST"},
-        {"type": "input_value", "name": "MSG"}
-    ],
-    "inputsInline": true,
-    "previousStatement": null,
-    "nextStatement": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.LOGIC,
+  "type": "ast_AssertFull",
+  "message0": "assert %1 %2",
+  "args0": [{
+    "type": "input_value",
+    "name": "TEST"
+  }, {
+    "type": "input_value",
+    "name": "MSG"
+  }],
+  "inputsInline": true,
+  "previousStatement": null,
+  "nextStatement": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
 });
-
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_Assert",
-    "message0": "assert %1",
-    "args0": [
-        {"type": "input_value", "name": "TEST"}
-    ],
-    "inputsInline": true,
-    "previousStatement": null,
-    "nextStatement": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.LOGIC,
+  "type": "ast_Assert",
+  "message0": "assert %1",
+  "args0": [{
+    "type": "input_value",
+    "name": "TEST"
+  }],
+  "inputsInline": true,
+  "previousStatement": null,
+  "nextStatement": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
 });
 
 Blockly.Python['ast_Assert'] = function (block) {
-    var test = Blockly.Python.valueToCode(block, 'TEST', Blockly.Python.ORDER_ATOMIC) || Blockly.Python.blank;
-    return "assert " + test + "\n";
+  var test = Blockly.Python.valueToCode(block, 'TEST', Blockly.Python.ORDER_ATOMIC) || Blockly.Python.blank;
+  return "assert " + test + "\n";
 };
 
 Blockly.Python['ast_AssertFull'] = function (block) {
-    var test = Blockly.Python.valueToCode(block, 'TEST', Blockly.Python.ORDER_ATOMIC) || Blockly.Python.blank;
-    var msg = Blockly.Python.valueToCode(block, 'MSG', Blockly.Python.ORDER_ATOMIC) || Blockly.Python.blank;
-    return "assert " + test + ", "+msg+"\n";
+  var test = Blockly.Python.valueToCode(block, 'TEST', Blockly.Python.ORDER_ATOMIC) || Blockly.Python.blank;
+  var msg = Blockly.Python.valueToCode(block, 'MSG', Blockly.Python.ORDER_ATOMIC) || Blockly.Python.blank;
+  return "assert " + test + ", " + msg + "\n";
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Assert'] = function (node, parent) {
-    var test = node.test;
-    var msg = node.msg;
-    if (msg == null) {
-        return BlockMirrorTextToBlocks.create_block("ast_Assert", node.lineno, {}, {
-            "TEST": this.convert(test, node)
-        });
-    } else {
-        return BlockMirrorTextToBlocks.create_block("ast_AssertFull", node.lineno, {}, {
-            "TEST": this.convert(test, node),
-            "MSG": this.convert(msg, node)
-        });
-    }
+  var test = node.test;
+  var msg = node.msg;
+
+  if (msg == null) {
+    return BlockMirrorTextToBlocks.create_block("ast_Assert", node.lineno, {}, {
+      "TEST": this.convert(test, node)
+    });
+  } else {
+    return BlockMirrorTextToBlocks.create_block("ast_AssertFull", node.lineno, {}, {
+      "TEST": this.convert(test, node),
+      "MSG": this.convert(msg, node)
+    });
+  }
 };
+
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_NameConstantNone",
-    "message0": "None",
-    "args0": [],
-    "output": "None",
-    "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
+  "type": "ast_NameConstantNone",
+  "message0": "None",
+  "args0": [],
+  "output": "None",
+  "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
 });
-
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_NameConstantBoolean",
-    "message0": "%1",
-    "args0": [
-        {
-            "type": "field_dropdown", "name": "BOOL", "options": [
-                ["True", "TRUE"],
-                ["False", "FALSE"]
-            ]
-        }
-    ],
-    "output": "Boolean",
-    "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
+  "type": "ast_NameConstantBoolean",
+  "message0": "%1",
+  "args0": [{
+    "type": "field_dropdown",
+    "name": "BOOL",
+    "options": [["True", "TRUE"], ["False", "FALSE"]]
+  }],
+  "output": "Boolean",
+  "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
 });
 
 Blockly.Python['ast_NameConstantBoolean'] = function (block) {
-    // Boolean values true and false.
-    var code = (block.getFieldValue('BOOL') == 'TRUE') ? 'True' : 'False';
-    return [code, Blockly.Python.ORDER_ATOMIC];
+  // Boolean values true and false.
+  var code = block.getFieldValue('BOOL') == 'TRUE' ? 'True' : 'False';
+  return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
 Blockly.Python['ast_NameConstantNone'] = function (block) {
-    // Boolean values true and false.
-    var code = 'None';
-    return [code, Blockly.Python.ORDER_ATOMIC];
+  // Boolean values true and false.
+  var code = 'None';
+  return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
 BlockMirrorTextToBlocks.prototype['ast_NameConstant'] = function (node, parent) {
-    let value = node.value;
+  var value = node.value;
 
-    if (value === Sk.builtin.none.none$) {
-        return BlockMirrorTextToBlocks.create_block('ast_NameConstantNone', node.lineno, {});
-    } else if (value === Sk.builtin.bool.true$) {
-        return BlockMirrorTextToBlocks.create_block('ast_NameConstantBoolean', node.lineno, {
-            "BOOL": 'TRUE'
-        });
-    } else if (value === Sk.builtin.bool.false$) {
-        return BlockMirrorTextToBlocks.create_block('ast_NameConstantBoolean', node.lineno, {
-            "BOOL": 'FALSE'
-        });
-    }
+  if (value === Sk.builtin.none.none$) {
+    return BlockMirrorTextToBlocks.create_block('ast_NameConstantNone', node.lineno, {});
+  } else if (value === Sk.builtin.bool.true$) {
+    return BlockMirrorTextToBlocks.create_block('ast_NameConstantBoolean', node.lineno, {
+      "BOOL": 'TRUE'
+    });
+  } else if (value === Sk.builtin.bool.false$) {
+    return BlockMirrorTextToBlocks.create_block('ast_NameConstantBoolean', node.lineno, {
+      "BOOL": 'FALSE'
+    });
+  }
 };
+
 Blockly.Blocks['ast_List'] = {
-    /**
-     * Block for creating a list with any number of elements of any type.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.setHelpUrl(Blockly.Msg['LISTS_CREATE_WITH_HELPURL']);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.LIST);
-        this.itemCount_ = 3;
-        this.updateShape_();
-        this.setOutput(true, 'List');
-        this.setMutator(new Blockly.Mutator(['ast_List_create_with_item']));
-    },
-    /**
-     * Create XML to represent list inputs.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        var container = document.createElement('mutation');
-        container.setAttribute('items', this.itemCount_);
-        return container;
-    },
-    /**
-     * Parse XML to restore the list inputs.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
-        this.updateShape_();
-    },
-    /**
-     * Populate the mutator's dialog with this block's components.
-     * @param {!Blockly.Workspace} workspace Mutator's workspace.
-     * @return {!Blockly.Block} Root block in mutator.
-     * @this Blockly.Block
-     */
-    decompose: function (workspace) {
-        var containerBlock = workspace.newBlock('ast_List_create_with_container');
-        containerBlock.initSvg();
-        var connection = containerBlock.getInput('STACK').connection;
-        for (var i = 0; i < this.itemCount_; i++) {
-            var itemBlock = workspace.newBlock('ast_List_create_with_item');
-            itemBlock.initSvg();
-            connection.connect(itemBlock.previousConnection);
-            connection = itemBlock.nextConnection;
-        }
-        return containerBlock;
-    },
-    /**
-     * Reconfigure this block based on the mutator dialog's components.
-     * @param {!Blockly.Block} containerBlock Root block in mutator.
-     * @this Blockly.Block
-     */
-    compose: function (containerBlock) {
-        var itemBlock = containerBlock.getInputTargetBlock('STACK');
-        // Count number of inputs.
-        var connections = [];
-        while (itemBlock) {
-            connections.push(itemBlock.valueConnection_);
-            itemBlock = itemBlock.nextConnection &&
-                itemBlock.nextConnection.targetBlock();
-        }
-        // Disconnect any children that don't belong.
-        for (var i = 0; i < this.itemCount_; i++) {
-            var connection = this.getInput('ADD' + i).connection.targetConnection;
-            if (connection && connections.indexOf(connection) == -1) {
-                connection.disconnect();
-            }
-        }
-        this.itemCount_ = connections.length;
-        this.updateShape_();
-        // Reconnect any child blocks.
-        for (var i = 0; i < this.itemCount_; i++) {
-            Blockly.Mutator.reconnect(connections[i], this, 'ADD' + i);
-        }
-    },
-    /**
-     * Store pointers to any connected child blocks.
-     * @param {!Blockly.Block} containerBlock Root block in mutator.
-     * @this Blockly.Block
-     */
-    saveConnections: function (containerBlock) {
-        var itemBlock = containerBlock.getInputTargetBlock('STACK');
-        var i = 0;
-        while (itemBlock) {
-            var input = this.getInput('ADD' + i);
-            itemBlock.valueConnection_ = input && input.connection.targetConnection;
-            i++;
-            itemBlock = itemBlock.nextConnection &&
-                itemBlock.nextConnection.targetBlock();
-        }
-    },
-    /**
-     * Modify this block to have the correct number of inputs.
-     * @private
-     * @this Blockly.Block
-     */
-    updateShape_: function () {
-        if (this.itemCount_ && this.getInput('EMPTY')) {
-            this.removeInput('EMPTY');
-        } else if (!this.itemCount_ && !this.getInput('EMPTY')) {
-            this.appendDummyInput('EMPTY')
-                .appendField('create empty list []');
-        }
-        // Add new inputs.
-        for (var i = 0; i < this.itemCount_; i++) {
-            if (!this.getInput('ADD' + i)) {
-                var input = this.appendValueInput('ADD' + i);
-                if (i == 0) {
-                    input.appendField('create list with [');
-                } else {
-                    input.appendField(',').setAlign(Blockly.ALIGN_RIGHT);
-                }
-            }
-        }
-        // Remove deleted inputs.
-        while (this.getInput('ADD' + i)) {
-            this.removeInput('ADD' + i);
-            i++;
-        }
-        // Add the trailing "]"
-        if (this.getInput('TAIL')) {
-            this.removeInput('TAIL');
-        }
-        if (this.itemCount_) {
-            this.appendDummyInput('TAIL')
-                .appendField(']')
-                .setAlign(Blockly.ALIGN_RIGHT);
+  /**
+   * Block for creating a list with any number of elements of any type.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.setHelpUrl(Blockly.Msg['LISTS_CREATE_WITH_HELPURL']);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.LIST);
+    this.itemCount_ = 3;
+    this.updateShape_();
+    this.setOutput(true, 'List');
+    this.setMutator(new Blockly.Mutator(['ast_List_create_with_item']));
+  },
+
+  /**
+   * Create XML to represent list inputs.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('items', this.itemCount_);
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the list inputs.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
+    this.updateShape_();
+  },
+
+  /**
+   * Populate the mutator's dialog with this block's components.
+   * @param {!Blockly.Workspace} workspace Mutator's workspace.
+   * @return {!Blockly.Block} Root block in mutator.
+   * @this Blockly.Block
+   */
+  decompose: function decompose(workspace) {
+    var containerBlock = workspace.newBlock('ast_List_create_with_container');
+    containerBlock.initSvg();
+    var connection = containerBlock.getInput('STACK').connection;
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      var itemBlock = workspace.newBlock('ast_List_create_with_item');
+      itemBlock.initSvg();
+      connection.connect(itemBlock.previousConnection);
+      connection = itemBlock.nextConnection;
+    }
+
+    return containerBlock;
+  },
+
+  /**
+   * Reconfigure this block based on the mutator dialog's components.
+   * @param {!Blockly.Block} containerBlock Root block in mutator.
+   * @this Blockly.Block
+   */
+  compose: function compose(containerBlock) {
+    var itemBlock = containerBlock.getInputTargetBlock('STACK'); // Count number of inputs.
+
+    var connections = [];
+
+    while (itemBlock) {
+      connections.push(itemBlock.valueConnection_);
+      itemBlock = itemBlock.nextConnection && itemBlock.nextConnection.targetBlock();
+    } // Disconnect any children that don't belong.
+
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      var connection = this.getInput('ADD' + i).connection.targetConnection;
+
+      if (connection && connections.indexOf(connection) == -1) {
+        connection.disconnect();
+      }
+    }
+
+    this.itemCount_ = connections.length;
+    this.updateShape_(); // Reconnect any child blocks.
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      Blockly.Mutator.reconnect(connections[i], this, 'ADD' + i);
+    }
+  },
+
+  /**
+   * Store pointers to any connected child blocks.
+   * @param {!Blockly.Block} containerBlock Root block in mutator.
+   * @this Blockly.Block
+   */
+  saveConnections: function saveConnections(containerBlock) {
+    var itemBlock = containerBlock.getInputTargetBlock('STACK');
+    var i = 0;
+
+    while (itemBlock) {
+      var input = this.getInput('ADD' + i);
+      itemBlock.valueConnection_ = input && input.connection.targetConnection;
+      i++;
+      itemBlock = itemBlock.nextConnection && itemBlock.nextConnection.targetBlock();
+    }
+  },
+
+  /**
+   * Modify this block to have the correct number of inputs.
+   * @private
+   * @this Blockly.Block
+   */
+  updateShape_: function updateShape_() {
+    if (this.itemCount_ && this.getInput('EMPTY')) {
+      this.removeInput('EMPTY');
+    } else if (!this.itemCount_ && !this.getInput('EMPTY')) {
+      this.appendDummyInput('EMPTY').appendField('create empty list []');
+    } // Add new inputs.
+
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      if (!this.getInput('ADD' + i)) {
+        var input = this.appendValueInput('ADD' + i);
+
+        if (i == 0) {
+          input.appendField('create list with [');
+        } else {
+          input.appendField(',').setAlign(Blockly.ALIGN_RIGHT);
         }
+      }
+    } // Remove deleted inputs.
+
+
+    while (this.getInput('ADD' + i)) {
+      this.removeInput('ADD' + i);
+      i++;
+    } // Add the trailing "]"
+
+
+    if (this.getInput('TAIL')) {
+      this.removeInput('TAIL');
     }
-};
 
-Blockly.Blocks['ast_List_create_with_container'] = {
-    /**
-     * Mutator block for list container.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.setColour(BlockMirrorTextToBlocks.COLOR.LIST);
-        this.appendDummyInput()
-            .appendField('Add new list elements below');
-        this.appendStatementInput('STACK');
-        this.contextMenu = false;
+    if (this.itemCount_) {
+      this.appendDummyInput('TAIL').appendField(']').setAlign(Blockly.ALIGN_RIGHT);
     }
+  }
+};
+Blockly.Blocks['ast_List_create_with_container'] = {
+  /**
+   * Mutator block for list container.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.setColour(BlockMirrorTextToBlocks.COLOR.LIST);
+    this.appendDummyInput().appendField('Add new list elements below');
+    this.appendStatementInput('STACK');
+    this.contextMenu = false;
+  }
 };
-
 Blockly.Blocks['ast_List_create_with_item'] = {
-    /**
-     * Mutator block for adding items.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.setColour(BlockMirrorTextToBlocks.COLOR.LIST);
-        this.appendDummyInput()
-            .appendField('Element');
-        this.setPreviousStatement(true);
-        this.setNextStatement(true);
-        this.contextMenu = false;
-    }
+  /**
+   * Mutator block for adding items.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.setColour(BlockMirrorTextToBlocks.COLOR.LIST);
+    this.appendDummyInput().appendField('Element');
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+    this.contextMenu = false;
+  }
 };
 
 Blockly.Python['ast_List'] = function (block) {
-    // Create a list with any number of elements of any type.
-    var elements = new Array(block.itemCount_);
-    for (var i = 0; i < block.itemCount_; i++) {
-        elements[i] = Blockly.Python.valueToCode(block, 'ADD' + i,
-            Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-    }
-    var code = '[' + elements.join(', ') + ']';
-    return [code, Blockly.Python.ORDER_ATOMIC];
+  // Create a list with any number of elements of any type.
+  var elements = new Array(block.itemCount_);
+
+  for (var i = 0; i < block.itemCount_; i++) {
+    elements[i] = Blockly.Python.valueToCode(block, 'ADD' + i, Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  }
+
+  var code = '[' + elements.join(', ') + ']';
+  return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
 BlockMirrorTextToBlocks.prototype['ast_List'] = function (node, parent) {
-    var elts = node.elts;
-    var ctx = node.ctx;
-
-    return BlockMirrorTextToBlocks.create_block("ast_List", node.lineno, {},
-        this.convertElements("ADD", elts, node),
-        {
-            "inline": elts.length > 3 ? "false" : "true",
-        }, {
-            "@items": elts.length
-        });
-}
+  var elts = node.elts;
+  var ctx = node.ctx;
+  return BlockMirrorTextToBlocks.create_block("ast_List", node.lineno, {}, this.convertElements("ADD", elts, node), {
+    "inline": elts.length > 3 ? "false" : "true"
+  }, {
+    "@items": elts.length
+  });
+};
 
 Blockly.Blocks['ast_Tuple'] = {
-    /**
-     * Block for creating a tuple with any number of elements of any type.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.setColour(BlockMirrorTextToBlocks.COLOR.TUPLE);
-        this.itemCount_ = 3;
-        this.updateShape_();
-        this.setOutput(true, 'Tuple');
-        this.setMutator(new Blockly.Mutator(['ast_Tuple_create_with_item']));
-    },
-    /**
-     * Create XML to represent tuple inputs.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        var container = document.createElement('mutation');
-        container.setAttribute('items', this.itemCount_);
-        return container;
-    },
-    /**
-     * Parse XML to restore the tuple inputs.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
-        this.updateShape_();
-    },
-    /**
-     * Populate the mutator's dialog with this block's components.
-     * @param {!Blockly.Workspace} workspace Mutator's workspace.
-     * @return {!Blockly.Block} Root block in mutator.
-     * @this Blockly.Block
-     */
-    decompose: function (workspace) {
-        var containerBlock = workspace.newBlock('ast_Tuple_create_with_container');
-        containerBlock.initSvg();
-        var connection = containerBlock.getInput('STACK').connection;
-        for (var i = 0; i < this.itemCount_; i++) {
-            var itemBlock = workspace.newBlock('ast_Tuple_create_with_item');
-            itemBlock.initSvg();
-            connection.connect(itemBlock.previousConnection);
-            connection = itemBlock.nextConnection;
-        }
-        return containerBlock;
-    },
-    /**
-     * Reconfigure this block based on the mutator dialog's components.
-     * @param {!Blockly.Block} containerBlock Root block in mutator.
-     * @this Blockly.Block
-     */
-    compose: function (containerBlock) {
-        var itemBlock = containerBlock.getInputTargetBlock('STACK');
-        // Count number of inputs.
-        var connections = [];
-        while (itemBlock) {
-            connections.push(itemBlock.valueConnection_);
-            itemBlock = itemBlock.nextConnection &&
-                itemBlock.nextConnection.targetBlock();
-        }
-        // Disconnect any children that don't belong.
-        for (var i = 0; i < this.itemCount_; i++) {
-            var connection = this.getInput('ADD' + i).connection.targetConnection;
-            if (connection && connections.indexOf(connection) == -1) {
-                connection.disconnect();
-            }
-        }
-        this.itemCount_ = connections.length;
-        this.updateShape_();
-        // Reconnect any child blocks.
-        for (var i = 0; i < this.itemCount_; i++) {
-            Blockly.Mutator.reconnect(connections[i], this, 'ADD' + i);
-        }
-    },
-    /**
-     * Store pointers to any connected child blocks.
-     * @param {!Blockly.Block} containerBlock Root block in mutator.
-     * @this Blockly.Block
-     */
-    saveConnections: function (containerBlock) {
-        var itemBlock = containerBlock.getInputTargetBlock('STACK');
-        var i = 0;
-        while (itemBlock) {
-            var input = this.getInput('ADD' + i);
-            itemBlock.valueConnection_ = input && input.connection.targetConnection;
-            i++;
-            itemBlock = itemBlock.nextConnection &&
-                itemBlock.nextConnection.targetBlock();
-        }
-    },
-    /**
-     * Modify this block to have the correct number of inputs.
-     * @private
-     * @this Blockly.Block
-     */
-    updateShape_: function () {
-        if (this.itemCount_ && this.getInput('EMPTY')) {
-            this.removeInput('EMPTY');
-        } else if (!this.itemCount_ && !this.getInput('EMPTY')) {
-            this.appendDummyInput('EMPTY')
-                .appendField('()');
-        }
-        // Add new inputs.
-        for (var i = 0; i < this.itemCount_; i++) {
-            if (!this.getInput('ADD' + i)) {
-                var input = this.appendValueInput('ADD' + i);
-                if (i === 0) {
-                    input.appendField('(', ).setAlign(Blockly.ALIGN_RIGHT);
-                } else {
-                    input.appendField(',').setAlign(Blockly.ALIGN_RIGHT);
-                }
-            }
-        }
-        // Remove deleted inputs.
-        while (this.getInput('ADD' + i)) {
-            this.removeInput('ADD' + i);
-            i++;
-        }
-        // Add the trailing "]"
-        if (this.getInput('TAIL')) {
-            this.removeInput('TAIL');
-        }
-        if (this.itemCount_) {
-            let tail = this.appendDummyInput('TAIL');
-            if (this.itemCount_ === 1) {
-                tail.appendField(',)');
-            } else {
-                tail.appendField(')');
-            }
-            tail.setAlign(Blockly.ALIGN_RIGHT);
+  /**
+   * Block for creating a tuple with any number of elements of any type.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.setColour(BlockMirrorTextToBlocks.COLOR.TUPLE);
+    this.itemCount_ = 3;
+    this.updateShape_();
+    this.setOutput(true, 'Tuple');
+    this.setMutator(new Blockly.Mutator(['ast_Tuple_create_with_item']));
+  },
+
+  /**
+   * Create XML to represent tuple inputs.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('items', this.itemCount_);
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the tuple inputs.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
+    this.updateShape_();
+  },
+
+  /**
+   * Populate the mutator's dialog with this block's components.
+   * @param {!Blockly.Workspace} workspace Mutator's workspace.
+   * @return {!Blockly.Block} Root block in mutator.
+   * @this Blockly.Block
+   */
+  decompose: function decompose(workspace) {
+    var containerBlock = workspace.newBlock('ast_Tuple_create_with_container');
+    containerBlock.initSvg();
+    var connection = containerBlock.getInput('STACK').connection;
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      var itemBlock = workspace.newBlock('ast_Tuple_create_with_item');
+      itemBlock.initSvg();
+      connection.connect(itemBlock.previousConnection);
+      connection = itemBlock.nextConnection;
+    }
+
+    return containerBlock;
+  },
+
+  /**
+   * Reconfigure this block based on the mutator dialog's components.
+   * @param {!Blockly.Block} containerBlock Root block in mutator.
+   * @this Blockly.Block
+   */
+  compose: function compose(containerBlock) {
+    var itemBlock = containerBlock.getInputTargetBlock('STACK'); // Count number of inputs.
+
+    var connections = [];
+
+    while (itemBlock) {
+      connections.push(itemBlock.valueConnection_);
+      itemBlock = itemBlock.nextConnection && itemBlock.nextConnection.targetBlock();
+    } // Disconnect any children that don't belong.
+
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      var connection = this.getInput('ADD' + i).connection.targetConnection;
+
+      if (connection && connections.indexOf(connection) == -1) {
+        connection.disconnect();
+      }
+    }
+
+    this.itemCount_ = connections.length;
+    this.updateShape_(); // Reconnect any child blocks.
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      Blockly.Mutator.reconnect(connections[i], this, 'ADD' + i);
+    }
+  },
+
+  /**
+   * Store pointers to any connected child blocks.
+   * @param {!Blockly.Block} containerBlock Root block in mutator.
+   * @this Blockly.Block
+   */
+  saveConnections: function saveConnections(containerBlock) {
+    var itemBlock = containerBlock.getInputTargetBlock('STACK');
+    var i = 0;
+
+    while (itemBlock) {
+      var input = this.getInput('ADD' + i);
+      itemBlock.valueConnection_ = input && input.connection.targetConnection;
+      i++;
+      itemBlock = itemBlock.nextConnection && itemBlock.nextConnection.targetBlock();
+    }
+  },
+
+  /**
+   * Modify this block to have the correct number of inputs.
+   * @private
+   * @this Blockly.Block
+   */
+  updateShape_: function updateShape_() {
+    if (this.itemCount_ && this.getInput('EMPTY')) {
+      this.removeInput('EMPTY');
+    } else if (!this.itemCount_ && !this.getInput('EMPTY')) {
+      this.appendDummyInput('EMPTY').appendField('()');
+    } // Add new inputs.
+
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      if (!this.getInput('ADD' + i)) {
+        var input = this.appendValueInput('ADD' + i);
+
+        if (i === 0) {
+          input.appendField('(').setAlign(Blockly.ALIGN_RIGHT);
+        } else {
+          input.appendField(',').setAlign(Blockly.ALIGN_RIGHT);
         }
+      }
+    } // Remove deleted inputs.
+
+
+    while (this.getInput('ADD' + i)) {
+      this.removeInput('ADD' + i);
+      i++;
+    } // Add the trailing "]"
+
+
+    if (this.getInput('TAIL')) {
+      this.removeInput('TAIL');
     }
-};
 
-Blockly.Blocks['ast_Tuple_create_with_container'] = {
-    /**
-     * Mutator block for tuple container.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.setColour(BlockMirrorTextToBlocks.COLOR.TUPLE);
-        this.appendDummyInput()
-            .appendField('Add new tuple elements below');
-        this.appendStatementInput('STACK');
-        this.contextMenu = false;
+    if (this.itemCount_) {
+      var tail = this.appendDummyInput('TAIL');
+
+      if (this.itemCount_ === 1) {
+        tail.appendField(',)');
+      } else {
+        tail.appendField(')');
+      }
+
+      tail.setAlign(Blockly.ALIGN_RIGHT);
     }
+  }
+};
+Blockly.Blocks['ast_Tuple_create_with_container'] = {
+  /**
+   * Mutator block for tuple container.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.setColour(BlockMirrorTextToBlocks.COLOR.TUPLE);
+    this.appendDummyInput().appendField('Add new tuple elements below');
+    this.appendStatementInput('STACK');
+    this.contextMenu = false;
+  }
 };
-
 Blockly.Blocks['ast_Tuple_create_with_item'] = {
-    /**
-     * Mutator block for adding items.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.setColour(BlockMirrorTextToBlocks.COLOR.TUPLE);
-        this.appendDummyInput()
-            .appendField('Element');
-        this.setPreviousStatement(true);
-        this.setNextStatement(true);
-        this.contextMenu = false;
-    }
+  /**
+   * Mutator block for adding items.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.setColour(BlockMirrorTextToBlocks.COLOR.TUPLE);
+    this.appendDummyInput().appendField('Element');
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+    this.contextMenu = false;
+  }
 };
 
 Blockly.Python['ast_Tuple'] = function (block) {
-    // Create a tuple with any number of elements of any type.
-    var elements = new Array(block.itemCount_);
-    for (var i = 0; i < block.itemCount_; i++) {
-        elements[i] = Blockly.Python.valueToCode(block, 'ADD' + i,
-            Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-    }
-    let requiredComma = "";
-    if (block.itemCount_ == 1) {
-        requiredComma = ", ";
-    }
-    var code = '(' + elements.join(', ') + requiredComma+')';
-    return [code, Blockly.Python.ORDER_ATOMIC];
+  // Create a tuple with any number of elements of any type.
+  var elements = new Array(block.itemCount_);
+
+  for (var i = 0; i < block.itemCount_; i++) {
+    elements[i] = Blockly.Python.valueToCode(block, 'ADD' + i, Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  }
+
+  var requiredComma = "";
+
+  if (block.itemCount_ == 1) {
+    requiredComma = ", ";
+  }
+
+  var code = '(' + elements.join(', ') + requiredComma + ')';
+  return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Tuple'] = function (node, parent) {
-    var elts = node.elts;
-    var ctx = node.ctx;
-
-    return BlockMirrorTextToBlocks.create_block("ast_Tuple", node.lineno, {},
-        this.convertElements("ADD", elts, node),
-        {
-            "inline": elts.length > 4 ? "false" : "true",
-        }, {
-            "@items": elts.length
-        });
-}
+  var elts = node.elts;
+  var ctx = node.ctx;
+  return BlockMirrorTextToBlocks.create_block("ast_Tuple", node.lineno, {}, this.convertElements("ADD", elts, node), {
+    "inline": elts.length > 4 ? "false" : "true"
+  }, {
+    "@items": elts.length
+  });
+};
 
 Blockly.Blocks['ast_Set'] = {
-    /**
-     * Block for creating a set with any number of elements of any type.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.setColour(BlockMirrorTextToBlocks.COLOR.SET);
-        this.itemCount_ = 3;
-        this.updateShape_();
-        this.setOutput(true, 'Set');
-        this.setMutator(new Blockly.Mutator(['ast_Set_create_with_item']));
-    },
-    /**
-     * Create XML to represent set inputs.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        var container = document.createElement('mutation');
-        container.setAttribute('items', this.itemCount_);
-        return container;
-    },
-    /**
-     * Parse XML to restore the set inputs.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
-        this.updateShape_();
-    },
-    /**
-     * Populate the mutator's dialog with this block's components.
-     * @param {!Blockly.Workspace} workspace Mutator's workspace.
-     * @return {!Blockly.Block} Root block in mutator.
-     * @this Blockly.Block
-     */
-    decompose: function (workspace) {
-        var containerBlock = workspace.newBlock('ast_Set_create_with_container');
-        containerBlock.initSvg();
-        var connection = containerBlock.getInput('STACK').connection;
-        for (var i = 0; i < this.itemCount_; i++) {
-            var itemBlock = workspace.newBlock('ast_Set_create_with_item');
-            itemBlock.initSvg();
-            connection.connect(itemBlock.previousConnection);
-            connection = itemBlock.nextConnection;
-        }
-        return containerBlock;
-    },
-    /**
-     * Reconfigure this block based on the mutator dialog's components.
-     * @param {!Blockly.Block} containerBlock Root block in mutator.
-     * @this Blockly.Block
-     */
-    compose: function (containerBlock) {
-        var itemBlock = containerBlock.getInputTargetBlock('STACK');
-        // Count number of inputs.
-        var connections = [];
-        while (itemBlock) {
-            connections.push(itemBlock.valueConnection_);
-            itemBlock = itemBlock.nextConnection &&
-                itemBlock.nextConnection.targetBlock();
+  /**
+   * Block for creating a set with any number of elements of any type.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.setColour(BlockMirrorTextToBlocks.COLOR.SET);
+    this.itemCount_ = 3;
+    this.updateShape_();
+    this.setOutput(true, 'Set');
+    this.setMutator(new Blockly.Mutator(['ast_Set_create_with_item']));
+  },
+
+  /**
+   * Create XML to represent set inputs.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('items', this.itemCount_);
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the set inputs.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
+    this.updateShape_();
+  },
+
+  /**
+   * Populate the mutator's dialog with this block's components.
+   * @param {!Blockly.Workspace} workspace Mutator's workspace.
+   * @return {!Blockly.Block} Root block in mutator.
+   * @this Blockly.Block
+   */
+  decompose: function decompose(workspace) {
+    var containerBlock = workspace.newBlock('ast_Set_create_with_container');
+    containerBlock.initSvg();
+    var connection = containerBlock.getInput('STACK').connection;
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      var itemBlock = workspace.newBlock('ast_Set_create_with_item');
+      itemBlock.initSvg();
+      connection.connect(itemBlock.previousConnection);
+      connection = itemBlock.nextConnection;
+    }
+
+    return containerBlock;
+  },
+
+  /**
+   * Reconfigure this block based on the mutator dialog's components.
+   * @param {!Blockly.Block} containerBlock Root block in mutator.
+   * @this Blockly.Block
+   */
+  compose: function compose(containerBlock) {
+    var itemBlock = containerBlock.getInputTargetBlock('STACK'); // Count number of inputs.
+
+    var connections = [];
+
+    while (itemBlock) {
+      connections.push(itemBlock.valueConnection_);
+      itemBlock = itemBlock.nextConnection && itemBlock.nextConnection.targetBlock();
+    } // Disconnect any children that don't belong.
+
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      var connection = this.getInput('ADD' + i).connection.targetConnection;
+
+      if (connection && connections.indexOf(connection) == -1) {
+        connection.disconnect();
+      }
+    }
+
+    this.itemCount_ = connections.length;
+    this.updateShape_(); // Reconnect any child blocks.
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      Blockly.Mutator.reconnect(connections[i], this, 'ADD' + i);
+    }
+  },
+
+  /**
+   * Store pointers to any connected child blocks.
+   * @param {!Blockly.Block} containerBlock Root block in mutator.
+   * @this Blockly.Block
+   */
+  saveConnections: function saveConnections(containerBlock) {
+    var itemBlock = containerBlock.getInputTargetBlock('STACK');
+    var i = 0;
+
+    while (itemBlock) {
+      var input = this.getInput('ADD' + i);
+      itemBlock.valueConnection_ = input && input.connection.targetConnection;
+      i++;
+      itemBlock = itemBlock.nextConnection && itemBlock.nextConnection.targetBlock();
+    }
+  },
+
+  /**
+   * Modify this block to have the correct number of inputs.
+   * @private
+   * @this Blockly.Block
+   */
+  updateShape_: function updateShape_() {
+    if (this.itemCount_ && this.getInput('EMPTY')) {
+      this.removeInput('EMPTY');
+    } else if (!this.itemCount_ && !this.getInput('EMPTY')) {
+      this.appendDummyInput('EMPTY').appendField('create empty set');
+    } // Add new inputs.
+
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      if (!this.getInput('ADD' + i)) {
+        var input = this.appendValueInput('ADD' + i);
+
+        if (i === 0) {
+          input.appendField('create set with {').setAlign(Blockly.ALIGN_RIGHT);
+        } else {
+          input.appendField(',').setAlign(Blockly.ALIGN_RIGHT);
         }
-        // Disconnect any children that don't belong.
-        for (var i = 0; i < this.itemCount_; i++) {
-            var connection = this.getInput('ADD' + i).connection.targetConnection;
-            if (connection && connections.indexOf(connection) == -1) {
-                connection.disconnect();
-            }
-        }
-        this.itemCount_ = connections.length;
-        this.updateShape_();
-        // Reconnect any child blocks.
-        for (var i = 0; i < this.itemCount_; i++) {
-            Blockly.Mutator.reconnect(connections[i], this, 'ADD' + i);
-        }
-    },
-    /**
-     * Store pointers to any connected child blocks.
-     * @param {!Blockly.Block} containerBlock Root block in mutator.
-     * @this Blockly.Block
-     */
-    saveConnections: function (containerBlock) {
-        var itemBlock = containerBlock.getInputTargetBlock('STACK');
-        var i = 0;
-        while (itemBlock) {
-            var input = this.getInput('ADD' + i);
-            itemBlock.valueConnection_ = input && input.connection.targetConnection;
-            i++;
-            itemBlock = itemBlock.nextConnection &&
-                itemBlock.nextConnection.targetBlock();
-        }
-    },
-    /**
-     * Modify this block to have the correct number of inputs.
-     * @private
-     * @this Blockly.Block
-     */
-    updateShape_: function () {
-        if (this.itemCount_ && this.getInput('EMPTY')) {
-            this.removeInput('EMPTY');
-        } else if (!this.itemCount_ && !this.getInput('EMPTY')) {
-            this.appendDummyInput('EMPTY')
-                .appendField('create empty set');
-        }
-        // Add new inputs.
-        for (var i = 0; i < this.itemCount_; i++) {
-            if (!this.getInput('ADD' + i)) {
-                var input = this.appendValueInput('ADD' + i);
-                if (i === 0) {
-                    input.appendField('create set with {').setAlign(Blockly.ALIGN_RIGHT);
-                } else {
-                    input.appendField(',').setAlign(Blockly.ALIGN_RIGHT);
-                }
-            }
-        }
-        // Remove deleted inputs.
-        while (this.getInput('ADD' + i)) {
-            this.removeInput('ADD' + i);
-            i++;
-        }
-        // Add the trailing "]"
-        if (this.getInput('TAIL')) {
-            this.removeInput('TAIL');
-        }
-        if (this.itemCount_) {
-            this.appendDummyInput('TAIL').appendField('}').setAlign(Blockly.ALIGN_RIGHT);
+      }
+    } // Remove deleted inputs.
 
-        }
+
+    while (this.getInput('ADD' + i)) {
+      this.removeInput('ADD' + i);
+      i++;
+    } // Add the trailing "]"
+
+
+    if (this.getInput('TAIL')) {
+      this.removeInput('TAIL');
     }
-};
 
-Blockly.Blocks['ast_Set_create_with_container'] = {
-    /**
-     * Mutator block for set container.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.setColour(BlockMirrorTextToBlocks.COLOR.SET);
-        this.appendDummyInput()
-            .appendField('Add new set elements below');
-        this.appendStatementInput('STACK');
-        this.contextMenu = false;
+    if (this.itemCount_) {
+      this.appendDummyInput('TAIL').appendField('}').setAlign(Blockly.ALIGN_RIGHT);
     }
+  }
+};
+Blockly.Blocks['ast_Set_create_with_container'] = {
+  /**
+   * Mutator block for set container.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.setColour(BlockMirrorTextToBlocks.COLOR.SET);
+    this.appendDummyInput().appendField('Add new set elements below');
+    this.appendStatementInput('STACK');
+    this.contextMenu = false;
+  }
 };
-
 Blockly.Blocks['ast_Set_create_with_item'] = {
-    /**
-     * Mutator block for adding items.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.setColour(BlockMirrorTextToBlocks.COLOR.SET);
-        this.appendDummyInput()
-            .appendField('Element');
-        this.setPreviousStatement(true);
-        this.setNextStatement(true);
-        this.contextMenu = false;
-    }
+  /**
+   * Mutator block for adding items.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.setColour(BlockMirrorTextToBlocks.COLOR.SET);
+    this.appendDummyInput().appendField('Element');
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+    this.contextMenu = false;
+  }
 };
 
 Blockly.Python['ast_Set'] = function (block) {
-    // Create a set with any number of elements of any type.
-    if (block.itemCount_ === 0) {
-        return ['set()', Blockly.Python.ORDER_FUNCTION_CALL];
-    }
-    var elements = new Array(block.itemCount_);
-    for (var i = 0; i < block.itemCount_; i++) {
-        elements[i] = Blockly.Python.valueToCode(block, 'ADD' + i,
-            Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-    }
-    var code = '{' + elements.join(', ') + '}';
-    return [code, Blockly.Python.ORDER_ATOMIC];
+  // Create a set with any number of elements of any type.
+  if (block.itemCount_ === 0) {
+    return ['set()', Blockly.Python.ORDER_FUNCTION_CALL];
+  }
+
+  var elements = new Array(block.itemCount_);
+
+  for (var i = 0; i < block.itemCount_; i++) {
+    elements[i] = Blockly.Python.valueToCode(block, 'ADD' + i, Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  }
+
+  var code = '{' + elements.join(', ') + '}';
+  return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Set'] = function (node, parent) {
-    var elts = node.elts;
-
-    return BlockMirrorTextToBlocks.create_block("ast_Set", node.lineno, {},
-        this.convertElements("ADD", elts, node),
-        {
-            "inline": elts.length > 3 ? "false" : "true",
-        }, {
-            "@items": elts.length
-        });
-}
+  var elts = node.elts;
+  return BlockMirrorTextToBlocks.create_block("ast_Set", node.lineno, {}, this.convertElements("ADD", elts, node), {
+    "inline": elts.length > 3 ? "false" : "true"
+  }, {
+    "@items": elts.length
+  });
+};
 
 Blockly.Blocks['ast_DictItem'] = {
-    init: function () {
-        this.appendValueInput("KEY")
-            .setCheck(null);
-        this.appendValueInput("VALUE")
-            .setCheck(null)
-            .appendField(":");
-        this.setInputsInline(true);
-        this.setOutput(true, "DictPair");
-        this.setColour(BlockMirrorTextToBlocks.COLOR.DICTIONARY);
-    }
+  init: function init() {
+    this.appendValueInput("KEY").setCheck(null);
+    this.appendValueInput("VALUE").setCheck(null).appendField(":");
+    this.setInputsInline(true);
+    this.setOutput(true, "DictPair");
+    this.setColour(BlockMirrorTextToBlocks.COLOR.DICTIONARY);
+  }
 };
-
 Blockly.Blocks['ast_Dict'] = {
-    /**
-     * Block for creating a dict with any number of elements of any type.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.setColour(BlockMirrorTextToBlocks.COLOR.DICTIONARY);
-        this.itemCount_ = 3;
-        this.updateShape_();
-        this.setOutput(true, 'Dict');
-        this.setMutator(new Blockly.Mutator(['ast_Dict_create_with_item']));
-    },
-    /**
-     * Create XML to represent dict inputs.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        var container = document.createElement('mutation');
-        container.setAttribute('items', this.itemCount_);
-        return container;
-    },
-    /**
-     * Parse XML to restore the dict inputs.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
-        this.updateShape_();
-    },
-    /**
-     * Populate the mutator's dialog with this block's components.
-     * @param {!Blockly.Workspace} workspace Mutator's workspace.
-     * @return {!Blockly.Block} Root block in mutator.
-     * @this Blockly.Block
-     */
-    decompose: function (workspace) {
-        var containerBlock = workspace.newBlock('ast_Dict_create_with_container');
-        containerBlock.initSvg();
-        var connection = containerBlock.getInput('STACK').connection;
-        for (var i = 0; i < this.itemCount_; i++) {
-            var itemBlock = workspace.newBlock('ast_Dict_create_with_item');
-            itemBlock.initSvg();
-            connection.connect(itemBlock.previousConnection);
-            connection = itemBlock.nextConnection;
-        }
-        return containerBlock;
-    },
-    /**
-     * Reconfigure this block based on the mutator dialog's components.
-     * @param {!Blockly.Block} containerBlock Root block in mutator.
-     * @this Blockly.Block
-     */
-    compose: function (containerBlock) {
-        var itemBlock = containerBlock.getInputTargetBlock('STACK');
-        // Count number of inputs.
-        var connections = [];
-        while (itemBlock) {
-            connections.push(itemBlock.valueConnection_);
-            itemBlock = itemBlock.nextConnection &&
-                itemBlock.nextConnection.targetBlock();
-        }
-        // Disconnect any children that don't belong.
-        for (var i = 0; i < this.itemCount_; i++) {
-            var connection = this.getInput('ADD' + i).connection.targetConnection;
-            if (connection && connections.indexOf(connection) == -1) {
-                let key = connection.getSourceBlock().getInput("KEY");
-                if (key.connection.targetConnection) {
-                    key.connection.targetConnection.getSourceBlock().unplug(true);
-                }
-                let value = connection.getSourceBlock().getInput("VALUE");
-                if (value.connection.targetConnection) {
-                    value.connection.targetConnection.getSourceBlock().unplug(true);
-                }
-                connection.disconnect();
-                connection.getSourceBlock().dispose();
-            }
-        }
-        this.itemCount_ = connections.length;
-        this.updateShape_();
-        // Reconnect any child blocks.
-        for (var i = 0; i < this.itemCount_; i++) {
-            Blockly.Mutator.reconnect(connections[i], this, 'ADD' + i);
-            if (!connections[i]) {
-                let itemBlock = this.workspace.newBlock('ast_DictItem');
-                itemBlock.setDeletable(false);
-                itemBlock.setMovable(false);
-                itemBlock.initSvg();
-                this.getInput('ADD'+i).connection.connect(itemBlock.outputConnection);
-                itemBlock.render();
-                //this.get(itemBlock, 'ADD'+i)
-            }
-        }
-    },
-    /**
-     * Store pointers to any connected child blocks.
-     * @param {!Blockly.Block} containerBlock Root block in mutator.
-     * @this Blockly.Block
-     */
-    saveConnections: function (containerBlock) {
-        var itemBlock = containerBlock.getInputTargetBlock('STACK');
-        var i = 0;
-        while (itemBlock) {
-            var input = this.getInput('ADD' + i);
-            itemBlock.valueConnection_ = input && input.connection.targetConnection;
-            i++;
-            itemBlock = itemBlock.nextConnection &&
-                itemBlock.nextConnection.targetBlock();
-        }
-    },
-    /**
-     * Modify this block to have the correct number of inputs.
-     * @private
-     * @this Blockly.Block
-     */
-    updateShape_: function () {
-        if (this.itemCount_ && this.getInput('EMPTY')) {
-            this.removeInput('EMPTY');
-        } else if (!this.itemCount_ && !this.getInput('EMPTY')) {
-            this.appendDummyInput('EMPTY')
-                .appendField('empty dictionary');
-        }
-        // Add new inputs.
-        for (var i = 0; i < this.itemCount_; i++) {
-            if (!this.getInput('ADD' + i)) {
-                var input = this.appendValueInput('ADD' + i)
-                    .setCheck('DictPair');
-                if (i === 0) {
-                    input.appendField('create dict with').setAlign(Blockly.ALIGN_RIGHT);
-                }
-            }
+  /**
+   * Block for creating a dict with any number of elements of any type.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.setColour(BlockMirrorTextToBlocks.COLOR.DICTIONARY);
+    this.itemCount_ = 3;
+    this.updateShape_();
+    this.setOutput(true, 'Dict');
+    this.setMutator(new Blockly.Mutator(['ast_Dict_create_with_item']));
+  },
+
+  /**
+   * Create XML to represent dict inputs.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('items', this.itemCount_);
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the dict inputs.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
+    this.updateShape_();
+  },
+
+  /**
+   * Populate the mutator's dialog with this block's components.
+   * @param {!Blockly.Workspace} workspace Mutator's workspace.
+   * @return {!Blockly.Block} Root block in mutator.
+   * @this Blockly.Block
+   */
+  decompose: function decompose(workspace) {
+    var containerBlock = workspace.newBlock('ast_Dict_create_with_container');
+    containerBlock.initSvg();
+    var connection = containerBlock.getInput('STACK').connection;
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      var itemBlock = workspace.newBlock('ast_Dict_create_with_item');
+      itemBlock.initSvg();
+      connection.connect(itemBlock.previousConnection);
+      connection = itemBlock.nextConnection;
+    }
+
+    return containerBlock;
+  },
+
+  /**
+   * Reconfigure this block based on the mutator dialog's components.
+   * @param {!Blockly.Block} containerBlock Root block in mutator.
+   * @this Blockly.Block
+   */
+  compose: function compose(containerBlock) {
+    var itemBlock = containerBlock.getInputTargetBlock('STACK'); // Count number of inputs.
+
+    var connections = [];
+
+    while (itemBlock) {
+      connections.push(itemBlock.valueConnection_);
+      itemBlock = itemBlock.nextConnection && itemBlock.nextConnection.targetBlock();
+    } // Disconnect any children that don't belong.
+
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      var connection = this.getInput('ADD' + i).connection.targetConnection;
+
+      if (connection && connections.indexOf(connection) == -1) {
+        var key = connection.getSourceBlock().getInput("KEY");
+
+        if (key.connection.targetConnection) {
+          key.connection.targetConnection.getSourceBlock().unplug(true);
         }
-        // Remove deleted inputs.
-        while (this.getInput('ADD' + i)) {
-            this.removeInput('ADD' + i);
-            i++;
+
+        var value = connection.getSourceBlock().getInput("VALUE");
+
+        if (value.connection.targetConnection) {
+          value.connection.targetConnection.getSourceBlock().unplug(true);
         }
-        // Add the trailing "}"
-        /*
-        if (this.getInput('TAIL')) {
-            this.removeInput('TAIL');
+
+        connection.disconnect();
+        connection.getSourceBlock().dispose();
+      }
+    }
+
+    this.itemCount_ = connections.length;
+    this.updateShape_(); // Reconnect any child blocks.
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      Blockly.Mutator.reconnect(connections[i], this, 'ADD' + i);
+
+      if (!connections[i]) {
+        var _itemBlock = this.workspace.newBlock('ast_DictItem');
+
+        _itemBlock.setDeletable(false);
+
+        _itemBlock.setMovable(false);
+
+        _itemBlock.initSvg();
+
+        this.getInput('ADD' + i).connection.connect(_itemBlock.outputConnection);
+
+        _itemBlock.render(); //this.get(itemBlock, 'ADD'+i)
+
+      }
+    }
+  },
+
+  /**
+   * Store pointers to any connected child blocks.
+   * @param {!Blockly.Block} containerBlock Root block in mutator.
+   * @this Blockly.Block
+   */
+  saveConnections: function saveConnections(containerBlock) {
+    var itemBlock = containerBlock.getInputTargetBlock('STACK');
+    var i = 0;
+
+    while (itemBlock) {
+      var input = this.getInput('ADD' + i);
+      itemBlock.valueConnection_ = input && input.connection.targetConnection;
+      i++;
+      itemBlock = itemBlock.nextConnection && itemBlock.nextConnection.targetBlock();
+    }
+  },
+
+  /**
+   * Modify this block to have the correct number of inputs.
+   * @private
+   * @this Blockly.Block
+   */
+  updateShape_: function updateShape_() {
+    if (this.itemCount_ && this.getInput('EMPTY')) {
+      this.removeInput('EMPTY');
+    } else if (!this.itemCount_ && !this.getInput('EMPTY')) {
+      this.appendDummyInput('EMPTY').appendField('empty dictionary');
+    } // Add new inputs.
+
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      if (!this.getInput('ADD' + i)) {
+        var input = this.appendValueInput('ADD' + i).setCheck('DictPair');
+
+        if (i === 0) {
+          input.appendField('create dict with').setAlign(Blockly.ALIGN_RIGHT);
         }
-        if (this.itemCount_) {
-            let tail = this.appendDummyInput('TAIL')
-                .appendField('}');
-            tail.setAlign(Blockly.ALIGN_RIGHT);
-        }*/
+      }
+    } // Remove deleted inputs.
+
+
+    while (this.getInput('ADD' + i)) {
+      this.removeInput('ADD' + i);
+      i++;
+    } // Add the trailing "}"
+
+    /*
+    if (this.getInput('TAIL')) {
+        this.removeInput('TAIL');
     }
-};
+    if (this.itemCount_) {
+        let tail = this.appendDummyInput('TAIL')
+            .appendField('}');
+        tail.setAlign(Blockly.ALIGN_RIGHT);
+    }*/
 
+  }
+};
 Blockly.Blocks['ast_Dict_create_with_container'] = {
-    /**
-     * Mutator block for dict container.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.setColour(BlockMirrorTextToBlocks.COLOR.DICTIONARY);
-        this.appendDummyInput()
-            .appendField('Add new dict elements below');
-        this.appendStatementInput('STACK');
-        this.contextMenu = false;
-    }
+  /**
+   * Mutator block for dict container.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.setColour(BlockMirrorTextToBlocks.COLOR.DICTIONARY);
+    this.appendDummyInput().appendField('Add new dict elements below');
+    this.appendStatementInput('STACK');
+    this.contextMenu = false;
+  }
 };
-
 Blockly.Blocks['ast_Dict_create_with_item'] = {
-    /**
-     * Mutator block for adding items.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.setColour(BlockMirrorTextToBlocks.COLOR.DICTIONARY);
-        this.appendDummyInput()
-            .appendField('Element');
-        this.setPreviousStatement(true);
-        this.setNextStatement(true);
-        this.contextMenu = false;
-    }
+  /**
+   * Mutator block for adding items.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.setColour(BlockMirrorTextToBlocks.COLOR.DICTIONARY);
+    this.appendDummyInput().appendField('Element');
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+    this.contextMenu = false;
+  }
 };
 
 Blockly.Python['ast_Dict'] = function (block) {
-    // Create a dict with any number of elements of any type.
-    var elements = new Array(block.itemCount_);
-    for (var i = 0; i < block.itemCount_; i++) {
-        let child = block.getInputTargetBlock('ADD' + i);
-        if (child === null || child.type != 'ast_DictItem') {
-            elements[i] = (Blockly.Python.blank + ": "+ Blockly.Python.blank);
-            continue;
-        }
-        let key = Blockly.Python.valueToCode(child, 'KEY', Blockly.Python.ORDER_NONE) ||
-            Blockly.Python.blank;
-        let value = Blockly.Python.valueToCode(child, 'VALUE', Blockly.Python.ORDER_NONE) ||
-            Blockly.Python.blank;
-        elements[i] = (key+ ": "+value);
+  // Create a dict with any number of elements of any type.
+  var elements = new Array(block.itemCount_);
+
+  for (var i = 0; i < block.itemCount_; i++) {
+    var child = block.getInputTargetBlock('ADD' + i);
+
+    if (child === null || child.type != 'ast_DictItem') {
+      elements[i] = Blockly.Python.blank + ": " + Blockly.Python.blank;
+      continue;
     }
-    var code = '{' + elements.join(', ') + '}';
-    return [code, Blockly.Python.ORDER_ATOMIC];
+
+    var key = Blockly.Python.valueToCode(child, 'KEY', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+    var value = Blockly.Python.valueToCode(child, 'VALUE', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+    elements[i] = key + ": " + value;
+  }
+
+  var code = '{' + elements.join(', ') + '}';
+  return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Dict'] = function (node, parent) {
-    let keys = node.keys;
-    let values = node.values;
-
-    if (keys === null) {
-        return BlockMirrorTextToBlocks.create_block("ast_Dict", node.lineno, {},
-            {}, {"inline": "false"}, {"@items": 0});
-    }
-
-    let elements = {};
-    for (let i = 0; i < keys.length; i++) {
-        let key = keys[i];
-        let value = values[i];
-        elements["ADD" + i] = BlockMirrorTextToBlocks.create_block("ast_DictItem", node.lineno, {},
-            {
-                "KEY": this.convert(key, node),
-                "VALUE": this.convert(value, node)
-            },
-            this.LOCKED_BLOCK);
-    }
-
-    return BlockMirrorTextToBlocks.create_block("ast_Dict", node.lineno, {},
-        elements,
-        {
-            "inline": "false"
-        }, {
-            "@items": keys.length
-        });
-}
+  var keys = node.keys;
+  var values = node.values;
+
+  if (keys === null) {
+    return BlockMirrorTextToBlocks.create_block("ast_Dict", node.lineno, {}, {}, {
+      "inline": "false"
+    }, {
+      "@items": 0
+    });
+  }
+
+  var elements = {};
+
+  for (var i = 0; i < keys.length; i++) {
+    var key = keys[i];
+    var value = values[i];
+    elements["ADD" + i] = BlockMirrorTextToBlocks.create_block("ast_DictItem", node.lineno, {}, {
+      "KEY": this.convert(key, node),
+      "VALUE": this.convert(value, node)
+    }, this.LOCKED_BLOCK);
+  }
+
+  return BlockMirrorTextToBlocks.create_block("ast_Dict", node.lineno, {}, elements, {
+    "inline": "false"
+  }, {
+    "@items": keys.length
+  });
+};
 
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": 'ast_Starred',
-    "message0": "*%1",
-    "args0": [
-        {"type": "input_value", "name": "VALUE"}
-    ],
-    "inputsInline": false,
-    "output": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.VARIABLES
+  "type": 'ast_Starred',
+  "message0": "*%1",
+  "args0": [{
+    "type": "input_value",
+    "name": "VALUE"
+  }],
+  "inputsInline": false,
+  "output": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.VARIABLES
 });
 
 Blockly.Python['ast_Starred'] = function (block) {
-    // Basic arithmetic operators, and power.
-    var order = Blockly.Python.ORDER_NONE;
-    var argument1 = Blockly.Python.valueToCode(block, 'VALUE', order) || Blockly.Python.blank;
-    var code = "*" + argument1;
-    return [code, order];
+  // Basic arithmetic operators, and power.
+  var order = Blockly.Python.ORDER_NONE;
+  var argument1 = Blockly.Python.valueToCode(block, 'VALUE', order) || Blockly.Python.blank;
+  var code = "*" + argument1;
+  return [code, order];
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Starred'] = function (node, parent) {
-    let value = node.value;
-    let ctx = node.ctx;
+  var value = node.value;
+  var ctx = node.ctx;
+  return BlockMirrorTextToBlocks.create_block('ast_Starred', node.lineno, {}, {
+    "VALUE": this.convert(value, node)
+  }, {
+    "inline": true
+  });
+};
 
-    return BlockMirrorTextToBlocks.create_block('ast_Starred', node.lineno, {}, {
-        "VALUE": this.convert(value, node)
-    }, {
-        "inline": true
-    });
-}
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_IfExp",
-    "message0": "%1 if %2 else %3",
-    "args0": [
-        {"type": "input_value", "name": "BODY"},
-        {"type": "input_value", "name": "TEST"},
-        {"type": "input_value", "name": "ORELSE"}
-    ],
-    "inputsInline": true,
-    "output": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
+  "type": "ast_IfExp",
+  "message0": "%1 if %2 else %3",
+  "args0": [{
+    "type": "input_value",
+    "name": "BODY"
+  }, {
+    "type": "input_value",
+    "name": "TEST"
+  }, {
+    "type": "input_value",
+    "name": "ORELSE"
+  }],
+  "inputsInline": true,
+  "output": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
 });
 
 Blockly.Python['ast_IfExp'] = function (block) {
-    var test = Blockly.Python.valueToCode(block, 'TEST', Blockly.Python.ORDER_CONDITIONAL) || Blockly.Python.blank;
-    var body = Blockly.Python.valueToCode(block, 'BODY', Blockly.Python.ORDER_CONDITIONAL) || Blockly.Python.blank;
-    var orelse = Blockly.Python.valueToCode(block, 'ORELSE', Blockly.Python.ORDER_CONDITIONAL) || Blockly.Python.blank;
-    return [body + " if " + test + " else " + orelse + "\n", Blockly.Python.ORDER_CONDITIONAL];
+  var test = Blockly.Python.valueToCode(block, 'TEST', Blockly.Python.ORDER_CONDITIONAL) || Blockly.Python.blank;
+  var body = Blockly.Python.valueToCode(block, 'BODY', Blockly.Python.ORDER_CONDITIONAL) || Blockly.Python.blank;
+  var orelse = Blockly.Python.valueToCode(block, 'ORELSE', Blockly.Python.ORDER_CONDITIONAL) || Blockly.Python.blank;
+  return [body + " if " + test + " else " + orelse + "\n", Blockly.Python.ORDER_CONDITIONAL];
 };
 
 BlockMirrorTextToBlocks.prototype['ast_IfExp'] = function (node, parent) {
-    let test = node.test;
-    let body = node.body;
-    let orelse = node.orelse;
-
-    return BlockMirrorTextToBlocks.create_block("ast_IfExp", node.lineno, {}, {
-        "TEST": this.convert(test, node),
-        "BODY": this.convert(body, node),
-        "ORELSE": this.convert(orelse, node)
-    });
+  var test = node.test;
+  var body = node.body;
+  var orelse = node.orelse;
+  return BlockMirrorTextToBlocks.create_block("ast_IfExp", node.lineno, {}, {
+    "TEST": this.convert(test, node),
+    "BODY": this.convert(body, node),
+    "ORELSE": this.convert(orelse, node)
+  });
 };
+
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_AttributeFull",
-    "lastDummyAlign0": "RIGHT",
-    "message0": "%1 . %2",
-    "args0": [
-        {"type": "input_value", "name": "VALUE"},
-        {"type": "field_input", "name": "ATTR", "text": "default"}
-    ],
-    "inputsInline": true,
-    "output": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.OO,
+  "type": "ast_AttributeFull",
+  "lastDummyAlign0": "RIGHT",
+  "message0": "%1 . %2",
+  "args0": [{
+    "type": "input_value",
+    "name": "VALUE"
+  }, {
+    "type": "field_input",
+    "name": "ATTR",
+    "text": "default"
+  }],
+  "inputsInline": true,
+  "output": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.OO
 });
-
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_Attribute",
-    "message0": "%1 . %2",
-    "args0": [
-        {"type": "field_variable", "name": "VALUE", "variable": "variable"},
-        {"type": "field_input", "name": "ATTR", "text": "attribute"}
-    ],
-    "inputsInline": true,
-    "output": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.OO,
+  "type": "ast_Attribute",
+  "message0": "%1 . %2",
+  "args0": [{
+    "type": "field_variable",
+    "name": "VALUE",
+    "variable": "variable"
+  }, {
+    "type": "field_input",
+    "name": "ATTR",
+    "text": "attribute"
+  }],
+  "inputsInline": true,
+  "output": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.OO
 });
 
 Blockly.Python['ast_Attribute'] = function (block) {
-    // Text value.
-    var value = Blockly.Python.variableDB_.getName(block.getFieldValue('VALUE'),
-        Blockly.Variables.NAME_TYPE);
-    var attr = block.getFieldValue('ATTR');
-    let code = value + "." + attr;
-    return [code, Blockly.Python.ORDER_MEMBER];
+  // Text value.
+  var value = Blockly.Python.variableDB_.getName(block.getFieldValue('VALUE'), Blockly.Variables.NAME_TYPE);
+  var attr = block.getFieldValue('ATTR');
+  var code = value + "." + attr;
+  return [code, Blockly.Python.ORDER_MEMBER];
 };
 
 Blockly.Python['ast_AttributeFull'] = function (block) {
-    // Text value.
-    var value = Blockly.Python.valueToCode(block, 'VALUE', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-    var attr = block.getFieldValue('ATTR');
-    let code = value + "." + attr;
-    return [code, Blockly.Python.ORDER_MEMBER];
+  // Text value.
+  var value = Blockly.Python.valueToCode(block, 'VALUE', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  var attr = block.getFieldValue('ATTR');
+  var code = value + "." + attr;
+  return [code, Blockly.Python.ORDER_MEMBER];
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Attribute'] = function (node, parent) {
-    let value = node.value;
-    let attr = node.attr;
-
-    //if (value.constructor)
-    if (value._astname == "Name") {
-        return BlockMirrorTextToBlocks.create_block("ast_Attribute", node.lineno, {
-            "VALUE": Sk.ffi.remapToJs(value.id),
-            "ATTR": Sk.ffi.remapToJs(attr)
-        },);
-    } else {
-        return BlockMirrorTextToBlocks.create_block("ast_AttributeFull", node.lineno, {
-            "ATTR": Sk.ffi.remapToJs(attr)
-        }, {
-            "VALUE": this.convert(value, node)
-        });
-    }
-}
+  var value = node.value;
+  var attr = node.attr; //if (value.constructor)
 
-// TODO: Support stuff like "append" where the message is after the value input
+  if (value._astname == "Name") {
+    return BlockMirrorTextToBlocks.create_block("ast_Attribute", node.lineno, {
+      "VALUE": Sk.ffi.remapToJs(value.id),
+      "ATTR": Sk.ffi.remapToJs(attr)
+    });
+  } else {
+    return BlockMirrorTextToBlocks.create_block("ast_AttributeFull", node.lineno, {
+      "ATTR": Sk.ffi.remapToJs(attr)
+    }, {
+      "VALUE": this.convert(value, node)
+    });
+  }
+}; // TODO: Support stuff like "append" where the message is after the value input
 // TODO: Handle updating function/method definition -> update call
 // TODO: Do a pretraversal to determine if a given function returns
 
-Blockly.Blocks['ast_Call'] = {
-    /**
-     * Block for calling a procedure with no return value.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.givenColour_ = BlockMirrorTextToBlocks.COLOR.FUNCTIONS
-        this.setInputsInline(true);
-        // Regular ('NAME') or Keyword (either '**' or '*NAME')
-        this.arguments_ = [];
-        this.argumentVarModels_ = [];
-        // acbart: Added count to keep track of unused parameters
-        this.argumentCount_ = 0;
-        this.quarkConnections_ = {};
-        this.quarkIds_ = null;
-        // acbart: Show parameter names, if they exist
-        this.showParameterNames_ = false;
-        // acbart: Whether this block returns
-        this.returns_ = true;
-        // acbart: added simpleName to handle complex function calls (e.g., chained)
-        this.isMethod_ = false;
-        this.name_ = null;
-        this.message_ = "function";
-        this.premessage_ = "";
-        this.updateShape_();
-    },
 
-    /**
-     * Returns the name of the procedure this block calls.
-     * @return {string} Procedure name.
-     * @this Blockly.Block
-     */
-    getProcedureCall: function () {
-        return this.name_;
-    },
-    /**
-     * Notification that a procedure is renaming.
-     * If the name matches this block's procedure, rename it.
-     * Also rename if it was previously null.
-     * @param {string} oldName Previous name of procedure.
-     * @param {string} newName Renamed procedure.
-     * @this Blockly.Block
-     */
-    renameProcedure: function (oldName, newName) {
-        if (this.name_ === null ||
-            Blockly.Names.equals(oldName, this.name_)) {
-            this.name_ = newName;
-            this.updateShape_();
-        }
-    },
-    /**
-     * Notification that the procedure's parameters have changed.
-     * @param {!Array.<string>} paramNames New param names, e.g. ['x', 'y', 'z'].
-     * @param {!Array.<string>} paramIds IDs of params (consistent for each
-     *     parameter through the life of a mutator, regardless of param renaming),
-     *     e.g. ['piua', 'f8b_', 'oi.o'].
-     * @private
-     * @this Blockly.Block
-     */
-    setProcedureParameters_: function (paramNames, paramIds) {
-        // Data structures:
-        // this.arguments = ['x', 'y']
-        //     Existing param names.
-        // this.quarkConnections_ {piua: null, f8b_: Blockly.Connection}
-        //     Look-up of paramIds to connections plugged into the call block.
-        // this.quarkIds_ = ['piua', 'f8b_']
-        //     Existing param IDs.
-        // Note that quarkConnections_ may include IDs that no longer exist, but
-        // which might reappear if a param is reattached in the mutator.
-        var defBlock = Blockly.Procedures.getDefinition(this.getProcedureCall(),
-            this.workspace);
-        var mutatorOpen = defBlock && defBlock.mutator &&
-            defBlock.mutator.isVisible();
-        if (!mutatorOpen) {
-            this.quarkConnections_ = {};
-            this.quarkIds_ = null;
-        }
-        if (!paramIds) {
-            // Reset the quarks (a mutator is about to open).
-            return false;
-        }
-        // Test arguments (arrays of strings) for changes. '\n' is not a valid
-        // argument name character, so it is a valid delimiter here.
-        if (paramNames.join('\n') == this.arguments_.join('\n')) {
-            // No change.
-            this.quarkIds_ = paramIds;
-            return false;
-        }
-        if (paramIds.length !== paramNames.length) {
-            throw RangeError('paramNames and paramIds must be the same length.');
-        }
-        this.setCollapsed(false);
-        if (!this.quarkIds_) {
-            // Initialize tracking for this block.
-            this.quarkConnections_ = {};
-            this.quarkIds_ = [];
-        }
-        // Switch off rendering while the block is rebuilt.
-        var savedRendered = this.rendered;
-        this.rendered = false;
-        // Update the quarkConnections_ with existing connections.
-        for (let i = 0; i < this.arguments_.length; i++) {
-            var input = this.getInput('ARG' + i);
-            if (input) {
-                let connection = input.connection.targetConnection;
-                this.quarkConnections_[this.quarkIds_[i]] = connection;
-                if (mutatorOpen && connection &&
-                    paramIds.indexOf(this.quarkIds_[i]) === -1) {
-                    // This connection should no longer be attached to this block.
-                    connection.disconnect();
-                    connection.getSourceBlock().bumpNeighbours_();
-                }
-            }
-        }
-        // Rebuild the block's arguments.
-        this.arguments_ = [].concat(paramNames);
-        this.argumentCount_ = this.arguments_.length;
-        // And rebuild the argument model list.
-        this.argumentVarModels_ = [];
-        /*
-        // acbart: Function calls don't create variables, what do they know?
-        for (let i = 0; i < this.arguments_.length; i++) {
-            let argumentName = this.arguments_[i];
-            var variable = Blockly.Variables.getVariable(
-                this.workspace, null, this.arguments_[i], '');
-            if (variable) {
-                this.argumentVarModels_.push(variable);
-            }
-        }*/
-
-        this.updateShape_();
-        this.quarkIds_ = paramIds;
-        // Reconnect any child blocks.
-        if (this.quarkIds_) {
-            for (let i = 0; i < this.arguments_.length; i++) {
-                var quarkId = this.quarkIds_[i];
-                if (quarkId in this.quarkConnections_) {
-                    let connection = this.quarkConnections_[quarkId];
-                    if (!Blockly.Mutator.reconnect(connection, this, 'ARG' + i)) {
-                        // Block no longer exists or has been attached elsewhere.
-                        delete this.quarkConnections_[quarkId];
-                    }
-                }
-            }
-        }
-        // Restore rendering and show the changes.
-        this.rendered = savedRendered;
-        if (this.rendered) {
-            this.render();
-        }
-        return true;
-    },
-    /**
-     * Modify this block to have the correct number of arguments.
-     * @private
-     * @this Blockly.Block
-     */
-    updateShape_: function () {
-        // If it's a method, add in the caller
-        if (this.isMethod_ && !this.getInput('FUNC')) {
-            let func = this.appendValueInput('FUNC');
-            // If there's a premessage, add it in
-            if (this.premessage_ !== "") {
-                func.appendField(this.premessage_);
-            }
-        } else if (!this.isMethod_ && this.getInput('FUNC')) {
-            this.removeInput('FUNC');
+Blockly.Blocks['ast_Call'] = {
+  /**
+   * Block for calling a procedure with no return value.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.givenColour_ = BlockMirrorTextToBlocks.COLOR.FUNCTIONS;
+    this.setInputsInline(true); // Regular ('NAME') or Keyword (either '**' or '*NAME')
+
+    this.arguments_ = [];
+    this.argumentVarModels_ = []; // acbart: Added count to keep track of unused parameters
+
+    this.argumentCount_ = 0;
+    this.quarkConnections_ = {};
+    this.quarkIds_ = null; // acbart: Show parameter names, if they exist
+
+    this.showParameterNames_ = false; // acbart: Whether this block returns
+
+    this.returns_ = true; // acbart: added simpleName to handle complex function calls (e.g., chained)
+
+    this.isMethod_ = false;
+    this.name_ = null;
+    this.message_ = "function";
+    this.premessage_ = "";
+    this.updateShape_();
+  },
+
+  /**
+   * Returns the name of the procedure this block calls.
+   * @return {string} Procedure name.
+   * @this Blockly.Block
+   */
+  getProcedureCall: function getProcedureCall() {
+    return this.name_;
+  },
+
+  /**
+   * Notification that a procedure is renaming.
+   * If the name matches this block's procedure, rename it.
+   * Also rename if it was previously null.
+   * @param {string} oldName Previous name of procedure.
+   * @param {string} newName Renamed procedure.
+   * @this Blockly.Block
+   */
+  renameProcedure: function renameProcedure(oldName, newName) {
+    if (this.name_ === null || Blockly.Names.equals(oldName, this.name_)) {
+      this.name_ = newName;
+      this.updateShape_();
+    }
+  },
+
+  /**
+   * Notification that the procedure's parameters have changed.
+   * @param {!Array.<string>} paramNames New param names, e.g. ['x', 'y', 'z'].
+   * @param {!Array.<string>} paramIds IDs of params (consistent for each
+   *     parameter through the life of a mutator, regardless of param renaming),
+   *     e.g. ['piua', 'f8b_', 'oi.o'].
+   * @private
+   * @this Blockly.Block
+   */
+  setProcedureParameters_: function setProcedureParameters_(paramNames, paramIds) {
+    // Data structures:
+    // this.arguments = ['x', 'y']
+    //     Existing param names.
+    // this.quarkConnections_ {piua: null, f8b_: Blockly.Connection}
+    //     Look-up of paramIds to connections plugged into the call block.
+    // this.quarkIds_ = ['piua', 'f8b_']
+    //     Existing param IDs.
+    // Note that quarkConnections_ may include IDs that no longer exist, but
+    // which might reappear if a param is reattached in the mutator.
+    var defBlock = Blockly.Procedures.getDefinition(this.getProcedureCall(), this.workspace);
+    var mutatorOpen = defBlock && defBlock.mutator && defBlock.mutator.isVisible();
+
+    if (!mutatorOpen) {
+      this.quarkConnections_ = {};
+      this.quarkIds_ = null;
+    }
+
+    if (!paramIds) {
+      // Reset the quarks (a mutator is about to open).
+      return false;
+    } // Test arguments (arrays of strings) for changes. '\n' is not a valid
+    // argument name character, so it is a valid delimiter here.
+
+
+    if (paramNames.join('\n') == this.arguments_.join('\n')) {
+      // No change.
+      this.quarkIds_ = paramIds;
+      return false;
+    }
+
+    if (paramIds.length !== paramNames.length) {
+      throw RangeError('paramNames and paramIds must be the same length.');
+    }
+
+    this.setCollapsed(false);
+
+    if (!this.quarkIds_) {
+      // Initialize tracking for this block.
+      this.quarkConnections_ = {};
+      this.quarkIds_ = [];
+    } // Switch off rendering while the block is rebuilt.
+
+
+    var savedRendered = this.rendered;
+    this.rendered = false; // Update the quarkConnections_ with existing connections.
+
+    for (var i = 0; i < this.arguments_.length; i++) {
+      var input = this.getInput('ARG' + i);
+
+      if (input) {
+        var connection = input.connection.targetConnection;
+        this.quarkConnections_[this.quarkIds_[i]] = connection;
+
+        if (mutatorOpen && connection && paramIds.indexOf(this.quarkIds_[i]) === -1) {
+          // This connection should no longer be attached to this block.
+          connection.disconnect();
+          connection.getSourceBlock().bumpNeighbours_();
+        }
+      }
+    } // Rebuild the block's arguments.
+
+
+    this.arguments_ = [].concat(paramNames);
+    this.argumentCount_ = this.arguments_.length; // And rebuild the argument model list.
+
+    this.argumentVarModels_ = [];
+    /*
+    // acbart: Function calls don't create variables, what do they know?
+    for (let i = 0; i < this.arguments_.length; i++) {
+        let argumentName = this.arguments_[i];
+        var variable = Blockly.Variables.getVariable(
+            this.workspace, null, this.arguments_[i], '');
+        if (variable) {
+            this.argumentVarModels_.push(variable);
         }
+    }*/
 
-        let drawnArgumentCount = this.getDrawnArgumentCount_();
-        let message = this.getInput('MESSAGE_AREA')
-        // Zero arguments, just do {message()}
-        if (drawnArgumentCount === 0) {
-            if (message) {
-                message.removeField('MESSAGE');
-            } else {
-                message = this.appendDummyInput('MESSAGE_AREA')
-                    .setAlign(Blockly.ALIGN_RIGHT);
-            }
-            message.appendField(new Blockly.FieldLabel(this.message_ + "\ ("), 'MESSAGE');
-            // One argument, no MESSAGE_AREA
-        } else if (message) {
-            this.removeInput('MESSAGE_AREA');
-        }
-        // Process arguments
-        let i;
-        for (i = 0; i < drawnArgumentCount; i++) {
-            let argument = this.arguments_[i];
-            let argumentName = this.parseArgument_(argument);
-            if (i === 0) {
-                argumentName = this.message_ + "\ (" + argumentName;
-            }
-            let field = this.getField('ARGNAME' + i);
-            if (field) {
-                // Ensure argument name is up to date.
-                // The argument name field is deterministic based on the mutation,
-                // no need to fire a change event.
-                Blockly.Events.disable();
-                try {
-                    field.setValue(argumentName);
-                } finally {
-                    Blockly.Events.enable();
-                }
-            } else {
-                // Add new input.
-                field = new Blockly.FieldLabel(argumentName);
-                this.appendValueInput('ARG' + i)
-                    .setAlign(Blockly.ALIGN_RIGHT)
-                    .appendField(field, 'ARGNAME' + i)
-                    .init();
-            }
-            if (argumentName) {
-                field.setVisible(true);
-            } else {
-                field.setVisible(false);
-            }
-        }
+    this.updateShape_();
+    this.quarkIds_ = paramIds; // Reconnect any child blocks.
 
-        // Closing parentheses
-        if (!this.getInput('CLOSE_PAREN')) {
-            this.appendDummyInput('CLOSE_PAREN')
-                .setAlign(Blockly.ALIGN_RIGHT)
-                .appendField(new Blockly.FieldLabel(")"));
-        }
+    if (this.quarkIds_) {
+      for (var _i = 0; _i < this.arguments_.length; _i++) {
+        var quarkId = this.quarkIds_[_i];
 
-        // Move everything into place
-        if (drawnArgumentCount === 0) {
-            if (this.isMethod_) {
-                this.moveInputBefore('FUNC', 'MESSAGE_AREA');
-            }
-            this.moveInputBefore('MESSAGE_AREA', 'CLOSE_PAREN');
-        } else {
-            if (this.isMethod_) {
-                this.moveInputBefore('FUNC', 'CLOSE_PAREN');
-            }
-        }
-        for (let j = 0; j < i; j++) {
-            this.moveInputBefore('ARG' + j, 'CLOSE_PAREN')
-        }
+        if (quarkId in this.quarkConnections_) {
+          var _connection = this.quarkConnections_[quarkId];
 
-        // Set return state
-        this.setReturn_(this.returns_, false);
-        // Remove deleted inputs.
-        while (this.getInput('ARG' + i)) {
-            this.removeInput('ARG' + i);
-            i++;
+          if (!Blockly.Mutator.reconnect(_connection, this, 'ARG' + _i)) {
+            // Block no longer exists or has been attached elsewhere.
+            delete this.quarkConnections_[quarkId];
+          }
         }
+      }
+    } // Restore rendering and show the changes.
+
 
-        this.setColour(this.givenColour_);
+    this.rendered = savedRendered;
+
+    if (this.rendered) {
+      this.render();
     }
-    ,
-    /**
-     * Create XML to represent the (non-editable) name and arguments.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        var container = document.createElement('mutation');
-        let name = this.getProcedureCall();
-        container.setAttribute('name', name === null ? '*' : name);
-        container.setAttribute('arguments', this.argumentCount_);
-        container.setAttribute('returns', this.returns_);
-        container.setAttribute('parameters', this.showParameterNames_);
-        container.setAttribute('method', this.isMethod_);
-        container.setAttribute('message', this.message_);
-        container.setAttribute('premessage', this.premessage_);
-        container.setAttribute('colour', this.givenColour_);
-        for (var i = 0; i < this.arguments_.length; i++) {
-            var parameter = document.createElement('arg');
-            parameter.setAttribute('name', this.arguments_[i]);
-            container.appendChild(parameter);
-        }
-        return container;
-    },
-    /**
-     * Parse XML to restore the (non-editable) name and parameters.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.name_ = xmlElement.getAttribute('name');
-        this.name_ = this.name_ === '*' ? null : this.name_;
-        this.argumentCount_ = parseInt(xmlElement.getAttribute('arguments'), 10);
-        this.showParameterNames_ = "true" === xmlElement.getAttribute('parameters');
-        this.returns_ = "true" === xmlElement.getAttribute('returns');
-        this.isMethod_ = "true" === xmlElement.getAttribute('method');
-        this.message_ = xmlElement.getAttribute('message');
-        this.premessage_ = xmlElement.getAttribute('premessage');
-        this.givenColour_ = parseInt(xmlElement.getAttribute('colour'), 10);
-
-        var args = [];
-        var paramIds = [];
-        for (var i = 0, childNode; childNode = xmlElement.childNodes[i]; i++) {
-            if (childNode.nodeName.toLowerCase() === 'arg') {
-                args.push(childNode.getAttribute('name'));
-                paramIds.push(childNode.getAttribute('paramId'));
-            }
-        }
-        let result = this.setProcedureParameters_(args, paramIds);
-        if (!result) {
-            this.updateShape_();
-        }
-        if (this.name_ !== null) {
-            this.renameProcedure(this.getProcedureCall(), this.name_);
-        }
-    },
-    /**
-     * Return all variables referenced by this block.
-     * @return {!Array.<!Blockly.VariableModel>} List of variable models.
-     * @this Blockly.Block
-     */
-    getVarModels: function () {
-        return this.argumentVarModels_;
+
+    return true;
+  },
+
+  /**
+   * Modify this block to have the correct number of arguments.
+   * @private
+   * @this Blockly.Block
+   */
+  updateShape_: function updateShape_() {
+    // If it's a method, add in the caller
+    if (this.isMethod_ && !this.getInput('FUNC')) {
+      var func = this.appendValueInput('FUNC'); // If there's a premessage, add it in
+
+      if (this.premessage_ !== "") {
+        func.appendField(this.premessage_);
+      }
+    } else if (!this.isMethod_ && this.getInput('FUNC')) {
+      this.removeInput('FUNC');
     }
-    ,
-    /**
-     * Add menu option to find the definition block for this call.
-     * @param {!Array} options List of menu options to add to.
-     * @this Blockly.Block
-     */
-    customContextMenu: function (options) {
-        if (!this.workspace.isMovable()) {
-            // If we center on the block and the workspace isn't movable we could
-            // loose blocks at the edges of the workspace.
-            return;
-        }
 
-        let workspace = this.workspace;
-        let block = this;
-
-        // Highlight Definition
-        let option = {enabled: true};
-        option.text = Blockly.Msg['PROCEDURES_HIGHLIGHT_DEF'];
-        let name = this.getProcedureCall();
-        option.callback = function () {
-            let def = Blockly.Procedures.getDefinition(name, workspace);
-            if (def) {
-                workspace.centerOnBlock(def.id);
-                def.select();
-            }
-        };
-        options.push(option);
-
-        // Show Parameter Names
-        options.push({
-            enabled: true,
-            text: "Show/Hide parameters",
-            callback: function () {
-                block.showParameterNames_ = !block.showParameterNames_;
-                block.updateShape_();
-                block.render();
-            }
-        });
-
-        // Change Return Type
-        options.push({
-            enabled: true,
-            text: this.returns_ ? "Make statement" : "Make expression",
-            callback: function () {
-                block.returns_ = !block.returns_;
-                block.setReturn_(block.returns_, true);
-            }
-        })
-    },
-    /**
-     * Notification that the procedure's return state has changed.
-     * @param {boolean} returnState New return state
-     * @param forceRerender Whether to render
-     * @this Blockly.Block
-     */
-    setReturn_: function (returnState, forceRerender) {
-        this.unplug(true);
-        if (returnState) {
-            this.setPreviousStatement(false);
-            this.setNextStatement(false);
-            this.setOutput(true);
-        } else {
-            this.setOutput(false);
-            this.setPreviousStatement(true);
-            this.setNextStatement(true);
-        }
-        if (forceRerender) {
-            if (this.rendered) {
-                this.render();
-            }
+    var drawnArgumentCount = this.getDrawnArgumentCount_();
+    var message = this.getInput('MESSAGE_AREA'); // Zero arguments, just do {message()}
+
+    if (drawnArgumentCount === 0) {
+      if (message) {
+        message.removeField('MESSAGE');
+      } else {
+        message = this.appendDummyInput('MESSAGE_AREA').setAlign(Blockly.ALIGN_RIGHT);
+      }
+
+      message.appendField(new Blockly.FieldLabel(this.message_ + "\ ("), 'MESSAGE'); // One argument, no MESSAGE_AREA
+    } else if (message) {
+      this.removeInput('MESSAGE_AREA');
+    } // Process arguments
+
+
+    var i;
+
+    for (i = 0; i < drawnArgumentCount; i++) {
+      var argument = this.arguments_[i];
+      var argumentName = this.parseArgument_(argument);
+
+      if (i === 0) {
+        argumentName = this.message_ + "\ (" + argumentName;
+      }
+
+      var field = this.getField('ARGNAME' + i);
+
+      if (field) {
+        // Ensure argument name is up to date.
+        // The argument name field is deterministic based on the mutation,
+        // no need to fire a change event.
+        Blockly.Events.disable();
+
+        try {
+          field.setValue(argumentName);
+        } finally {
+          Blockly.Events.enable();
         }
-    },
-    //defType_: 'procedures_defnoreturn',
-    parseArgument_: function (argument) {
-        if (argument.startsWith('KWARGS:')) {
-            // KWARG
-            return "unpack";
-        } else if (argument.startsWith('KEYWORD:')) {
-            return argument.substring(8) + "=";
-        } else {
-            if (this.showParameterNames_) {
-                if (argument.startsWith("KNOWN_ARG:")) {
-                    return argument.substring(10) + "=";
-                }
-            }
+      } else {
+        // Add new input.
+        field = new Blockly.FieldLabel(argumentName);
+        this.appendValueInput('ARG' + i).setAlign(Blockly.ALIGN_RIGHT).appendField(field, 'ARGNAME' + i).init();
+      }
+
+      if (argumentName) {
+        field.setVisible(true);
+      } else {
+        field.setVisible(false);
+      }
+    } // Closing parentheses
+
+
+    if (!this.getInput('CLOSE_PAREN')) {
+      this.appendDummyInput('CLOSE_PAREN').setAlign(Blockly.ALIGN_RIGHT).appendField(new Blockly.FieldLabel(")"));
+    } // Move everything into place
+
+
+    if (drawnArgumentCount === 0) {
+      if (this.isMethod_) {
+        this.moveInputBefore('FUNC', 'MESSAGE_AREA');
+      }
+
+      this.moveInputBefore('MESSAGE_AREA', 'CLOSE_PAREN');
+    } else {
+      if (this.isMethod_) {
+        this.moveInputBefore('FUNC', 'CLOSE_PAREN');
+      }
+    }
+
+    for (var j = 0; j < i; j++) {
+      this.moveInputBefore('ARG' + j, 'CLOSE_PAREN');
+    } // Set return state
+
+
+    this.setReturn_(this.returns_, false); // Remove deleted inputs.
+
+    while (this.getInput('ARG' + i)) {
+      this.removeInput('ARG' + i);
+      i++;
+    }
+
+    this.setColour(this.givenColour_);
+  },
+
+  /**
+   * Create XML to represent the (non-editable) name and arguments.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    var name = this.getProcedureCall();
+    container.setAttribute('name', name === null ? '*' : name);
+    container.setAttribute('arguments', this.argumentCount_);
+    container.setAttribute('returns', this.returns_);
+    container.setAttribute('parameters', this.showParameterNames_);
+    container.setAttribute('method', this.isMethod_);
+    container.setAttribute('message', this.message_);
+    container.setAttribute('premessage', this.premessage_);
+    container.setAttribute('colour', this.givenColour_);
+
+    for (var i = 0; i < this.arguments_.length; i++) {
+      var parameter = document.createElement('arg');
+      parameter.setAttribute('name', this.arguments_[i]);
+      container.appendChild(parameter);
+    }
+
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the (non-editable) name and parameters.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.name_ = xmlElement.getAttribute('name');
+    this.name_ = this.name_ === '*' ? null : this.name_;
+    this.argumentCount_ = parseInt(xmlElement.getAttribute('arguments'), 10);
+    this.showParameterNames_ = "true" === xmlElement.getAttribute('parameters');
+    this.returns_ = "true" === xmlElement.getAttribute('returns');
+    this.isMethod_ = "true" === xmlElement.getAttribute('method');
+    this.message_ = xmlElement.getAttribute('message');
+    this.premessage_ = xmlElement.getAttribute('premessage');
+    this.givenColour_ = parseInt(xmlElement.getAttribute('colour'), 10);
+    var args = [];
+    var paramIds = [];
+
+    for (var i = 0, childNode; childNode = xmlElement.childNodes[i]; i++) {
+      if (childNode.nodeName.toLowerCase() === 'arg') {
+        args.push(childNode.getAttribute('name'));
+        paramIds.push(childNode.getAttribute('paramId'));
+      }
+    }
+
+    var result = this.setProcedureParameters_(args, paramIds);
+
+    if (!result) {
+      this.updateShape_();
+    }
+
+    if (this.name_ !== null) {
+      this.renameProcedure(this.getProcedureCall(), this.name_);
+    }
+  },
+
+  /**
+   * Return all variables referenced by this block.
+   * @return {!Array.<!Blockly.VariableModel>} List of variable models.
+   * @this Blockly.Block
+   */
+  getVarModels: function getVarModels() {
+    return this.argumentVarModels_;
+  },
+
+  /**
+   * Add menu option to find the definition block for this call.
+   * @param {!Array} options List of menu options to add to.
+   * @this Blockly.Block
+   */
+  customContextMenu: function customContextMenu(options) {
+    if (!this.workspace.isMovable()) {
+      // If we center on the block and the workspace isn't movable we could
+      // loose blocks at the edges of the workspace.
+      return;
+    }
+
+    var workspace = this.workspace;
+    var block = this; // Highlight Definition
+
+    var option = {
+      enabled: true
+    };
+    option.text = Blockly.Msg['PROCEDURES_HIGHLIGHT_DEF'];
+    var name = this.getProcedureCall();
+
+    option.callback = function () {
+      var def = Blockly.Procedures.getDefinition(name, workspace);
+
+      if (def) {
+        workspace.centerOnBlock(def.id);
+        def.select();
+      }
+    };
+
+    options.push(option); // Show Parameter Names
+
+    options.push({
+      enabled: true,
+      text: "Show/Hide parameters",
+      callback: function callback() {
+        block.showParameterNames_ = !block.showParameterNames_;
+        block.updateShape_();
+        block.render();
+      }
+    }); // Change Return Type
+
+    options.push({
+      enabled: true,
+      text: this.returns_ ? "Make statement" : "Make expression",
+      callback: function callback() {
+        block.returns_ = !block.returns_;
+        block.setReturn_(block.returns_, true);
+      }
+    });
+  },
+
+  /**
+   * Notification that the procedure's return state has changed.
+   * @param {boolean} returnState New return state
+   * @param forceRerender Whether to render
+   * @this Blockly.Block
+   */
+  setReturn_: function setReturn_(returnState, forceRerender) {
+    this.unplug(true);
+
+    if (returnState) {
+      this.setPreviousStatement(false);
+      this.setNextStatement(false);
+      this.setOutput(true);
+    } else {
+      this.setOutput(false);
+      this.setPreviousStatement(true);
+      this.setNextStatement(true);
+    }
+
+    if (forceRerender) {
+      if (this.rendered) {
+        this.render();
+      }
+    }
+  },
+  //defType_: 'procedures_defnoreturn',
+  parseArgument_: function parseArgument_(argument) {
+    if (argument.startsWith('KWARGS:')) {
+      // KWARG
+      return "unpack";
+    } else if (argument.startsWith('KEYWORD:')) {
+      return argument.substring(8) + "=";
+    } else {
+      if (this.showParameterNames_) {
+        if (argument.startsWith("KNOWN_ARG:")) {
+          return argument.substring(10) + "=";
         }
-        return "";
-    },
-    getDrawnArgumentCount_: function () {
-        return Math.min(this.argumentCount_, this.arguments_.length);
+      }
     }
+
+    return "";
+  },
+  getDrawnArgumentCount_: function getDrawnArgumentCount_() {
+    return Math.min(this.argumentCount_, this.arguments_.length);
+  }
 };
 
 Blockly.Python['ast_Call'] = function (block) {
-    // Get the caller
-    let funcName = "";
-    if (block.isMethod_) {
-        funcName = Blockly.Python.valueToCode(block, 'FUNC', Blockly.Python.ORDER_FUNCTION_CALL) ||
-            Blockly.Python.blank;
-    }
-    funcName += this.name_;
-    // Build the arguments
-    var args = [];
-    for (var i = 0; i < block.arguments_.length; i++) {
-        let value = Blockly.Python.valueToCode(block, 'ARG' + i,
-            Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-        let argument = block.arguments_[i];
-        if (argument.startsWith('KWARGS:')) {
-            args[i] = "**" + value;
-        } else if (argument.startsWith('KEYWORD:')) {
-            args[i] = argument.substring(8) + "=" + value;
-        } else {
-            args[i] = value;
-        }
-    }
-    // Return the result
-    let code = funcName + '(' + args.join(', ') + ')';
-    if (block.returns_) {
-        return [code, Blockly.Python.ORDER_FUNCTION_CALL];
+  // TODO: Handle import
+  // Blockly.Python.definitions_['import_matplotlib'] = 'import matplotlib.pyplot as plt';
+  // Get the caller
+  var funcName = "";
+
+  if (block.isMethod_) {
+    funcName = Blockly.Python.valueToCode(block, 'FUNC', Blockly.Python.ORDER_FUNCTION_CALL) || Blockly.Python.blank;
+  }
+
+  funcName += this.name_; // Build the arguments
+
+  var args = [];
+
+  for (var i = 0; i < block.arguments_.length; i++) {
+    var value = Blockly.Python.valueToCode(block, 'ARG' + i, Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+    var argument = block.arguments_[i];
+
+    if (argument.startsWith('KWARGS:')) {
+      args[i] = "**" + value;
+    } else if (argument.startsWith('KEYWORD:')) {
+      args[i] = argument.substring(8) + "=" + value;
     } else {
-        return code + "\n";
+      args[i] = value;
     }
+  } // Return the result
+
+
+  var code = funcName + '(' + args.join(', ') + ')';
+
+  if (block.returns_) {
+    return [code, Blockly.Python.ORDER_FUNCTION_CALL];
+  } else {
+    return code + "\n";
+  }
 };
 
 BlockMirrorTextToBlocks.prototype.getAsModule = function (node) {
-    if (node._astname === 'Name') {
-        return Sk.ffi.remapToJs(node.id);
-    } else if (node._astname === 'Attribute') {
-        let origin = this.getAsModule(node.value);
-        if (origin !== null) {
-            return origin + '.' + Sk.ffi.remapToJs(node.attr);
-        }
-    } else {
-        return null;
-    }
-}
+  if (node._astname === 'Name') {
+    return Sk.ffi.remapToJs(node.id);
+  } else if (node._astname === 'Attribute') {
+    var origin = this.getAsModule(node.value);
 
-//                              messageBefore, message, name
+    if (origin !== null) {
+      return origin + '.' + Sk.ffi.remapToJs(node.attr);
+    }
+  } else {
+    return null;
+  }
+}; //                              messageBefore, message, name
 // function call: print() -> "print" ([message]) ; print
 // Module function: plt.show() -> "show plot" ([plot]) ; plt.show
 // Method call: "test".title() -> "make" [str] "title case" () ; .title ; isMethod = true
 
+
 BlockMirrorTextToBlocks.prototype['ast_Call'] = function (node, parent) {
-    let func = node.func;
-    let args = node.args;
-    let keywords = node.keywords;
-
-    // Can we make any guesses about this based on its name?
-    let signature = null;
-    let isMethod = false;
-    let premessage = "";
-    let message = "";
-    let name = "";
-    let caller = null;
-    let colour = BlockMirrorTextToBlocks.COLOR.FUNCTIONS;
-
-    if (func._astname === 'Name') {
-        message = name = Sk.ffi.remapToJs(func.id);
-        if (name in this.FUNCTION_SIGNATURES) {
-            signature = this.FUNCTION_SIGNATURES[Sk.ffi.remapToJs(func.id)];
-        }
-    } else if (func._astname === 'Attribute') {
-        isMethod = true;
-        caller = func.value;
-        let potentialModule = this.getAsModule(caller);
-        let attributeName = Sk.ffi.remapToJs(func.attr);
-        message = "." + attributeName;
-        if (potentialModule in this.MODULE_FUNCTION_SIGNATURES) {
-            signature = this.MODULE_FUNCTION_SIGNATURES[potentialModule][attributeName];
-            message = name = potentialModule + message;
-            isMethod = false;
-        } else if (attributeName in this.METHOD_SIGNATURES) {
-            signature = this.METHOD_SIGNATURES[attributeName];
-            name = message;
-        } else {
-            name = message;
-        }
+  var func = node.func;
+  var args = node.args;
+  var keywords = node.keywords; // Can we make any guesses about this based on its name?
+
+  var signature = null;
+  var isMethod = false;
+  var premessage = "";
+  var message = "";
+  var name = "";
+  var caller = null;
+  var colour = BlockMirrorTextToBlocks.COLOR.FUNCTIONS;
+
+  if (func._astname === 'Name') {
+    message = name = Sk.ffi.remapToJs(func.id);
+
+    if (name in this.FUNCTION_SIGNATURES) {
+      signature = this.FUNCTION_SIGNATURES[Sk.ffi.remapToJs(func.id)];
+    }
+  } else if (func._astname === 'Attribute') {
+    isMethod = true;
+    caller = func.value;
+    var potentialModule = this.getAsModule(caller);
+    var attributeName = Sk.ffi.remapToJs(func.attr);
+    message = "." + attributeName;
+
+    if (potentialModule in this.MODULE_FUNCTION_SIGNATURES) {
+      signature = this.MODULE_FUNCTION_SIGNATURES[potentialModule][attributeName];
+      message = name = potentialModule + message;
+      isMethod = false;
+    } else if (attributeName in this.METHOD_SIGNATURES) {
+      signature = this.METHOD_SIGNATURES[attributeName];
+      name = message;
     } else {
-        isMethod = true;
-        message = "";
-        name = "";
-        caller = func;
-        // (lambda x: x)()
+      name = message;
     }
-    let returns = true;
+  } else {
+    isMethod = true;
+    message = "";
+    name = "";
+    caller = func; // (lambda x: x)()
+  }
 
-    if (signature !== null) {
-        if ('returns' in signature) {
-            returns = signature.returns;
-        }
-        if ('message' in signature) {
-            message = signature.message;
-        }
-        if ('premessage' in signature) {
-            premessage = signature.premessage;
-        }
-        if ('colour' in signature) {
-            colour = signature.colour;
-        }
+  var returns = true;
+
+  if (signature !== null && signature !== undefined) {
+    if (signature.custom) {
+      try {
+        return signature.custom(node, parent);
+      } catch (e) {// We tried to be fancy and failed, better fall back to default behavior!
+      }
     }
 
-    returns = returns || (parent._astname !== 'Expr');
-
-    let argumentsNormal = {};
-    // TODO: do I need to be limiting only the *args* length, not keywords?
-    let argumentsMutation = {
-        "@arguments": (args !== null ? args.length : 0) +
-            (keywords !== null ? keywords.length : 0),
-        "@returns": returns,
-        "@parameters": true,
-        "@method": isMethod,
-        "@name": name,
-        "@message": message,
-        "@premessage": premessage,
-        "@colour": colour
-    };
-    // Handle arguments
-    let overallI = 0;
-    if (args !== null) {
-        for (let i = 0; i < args.length; i += 1, overallI += 1) {
-            argumentsNormal["ARG" + overallI] = this.convert(args[i], node);
-            argumentsMutation["UNKNOWN_ARG:" + overallI] = null;
-        }
+    if ('returns' in signature) {
+      returns = signature.returns;
     }
-    if (keywords !== null) {
-        for (let i = 0; i < keywords.length; i += 1, overallI += 1) {
-            let keyword = keywords[i];
-            let arg = keyword.arg;
-            let value = keyword.value;
-            if (arg === null) {
-                argumentsNormal["ARG" + overallI] = this.convert(value, node);
-                argumentsMutation["KWARGS:" + overallI] = null;
-            } else {
-                argumentsNormal["ARG" + overallI] = this.convert(value, node);
-                argumentsMutation["KEYWORD:" + Sk.ffi.remapToJs(arg)] = null;
-            }
-        }
+
+    if ('message' in signature) {
+      message = signature.message;
     }
-    // Build actual block
-    let newBlock;
-    if (isMethod) {
-        argumentsNormal['FUNC'] = this.convert(caller, node);
-        newBlock = BlockMirrorTextToBlocks.create_block("ast_Call", node.lineno,
-            {}, argumentsNormal, {inline: true}, argumentsMutation);
-    } else {
-        newBlock = BlockMirrorTextToBlocks.create_block("ast_Call", node.lineno, {},
-            argumentsNormal, {inline: true}, argumentsMutation);
+
+    if ('premessage' in signature) {
+      premessage = signature.premessage;
     }
-    // Return as either statement or expression
-    if (returns) {
-        return newBlock;
-    } else {
-        return [newBlock];
+
+    if ('colour' in signature) {
+      colour = signature.colour;
+    }
+  }
+
+  returns = returns || parent._astname !== 'Expr';
+  var argumentsNormal = {}; // TODO: do I need to be limiting only the *args* length, not keywords?
+
+  var argumentsMutation = {
+    "@arguments": (args !== null ? args.length : 0) + (keywords !== null ? keywords.length : 0),
+    "@returns": returns,
+    "@parameters": true,
+    "@method": isMethod,
+    "@name": name,
+    "@message": message,
+    "@premessage": premessage,
+    "@colour": colour
+  }; // Handle arguments
+
+  var overallI = 0;
+
+  if (args !== null) {
+    for (var i = 0; i < args.length; i += 1, overallI += 1) {
+      argumentsNormal["ARG" + overallI] = this.convert(args[i], node);
+      argumentsMutation["UNKNOWN_ARG:" + overallI] = null;
+    }
+  }
+
+  if (keywords !== null) {
+    for (var _i2 = 0; _i2 < keywords.length; _i2 += 1, overallI += 1) {
+      var keyword = keywords[_i2];
+      var arg = keyword.arg;
+      var value = keyword.value;
+
+      if (arg === null) {
+        argumentsNormal["ARG" + overallI] = this.convert(value, node);
+        argumentsMutation["KWARGS:" + overallI] = null;
+      } else {
+        argumentsNormal["ARG" + overallI] = this.convert(value, node);
+        argumentsMutation["KEYWORD:" + Sk.ffi.remapToJs(arg)] = null;
+      }
     }
+  } // Build actual block
+
+
+  var newBlock;
+
+  if (isMethod) {
+    argumentsNormal['FUNC'] = this.convert(caller, node);
+    newBlock = BlockMirrorTextToBlocks.create_block("ast_Call", node.lineno, {}, argumentsNormal, {
+      inline: true
+    }, argumentsMutation);
+  } else {
+    newBlock = BlockMirrorTextToBlocks.create_block("ast_Call", node.lineno, {}, argumentsNormal, {
+      inline: true
+    }, argumentsMutation);
+  } // Return as either statement or expression
+
+
+  if (returns) {
+    return newBlock;
+  } else {
+    return [newBlock];
+  }
 };
+
 Blockly.Blocks['ast_Raise'] = {
-    init: function () {
-        this.setInputsInline(true);
-        this.setPreviousStatement(true, null);
-        this.setNextStatement(true, null);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.EXCEPTIONS);
-        this.exc_ = true;
-        this.cause_ = false;
-
-        this.appendDummyInput()
-            .appendField("raise");
-        this.updateShape_();
-    },
-    updateShape_: function () {
-        if (this.exc_ && !this.getInput('EXC')) {
-            this.appendValueInput("EXC")
-                .setCheck(null);
-        } else if (!this.exc_ && this.getInput('EXC')) {
-            this.removeInput('EXC');
-        }
-        if (this.cause_ && !this.getInput('CAUSE')) {
-            this.appendValueInput("CAUSE")
-                .setCheck(null)
-                .appendField("from");
-        } else if (!this.cause_ && this.getInput('CAUSE')) {
-            this.removeInput('CAUSE');
-        }
-        if (this.cause_ && this.exc_) {
-            this.moveInputBefore('EXC', 'CAUSE');
-        }
-    },
-    /**
-     * Create XML to represent list inputs.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        var container = document.createElement('mutation');
-        container.setAttribute('exc', this.exc_);
-        container.setAttribute('cause', this.cause_);
-        return container;
-    },
-    /**
-     * Parse XML to restore the list inputs.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.exc_ = "true" === xmlElement.getAttribute('exc');
-        this.cause_ = "true" === xmlElement.getAttribute('cause');
-        this.updateShape_();
-    },
+  init: function init() {
+    this.setInputsInline(true);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.EXCEPTIONS);
+    this.exc_ = true;
+    this.cause_ = false;
+    this.appendDummyInput().appendField("raise");
+    this.updateShape_();
+  },
+  updateShape_: function updateShape_() {
+    if (this.exc_ && !this.getInput('EXC')) {
+      this.appendValueInput("EXC").setCheck(null);
+    } else if (!this.exc_ && this.getInput('EXC')) {
+      this.removeInput('EXC');
+    }
+
+    if (this.cause_ && !this.getInput('CAUSE')) {
+      this.appendValueInput("CAUSE").setCheck(null).appendField("from");
+    } else if (!this.cause_ && this.getInput('CAUSE')) {
+      this.removeInput('CAUSE');
+    }
+
+    if (this.cause_ && this.exc_) {
+      this.moveInputBefore('EXC', 'CAUSE');
+    }
+  },
+
+  /**
+   * Create XML to represent list inputs.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('exc', this.exc_);
+    container.setAttribute('cause', this.cause_);
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the list inputs.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.exc_ = "true" === xmlElement.getAttribute('exc');
+    this.cause_ = "true" === xmlElement.getAttribute('cause');
+    this.updateShape_();
+  }
 };
 
 Blockly.Python['ast_Raise'] = function (block) {
-    if (this.exc_) {
-        let exc = Blockly.Python.valueToCode(block, 'EXC', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-        if (this.cause_) {
-            let cause = Blockly.Python.valueToCode(block, 'CAUSE', Blockly.Python.ORDER_NONE)
-                || Blockly.Python.blank;
-            return "raise " + exc + " from " + cause + "\n";
-        } else {
-            return "raise " + exc + "\n";
-        }
+  if (this.exc_) {
+    var exc = Blockly.Python.valueToCode(block, 'EXC', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+
+    if (this.cause_) {
+      var cause = Blockly.Python.valueToCode(block, 'CAUSE', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+      return "raise " + exc + " from " + cause + "\n";
     } else {
-        return "raise"+"\n";
+      return "raise " + exc + "\n";
     }
+  } else {
+    return "raise" + "\n";
+  }
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Raise'] = function (node, parent) {
-    var exc = node.exc;
-    var cause = node.cause;
-    let values = {};
-    let hasExc = false, hasCause = false;
-    if (exc !== null) {
-        values['EXC'] = this.convert(exc, node);
-        hasExc = true;
-    }
-    if (cause !== null) {
-        values['CAUSE'] = this.convert(cause, node);
-        hasCause = true;
-    }
-    return BlockMirrorTextToBlocks.create_block("ast_Raise", node.lineno, {}, values, {}, {
-        '@exc': hasExc,
-        '@cause': hasCause
-    });
+  var exc = node.exc;
+  var cause = node.cause;
+  var values = {};
+  var hasExc = false,
+      hasCause = false;
+
+  if (exc !== null) {
+    values['EXC'] = this.convert(exc, node);
+    hasExc = true;
+  }
+
+  if (cause !== null) {
+    values['CAUSE'] = this.convert(cause, node);
+    hasCause = true;
+  }
+
+  return BlockMirrorTextToBlocks.create_block("ast_Raise", node.lineno, {}, values, {}, {
+    '@exc': hasExc,
+    '@cause': hasCause
+  });
 };
+
 Blockly.Blocks['ast_Delete'] = {
-    init: function () {
-        this.setInputsInline(true);
-        this.setPreviousStatement(true, null);
-        this.setNextStatement(true, null);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
-        this.targetCount_ = 1;
-
-        this.appendDummyInput()
-            .appendField("delete");
-        this.updateShape_();
-    },
-    updateShape_: function () {
-        // Add new inputs.
-        for (var i = 0; i < this.targetCount_; i++) {
-            if (!this.getInput('TARGET' + i)) {
-                var input = this.appendValueInput('TARGET' + i);
-                if (i !== 0) {
-                    input.appendField(',').setAlign(Blockly.ALIGN_RIGHT);
-                }
-            }
-        }
-        // Remove deleted inputs.
-        while (this.getInput('TARGET' + i)) {
-            this.removeInput('TARGET' + i);
-            i++;
-        }
-    },
-    /**
-     * Create XML to represent list inputs.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        var container = document.createElement('mutation');
-        container.setAttribute('targets', this.targetCount_);
-        return container;
-    },
-    /**
-     * Parse XML to restore the list inputs.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.targetCount_ = parseInt(xmlElement.getAttribute('targets'), 10);
-        this.updateShape_();
-    },
+  init: function init() {
+    this.setInputsInline(true);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
+    this.targetCount_ = 1;
+    this.appendDummyInput().appendField("delete");
+    this.updateShape_();
+  },
+  updateShape_: function updateShape_() {
+    // Add new inputs.
+    for (var i = 0; i < this.targetCount_; i++) {
+      if (!this.getInput('TARGET' + i)) {
+        var input = this.appendValueInput('TARGET' + i);
+
+        if (i !== 0) {
+          input.appendField(',').setAlign(Blockly.ALIGN_RIGHT);
+        }
+      }
+    } // Remove deleted inputs.
+
+
+    while (this.getInput('TARGET' + i)) {
+      this.removeInput('TARGET' + i);
+      i++;
+    }
+  },
+
+  /**
+   * Create XML to represent list inputs.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('targets', this.targetCount_);
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the list inputs.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.targetCount_ = parseInt(xmlElement.getAttribute('targets'), 10);
+    this.updateShape_();
+  }
 };
 
 Blockly.Python['ast_Delete'] = function (block) {
-    // Create a list with any number of elements of any type.
-    var elements = new Array(block.targetCount_);
-    for (var i = 0; i < block.targetCount_; i++) {
-        elements[i] = Blockly.Python.valueToCode(block, 'TARGET' + i,
-            Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-    }
-    var code = 'del ' + elements.join(', ') + "\n";
-    return code;
+  // Create a list with any number of elements of any type.
+  var elements = new Array(block.targetCount_);
+
+  for (var i = 0; i < block.targetCount_; i++) {
+    elements[i] = Blockly.Python.valueToCode(block, 'TARGET' + i, Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  }
+
+  var code = 'del ' + elements.join(', ') + "\n";
+  return code;
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Delete'] = function (node, parent) {
-    let targets = node.targets;
-
-    return BlockMirrorTextToBlocks.create_block("ast_Delete", node.lineno, {},
-        this.convertElements("TARGET", targets, node),
-        {
-            "inline": "true",
-        }, {
-            "@targets": targets.length
-        });
+  var targets = node.targets;
+  return BlockMirrorTextToBlocks.create_block("ast_Delete", node.lineno, {}, this.convertElements("TARGET", targets, node), {
+    "inline": "true"
+  }, {
+    "@targets": targets.length
+  });
 };
+
 Blockly.Blocks['ast_Subscript'] = {
-    init: function () {
-        this.setInputsInline(true);
-        this.setOutput(true);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.SEQUENCES);
-        this.sliceKinds_ = ["I"];
-
-        this.appendValueInput("VALUE")
-            .setCheck(null);
-        this.appendDummyInput('OPEN_BRACKET')
-            .appendField("[",);
-        this.appendDummyInput('CLOSE_BRACKET')
-            .appendField("]",);
-        this.updateShape_();
-    },
-    setExistence: function (label, exist, isDummy) {
-        if (exist && !this.getInput(label)) {
-            if (isDummy) {
-                return this.appendDummyInput(label);
-            } else {
-                return this.appendValueInput(label);
-            }
-        } else if (!exist && this.getInput(label)) {
-            this.removeInput(label);
-        }
-        return null;
-    },
-    createSlice_: function (i, kind) {
-        // ,
-        let input = this.setExistence('COMMA' + i, i !== 0, true);
-        if (input) {
-            input.appendField(",")
-        }
-        // Single index
-        let isIndex = (kind.charAt(0) === 'I');
-        input = this.setExistence('INDEX' + i, isIndex, false);
-        // First index
-        input = this.setExistence('SLICELOWER' + i, !isIndex && "1" === kind.charAt(1), false);
-        // First colon
-        input = this.setExistence('SLICECOLON' + i, !isIndex , true);
-        if (input) {
-            input.appendField(':').setAlign(Blockly.ALIGN_RIGHT);
-        }
-        // Second index
-        input = this.setExistence('SLICEUPPER' + i, !isIndex && "1" === kind.charAt(2), false);
-        // Second colon and third index
-        input = this.setExistence('SLICESTEP' + i, !isIndex && "1" === kind.charAt(3), false);
-        if (input) {
-            input.appendField(':').setAlign(Blockly.ALIGN_RIGHT);
-        }
-    },
-    updateShape_: function () {
-        // Add new inputs.
-        for (var i = 0; i < this.sliceKinds_.length; i++) {
-            this.createSlice_(i, this.sliceKinds_[i]);
-        }
+  init: function init() {
+    this.setInputsInline(true);
+    this.setOutput(true);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.SEQUENCES);
+    this.sliceKinds_ = ["I"];
+    this.appendValueInput("VALUE").setCheck(null);
+    this.appendDummyInput('OPEN_BRACKET').appendField("[");
+    this.appendDummyInput('CLOSE_BRACKET').appendField("]");
+    this.updateShape_();
+  },
+  setExistence: function setExistence(label, exist, isDummy) {
+    if (exist && !this.getInput(label)) {
+      if (isDummy) {
+        return this.appendDummyInput(label);
+      } else {
+        return this.appendValueInput(label);
+      }
+    } else if (!exist && this.getInput(label)) {
+      this.removeInput(label);
+    }
 
-        for (let j = 0; j < i; j++) {
-            if (j !== 0) {
-                this.moveInputBefore('COMMA' + j, 'CLOSE_BRACKET');
-            }
-            let kind = this.sliceKinds_[j];
-            if (kind.charAt(0) === "I") {
-                this.moveInputBefore('INDEX' + j, 'CLOSE_BRACKET');
-            } else {
-                if (kind.charAt(1) === "1") {
-                    this.moveInputBefore("SLICELOWER" + j, 'CLOSE_BRACKET');
-                }
-                this.moveInputBefore("SLICECOLON" + j, 'CLOSE_BRACKET');
-                if (kind.charAt(2) === "1") {
-                    this.moveInputBefore("SLICEUPPER" + j, 'CLOSE_BRACKET');
-                }
-                if (kind.charAt(3) === "1") {
-                    this.moveInputBefore("SLICESTEP" + j, 'CLOSE_BRACKET');
-                }
-            }
-        }
+    return null;
+  },
+  createSlice_: function createSlice_(i, kind) {
+    // ,
+    var input = this.setExistence('COMMA' + i, i !== 0, true);
 
-        // Remove deleted inputs.
-        while (this.getInput('TARGET' + i) || this.getInput('SLICECOLON')) {
-            this.removeInput('COMMA'+i, true);
-            if (this.getInput('INDEX' + i)) {
-                this.removeInput('INDEX' + i);
-            } else {
-                this.removeInput('SLICELOWER' + i, true);
-                this.removeInput('SLICECOLON' + i, true);
-                this.removeInput('SLICEUPPER' + i, true);
-                this.removeInput('SLICESTEP' + i, true);
-            }
-            i++;
-        }
-    },
-    /**
-     * Create XML to represent list inputs.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        let container = document.createElement('mutation');
-        for (let i = 0; i < this.sliceKinds_.length; i++) {
-            let parameter = document.createElement('arg');
-            parameter.setAttribute('name', this.sliceKinds_[i]);
-            container.appendChild(parameter);
-        }
-        return container;
-    },
-    /**
-     * Parse XML to restore the list inputs.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.sliceKinds_ = [];
-        for (let i = 0, childNode; childNode = xmlElement.childNodes[i]; i++) {
-            if (childNode.nodeName.toLowerCase() === 'arg') {
-                this.sliceKinds_.push(childNode.getAttribute('name'));
-            }
-        }
-        this.updateShape_();
-    },
-};
+    if (input) {
+      input.appendField(",");
+    } // Single index
 
-Blockly.Python['ast_Subscript'] = function (block) {
-    // Create a list with any number of elements of any type.
-    let value = Blockly.Python.valueToCode(block, 'VALUE',
-        Blockly.Python.ORDER_MEMBER) || Blockly.Python.blank;
-    var slices = new Array(block.sliceKinds_.length);
-    for (let i = 0; i < block.sliceKinds_.length; i++) {
-        let kind = block.sliceKinds_[i];
-        if (kind.charAt(0) === 'I') {
-            slices[i] = Blockly.Python.valueToCode(block, 'INDEX' + i,
-                Blockly.Python.ORDER_MEMBER) || Blockly.Python.blank;
-        } else {
-            slices[i] = "";
-            if (kind.charAt(1) === '1') {
-                slices[i] += Blockly.Python.valueToCode(block, 'SLICELOWER' + i,
-                    Blockly.Python.ORDER_MEMBER) || Blockly.Python.blank;
-            }
-            slices[i] += ":";
-            if (kind.charAt(2) === '1') {
-                slices[i] += Blockly.Python.valueToCode(block, 'SLICEUPPER' + i,
-                    Blockly.Python.ORDER_MEMBER) || Blockly.Python.blank;
-            }
-            if (kind.charAt(3) === '1') {
-                slices[i] += ":" + Blockly.Python.valueToCode(block, 'SLICESTEP' + i,
-                    Blockly.Python.ORDER_MEMBER) || Blockly.Python.blank;
-            }
-        }
+
+    var isIndex = kind.charAt(0) === 'I';
+    input = this.setExistence('INDEX' + i, isIndex, false); // First index
+
+    input = this.setExistence('SLICELOWER' + i, !isIndex && "1" === kind.charAt(1), false); // First colon
+
+    input = this.setExistence('SLICECOLON' + i, !isIndex, true);
+
+    if (input) {
+      input.appendField(':').setAlign(Blockly.ALIGN_RIGHT);
+    } // Second index
+
+
+    input = this.setExistence('SLICEUPPER' + i, !isIndex && "1" === kind.charAt(2), false); // Second colon and third index
+
+    input = this.setExistence('SLICESTEP' + i, !isIndex && "1" === kind.charAt(3), false);
+
+    if (input) {
+      input.appendField(':').setAlign(Blockly.ALIGN_RIGHT);
+    }
+  },
+  updateShape_: function updateShape_() {
+    // Add new inputs.
+    for (var i = 0; i < this.sliceKinds_.length; i++) {
+      this.createSlice_(i, this.sliceKinds_[i]);
     }
-    var code = value + '[' + slices.join(', ') + "]";
-    return [code, Blockly.Python.ORDER_MEMBER];
-};
 
-var isWeirdSliceCase = function(slice) {
-    return (slice.lower == null && slice.upper == null &&
-        slice.step !== null && slice.step._astname === 'NameConstant' &&
-        slice.step.value === Sk.builtin.none.none$);
-}
+    for (var j = 0; j < i; j++) {
+      if (j !== 0) {
+        this.moveInputBefore('COMMA' + j, 'CLOSE_BRACKET');
+      }
 
-BlockMirrorTextToBlocks.prototype.addSliceDim = function (slice, i, values, mutations, node) {
-    let sliceKind = slice._astname;
-    if (sliceKind === "Index") {
-        values['INDEX' + i] = this.convert(slice.value, node);
-        mutations.push("I");
-    } else if (sliceKind === "Slice") {
-        let L = "0", U = "0", S = "0";
-        if (slice.lower !== null) {
-            values['SLICELOWER' + i] = this.convert(slice.lower, node);
-            L = "1";
-        }
-        if (slice.upper !== null) {
-            values['SLICEUPPER' + i] = this.convert(slice.upper, node);
-            U = "1";
+      var kind = this.sliceKinds_[j];
+
+      if (kind.charAt(0) === "I") {
+        this.moveInputBefore('INDEX' + j, 'CLOSE_BRACKET');
+      } else {
+        if (kind.charAt(1) === "1") {
+          this.moveInputBefore("SLICELOWER" + j, 'CLOSE_BRACKET');
         }
-        if (slice.step !== null && !isWeirdSliceCase(slice)) {
-            values['SLICESTEP' + i] = this.convert(slice.step, node);
-            S = "1";
+
+        this.moveInputBefore("SLICECOLON" + j, 'CLOSE_BRACKET');
+
+        if (kind.charAt(2) === "1") {
+          this.moveInputBefore("SLICEUPPER" + j, 'CLOSE_BRACKET');
         }
-        mutations.push("S" + L + U + S);
-    }
-}
 
-BlockMirrorTextToBlocks.prototype['ast_Subscript'] = function (node, parent) {
-    let value = node.value;
-    let slice = node.slice;
-    let ctx = node.ctx;
-
-    let values = {'VALUE': this.convert(value, node)};
-    let mutations = [];
-
-    let sliceKind = slice._astname;
-    if (sliceKind === "ExtSlice") {
-        for (let i = 0; i < slice.dims.length; i += 1) {
-            let dim = slice.dims[i];
-            this.addSliceDim(dim, i, values, mutations, node);
+        if (kind.charAt(3) === "1") {
+          this.moveInputBefore("SLICESTEP" + j, 'CLOSE_BRACKET');
         }
-    } else {
-        this.addSliceDim(slice, 0, values, mutations, node);
+      }
+    } // Remove deleted inputs.
+
+
+    while (this.getInput('TARGET' + i) || this.getInput('SLICECOLON')) {
+      this.removeInput('COMMA' + i, true);
+
+      if (this.getInput('INDEX' + i)) {
+        this.removeInput('INDEX' + i);
+      } else {
+        this.removeInput('SLICELOWER' + i, true);
+        this.removeInput('SLICECOLON' + i, true);
+        this.removeInput('SLICEUPPER' + i, true);
+        this.removeInput('SLICESTEP' + i, true);
+      }
+
+      i++;
     }
-    return BlockMirrorTextToBlocks.create_block("ast_Subscript", node.lineno, {},
-        values, {"inline": "true"}, {"arg": mutations});
-};
-BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_comprehensionFor",
-    "message0": "for %1 in %2",
-    "args0": [
-        {"type": "input_value", "name": "TARGET"},
-        {"type": "input_value", "name": "ITER"}
-    ],
-    "inputsInline": true,
-    "output": "ComprehensionFor",
-    "colour": BlockMirrorTextToBlocks.COLOR.SEQUENCES
-});
+  },
 
-BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_comprehensionIf",
-    "message0": "if %1",
-    "args0": [
-        {"type": "input_value", "name": "TEST"}
-    ],
-    "inputsInline": true,
-    "output": "ComprehensionIf",
-    "colour": BlockMirrorTextToBlocks.COLOR.SEQUENCES
-});
+  /**
+   * Create XML to represent list inputs.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
 
-Blockly.Blocks['ast_Comp_create_with_container'] = {
-    /**
-     * Mutator block for dict container.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.setColour(BlockMirrorTextToBlocks.COLOR.SEQUENCES);
-        this.appendDummyInput()
-            .appendField('Add new comprehensions below');
-        this.appendDummyInput()
-            .appendField('   For clause');
-        this.appendStatementInput('STACK');
-        this.contextMenu = false;
+    for (var i = 0; i < this.sliceKinds_.length; i++) {
+      var parameter = document.createElement('arg');
+      parameter.setAttribute('name', this.sliceKinds_[i]);
+      container.appendChild(parameter);
     }
-};
 
-Blockly.Blocks['ast_Comp_create_with_for'] = {
-    /**
-     * Mutator block for adding items.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.setColour(BlockMirrorTextToBlocks.COLOR.SEQUENCES);
-        this.appendDummyInput()
-            .appendField('For clause');
-        this.setPreviousStatement(true);
-        this.setNextStatement(true);
-        this.contextMenu = false;
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the list inputs.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.sliceKinds_ = [];
+
+    for (var i = 0, childNode; childNode = xmlElement.childNodes[i]; i++) {
+      if (childNode.nodeName.toLowerCase() === 'arg') {
+        this.sliceKinds_.push(childNode.getAttribute('name'));
+      }
     }
+
+    this.updateShape_();
+  }
 };
 
-Blockly.Blocks['ast_Comp_create_with_if'] = {
-    /**
-     * Mutator block for adding items.
-     * @this Blockly.Block
-     */
-    init: function () {
-        this.setColour(BlockMirrorTextToBlocks.COLOR.SEQUENCES);
-        this.appendDummyInput()
-            .appendField('If clause');
-        this.setPreviousStatement(true);
-        this.setNextStatement(true);
-        this.contextMenu = false;
+Blockly.Python['ast_Subscript'] = function (block) {
+  // Create a list with any number of elements of any type.
+  var value = Blockly.Python.valueToCode(block, 'VALUE', Blockly.Python.ORDER_MEMBER) || Blockly.Python.blank;
+  var slices = new Array(block.sliceKinds_.length);
+
+  for (var i = 0; i < block.sliceKinds_.length; i++) {
+    var kind = block.sliceKinds_[i];
+
+    if (kind.charAt(0) === 'I') {
+      slices[i] = Blockly.Python.valueToCode(block, 'INDEX' + i, Blockly.Python.ORDER_MEMBER) || Blockly.Python.blank;
+    } else {
+      slices[i] = "";
+
+      if (kind.charAt(1) === '1') {
+        slices[i] += Blockly.Python.valueToCode(block, 'SLICELOWER' + i, Blockly.Python.ORDER_MEMBER) || Blockly.Python.blank;
+      }
+
+      slices[i] += ":";
+
+      if (kind.charAt(2) === '1') {
+        slices[i] += Blockly.Python.valueToCode(block, 'SLICEUPPER' + i, Blockly.Python.ORDER_MEMBER) || Blockly.Python.blank;
+      }
+
+      if (kind.charAt(3) === '1') {
+        slices[i] += ":" + Blockly.Python.valueToCode(block, 'SLICESTEP' + i, Blockly.Python.ORDER_MEMBER) || Blockly.Python.blank;
+      }
     }
+  }
+
+  var code = value + '[' + slices.join(', ') + "]";
+  return [code, Blockly.Python.ORDER_MEMBER];
 };
 
-BlockMirrorTextToBlocks.COMP_SETTINGS = {
-    'ListComp': {start: '[', end: ']', color: BlockMirrorTextToBlocks.COLOR.LIST},
-    'SetComp': {start: '{', end: '}', color: BlockMirrorTextToBlocks.COLOR.SET},
-    'GeneratorExp': {start: '(', end: ')', color: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'DictComp': {start: '{', end: '}', color: BlockMirrorTextToBlocks.COLOR.DICTIONARY},
+var isWeirdSliceCase = function isWeirdSliceCase(slice) {
+  return slice.lower == null && slice.upper == null && slice.step !== null && slice.step._astname === 'NameConstant' && slice.step.value === Sk.builtin.none.none$;
 };
 
-['ListComp', 'SetComp', 'GeneratorExp', 'DictComp'].forEach(function (kind) {
-    Blockly.Blocks['ast_' + kind] = {
-        /**
-         * Block for creating a dict with any number of elements of any type.
-         * @this Blockly.Block
-         */
-        init: function () {
-            this.setStyle('loop_blocks');
-            this.setColour(BlockMirrorTextToBlocks.COMP_SETTINGS[kind].color);
-            this.itemCount_ = 3;
-            let input = this.appendValueInput("ELT")
-                .appendField(BlockMirrorTextToBlocks.COMP_SETTINGS[kind].start);
-            if (kind === 'DictComp') {
-                input.setCheck('DictPair');
-            }
-            this.appendDummyInput("END_BRACKET")
-                .appendField(BlockMirrorTextToBlocks.COMP_SETTINGS[kind].end);
-            this.updateShape_();
-            this.setOutput(true);
-            this.setMutator(new Blockly.Mutator(['ast_Comp_create_with_for', 'ast_Comp_create_with_if']));
-        },
-        /**
-         * Create XML to represent dict inputs.
-         * @return {!Element} XML storage element.
-         * @this Blockly.Block
-         */
-        mutationToDom: function () {
-            var container = document.createElement('mutation');
-            container.setAttribute('items', this.itemCount_);
-            return container;
-        },
-        /**
-         * Parse XML to restore the dict inputs.
-         * @param {!Element} xmlElement XML storage element.
-         * @this Blockly.Block
-         */
-        domToMutation: function (xmlElement) {
-            this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
-            this.updateShape_();
-        },
-        /**
-         * Populate the mutator's dialog with this block's components.
-         * @param {!Blockly.Workspace} workspace Mutator's workspace.
-         * @return {!Blockly.Block} Root block in mutator.
-         * @this Blockly.Block
-         */
-        decompose: function (workspace) {
-            var containerBlock = workspace.newBlock('ast_Comp_create_with_container');
-            containerBlock.initSvg();
-            var connection = containerBlock.getInput('STACK').connection;
-            let generators = [];
-            for (var i = 1; i < this.itemCount_; i++) {
-                let generator = this.getInput('GENERATOR' + i).connection;
-                let createName;
-                if (generator.targetConnection.getSourceBlock().type === 'ast_comprehensionIf') {
-                    createName = 'ast_Comp_create_with_if';
-                } else if (generator.targetConnection.getSourceBlock().type === 'ast_comprehensionFor') {
-                    createName = 'ast_Comp_create_with_for';
-                } else {
-                    throw Error("Unknown block type: " + generator.targetConnection.getSourceBlock().type);
-                }
-                var itemBlock = workspace.newBlock(createName);
-                itemBlock.initSvg();
-                connection.connect(itemBlock.previousConnection);
-                connection = itemBlock.nextConnection;
-                generators.push(itemBlock);
-            }
-            return containerBlock;
-        },
-        /**
-         * Reconfigure this block based on the mutator dialog's components.
-         * @param {!Blockly.Block} containerBlock Root block in mutator.
-         * @this Blockly.Block
-         */
-        compose: function (containerBlock) {
-            var itemBlock = containerBlock.getInputTargetBlock('STACK');
-            // Count number of inputs.
-            var connections = [containerBlock.valueConnection_];
-            let blockTypes = ['ast_Comp_create_with_for'];
-            while (itemBlock) {
-                connections.push(itemBlock.valueConnection_);
-                blockTypes.push(itemBlock.type);
-                itemBlock = itemBlock.nextConnection &&
-                    itemBlock.nextConnection.targetBlock();
-            }
-            // Disconnect any children that don't belong.
-            for (var i = 1; i < this.itemCount_; i++) {
-                var connection = this.getInput('GENERATOR' + i).connection.targetConnection;
-                if (connection && connections.indexOf(connection) === -1) {
-                    let connectedBlock = connection.getSourceBlock();
-                    if (connectedBlock.type === 'ast_comprehensionIf') {
-                        let testField = connectedBlock.getInput('TEST');
-                        if (testField.connection.targetConnection) {
-                            testField.connection.targetConnection.getSourceBlock().unplug(true);
-                        }
-                    } else if (connectedBlock.type === 'ast_comprehensionFor') {
-                        let iterField = connectedBlock.getInput('ITER');
-                        if (iterField.connection.targetConnection) {
-                            iterField.connection.targetConnection.getSourceBlock().unplug(true);
-                        }
-                        let targetField = connectedBlock.getInput('TARGET');
-                        if (targetField.connection.targetConnection) {
-                            targetField.connection.targetConnection.getSourceBlock().unplug(true);
-                        }
-                    } else {
-                        throw Error("Unknown block type: " + connectedBlock.type);
-                    }
-                    connection.disconnect();
-                    connection.getSourceBlock().dispose();
-                }
-            }
-            this.itemCount_ = connections.length;
-            this.updateShape_();
-            // Reconnect any child blocks.
-            for (var i = 1; i < this.itemCount_; i++) {
-                Blockly.Mutator.reconnect(connections[i], this, 'GENERATOR' + i);
-                // TODO: glitch when inserting into middle, deletes children values
-                if (!connections[i]) {
-                    let createName;
-                    if (blockTypes[i] === 'ast_Comp_create_with_if') {
-                        createName = 'ast_comprehensionIf';
-                    } else if (blockTypes[i] === 'ast_Comp_create_with_for') {
-                        createName = 'ast_comprehensionFor';
-                    } else {
-                        throw Error("Unknown block type: " + blockTypes[i]);
-                    }
-                    let itemBlock = this.workspace.newBlock(createName);
-                    itemBlock.setDeletable(false);
-                    itemBlock.setMovable(false);
-                    itemBlock.initSvg();
-                    this.getInput('GENERATOR' + i).connection.connect(itemBlock.outputConnection);
-                    itemBlock.render();
-                    //this.get(itemBlock, 'ADD'+i)
-                }
-            }
-        },
-        /**
-         * Store pointers to any connected child blocks.
-         * @param {!Blockly.Block} containerBlock Root block in mutator.
-         * @this Blockly.Block
-         */
-        saveConnections: function (containerBlock) {
-            containerBlock.valueConnection_ = this.getInput('GENERATOR0').connection.targetConnection;
-            var itemBlock = containerBlock.getInputTargetBlock('STACK');
-            var i = 1;
-            while (itemBlock) {
-                var input = this.getInput('GENERATOR' + i);
-                itemBlock.valueConnection_ = input && input.connection.targetConnection;
-                i++;
-                itemBlock = itemBlock.nextConnection &&
-                    itemBlock.nextConnection.targetBlock();
-            }
-        },
-        /**
-         * Modify this block to have the correct number of inputs.
-         * @private
-         * @this Blockly.Block
-         */
-        updateShape_: function () {
-            // Add new inputs.
-            for (var i = 0; i < this.itemCount_; i++) {
-                if (!this.getInput('GENERATOR' + i)) {
-                    let input = this.appendValueInput('GENERATOR' + i);
-                    if (i === 0) {
-                        input.setCheck("ComprehensionFor");
-                    } else {
-                        input.setCheck(["ComprehensionFor", "ComprehensionIf"]);
-                    }
-                    this.moveInputBefore('GENERATOR' + i, 'END_BRACKET');
-                }
-            }
-            // Remove deleted inputs.
-            while (this.getInput('GENERATOR' + i)) {
-                this.removeInput('GENERATOR' + i);
-                i++;
-            }
-        }
-    };
+BlockMirrorTextToBlocks.prototype.addSliceDim = function (slice, i, values, mutations, node) {
+  var sliceKind = slice._astname;
 
-    Blockly.Python['ast_' + kind] = function (block) {
-        // elt
-        let elt;
-        if (kind === 'DictComp') {
-            let child = block.getInputTargetBlock('ELT');
-            if (child === null || child.type !== 'ast_DictItem') {
-                elt = (Blockly.Python.blank + ": " + Blockly.Python.blank);
-            } else {
-                let key = Blockly.Python.valueToCode(child, 'KEY', Blockly.Python.ORDER_NONE) ||
-                    Blockly.Python.blank;
-                let value = Blockly.Python.valueToCode(child, 'VALUE', Blockly.Python.ORDER_NONE) ||
-                    Blockly.Python.blank;
-                elt = (key + ": " + value);
-            }
-        } else {
-            elt = Blockly.Python.valueToCode(block, 'ELT', Blockly.Python.ORDER_NONE) ||
-                Blockly.Python.blank;
-        }
-        // generators
-        let elements = new Array(block.itemCount_);
-        const BAD_DEFAULT = (elt + " for " + Blockly.Python.blank + " in" + Blockly.Python.blank);
-        for (var i = 0; i < block.itemCount_; i++) {
-            let child = block.getInputTargetBlock('GENERATOR' + i);
-            if (child === null) {
-                elements[i] = BAD_DEFAULT;
-            } else if (child.type === 'ast_comprehensionIf') {
-                let test = Blockly.Python.valueToCode(child, 'TEST', Blockly.Python.ORDER_NONE) ||
-                    Blockly.Python.blank;
-                elements[i] = ("if " + test);
-            } else if (child.type === 'ast_comprehensionFor') {
-                let target = Blockly.Python.valueToCode(child, 'TARGET', Blockly.Python.ORDER_NONE) ||
-                    Blockly.Python.blank;
-                let iter = Blockly.Python.valueToCode(child, 'ITER', Blockly.Python.ORDER_NONE) ||
-                    Blockly.Python.blank;
-                elements[i] = ("for " + target + " in " + iter);
-            } else {
-                elements[i] = BAD_DEFAULT;
-            }
-        }
-        // Put it all together
-        let code = BlockMirrorTextToBlocks.COMP_SETTINGS[kind].start
-            + elt + " " + elements.join(' ') +
-            BlockMirrorTextToBlocks.COMP_SETTINGS[kind].end;
-        return [code, Blockly.Python.ORDER_ATOMIC];
-    };
+  if (sliceKind === "Index") {
+    values['INDEX' + i] = this.convert(slice.value, node);
+    mutations.push("I");
+  } else if (sliceKind === "Slice") {
+    var L = "0",
+        U = "0",
+        S = "0";
 
-    BlockMirrorTextToBlocks.prototype['ast_' + kind] = function (node, parent) {
-        let generators = node.generators;
-
-        let elements = {};
-        if (kind === 'DictComp') {
-            let key = node.key;
-            let value = node.value;
-            elements["ELT"] = BlockMirrorTextToBlocks.create_block("ast_DictItem", node.lineno, {},
-                {
-                    "KEY": this.convert(key, node),
-                    "VALUE": this.convert(value, node)
-                },
-                {
-                    "inline": "true",
-                    'deletable': "false",
-                    "movable": "false"
-                });
-        } else {
-            let elt = node.elt;
-            elements["ELT"] = this.convert(elt, node);
-        }
-        let DEFAULT_SETTINGS = {
-            "inline": "true",
-            'deletable': "false",
-            "movable": "false"
-        };
-        let g = 0;
-        for (let i = 0; i < generators.length; i++) {
-            let target = generators[i].target;
-            let iter = generators[i].iter;
-            let ifs = generators[i].ifs;
-            let is_async = generators[i].is_async;
-            elements["GENERATOR" + g] = BlockMirrorTextToBlocks.create_block("ast_comprehensionFor", node.lineno, {},
-                {
-                    "ITER": this.convert(iter, node),
-                    "TARGET": this.convert(target, node)
-                },
-                DEFAULT_SETTINGS);
-            g += 1;
-            if (ifs) {
-                for (let j = 0; j < ifs.length; j++) {
-                    elements["GENERATOR" + g] = BlockMirrorTextToBlocks.create_block("ast_comprehensionIf", node.lineno, {},
-                        {
-                            "TEST": this.convert(ifs[j], node)
-                        },
-                        DEFAULT_SETTINGS);
-                    g += 1;
-                }
-            }
-        }
+    if (slice.lower !== null) {
+      values['SLICELOWER' + i] = this.convert(slice.lower, node);
+      L = "1";
+    }
+
+    if (slice.upper !== null) {
+      values['SLICEUPPER' + i] = this.convert(slice.upper, node);
+      U = "1";
+    }
+
+    if (slice.step !== null && !isWeirdSliceCase(slice)) {
+      values['SLICESTEP' + i] = this.convert(slice.step, node);
+      S = "1";
+    }
+
+    mutations.push("S" + L + U + S);
+  }
+};
 
-        return BlockMirrorTextToBlocks.create_block("ast_" + kind, node.lineno, {},
-            elements,
-            {
-                "inline": "false"
-            }, {
-                "@items": g
-            });
-    };
+BlockMirrorTextToBlocks.prototype['ast_Subscript'] = function (node, parent) {
+  var value = node.value;
+  var slice = node.slice;
+  var ctx = node.ctx;
+  var values = {
+    'VALUE': this.convert(value, node)
+  };
+  var mutations = [];
+  var sliceKind = slice._astname;
+
+  if (sliceKind === "ExtSlice") {
+    for (var i = 0; i < slice.dims.length; i += 1) {
+      var dim = slice.dims[i];
+      this.addSliceDim(dim, i, values, mutations, node);
+    }
+  } else {
+    this.addSliceDim(slice, 0, values, mutations, node);
+  }
 
-});
-// TODO: what if a user deletes a parameter through the context menu?
+  return BlockMirrorTextToBlocks.create_block("ast_Subscript", node.lineno, {}, values, {
+    "inline": "true"
+  }, {
+    "arg": mutations
+  });
+};
 
-// The mutator container
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_FunctionHeaderMutator",
-    "message0": "Setup parameters below: %1 %2 returns %3",
-    "args0": [
-        {"type": "input_dummy"},
-        {"type": "input_statement", "name": "STACK", "align": "RIGHT"},
-        {"type": "field_checkbox", "name": "RETURNS", "checked": true, "align": "RIGHT"}
-    ],
-    "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
-    "enableContextMenu": false
+  "type": "ast_comprehensionFor",
+  "message0": "for %1 in %2",
+  "args0": [{
+    "type": "input_value",
+    "name": "TARGET"
+  }, {
+    "type": "input_value",
+    "name": "ITER"
+  }],
+  "inputsInline": true,
+  "output": "ComprehensionFor",
+  "colour": BlockMirrorTextToBlocks.COLOR.SEQUENCES
 });
-
-// The elements you can put into the mutator
-[
-    ['Parameter', 'Parameter', '', false, false],
-    ['ParameterType', 'Parameter with type', '', true, false],
-    ['ParameterDefault', 'Parameter with default value', '', false, true],
-    ['ParameterDefaultType', 'Parameter with type and default value', '', true, true],
-    ['ParameterVararg', 'Variable length parameter', '*', false, false],
-    ['ParameterVarargType', 'Variable length parameter with type', '*', true, false],
-    ['ParameterKwarg', 'Keyworded Variable length parameter', '**', false],
-    ['ParameterKwargType', 'Keyworded Variable length parameter with type', '**', true, false],
-].forEach(function (parameterTypeTuple) {
-    let parameterType = parameterTypeTuple[0],
-        parameterDescription = parameterTypeTuple[1],
-        parameterPrefix = parameterTypeTuple[2],
-        parameterTyped = parameterTypeTuple[3],
-        parameterDefault = parameterTypeTuple[4];
-    BlockMirrorTextToBlocks.BLOCKS.push({
-        "type": "ast_FunctionMutant" + parameterType,
-        "message0": parameterDescription,
-        "previousStatement": null,
-        "nextStatement": null,
-        "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
-        "enableContextMenu": false
-    });
-    let realParameterBlock = {
-        "type": "ast_Function" + parameterType,
-        "output": "Parameter",
-        "message0": parameterPrefix + (parameterPrefix ? ' ' : '') + "%1",
-        "args0": [{"type": "field_variable", "name": "NAME", "variable": "param"}],
-        "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
-        "enableContextMenu": false,
-        "inputsInline": (parameterTyped && parameterDefault),
-    };
-    if (parameterTyped) {
-        realParameterBlock['message0'] += " : %2";
-        realParameterBlock['args0'].push({"type": "input_value", "name": "TYPE"});
-    }
-    if (parameterDefault) {
-        realParameterBlock['message0'] += " = %" + (parameterTyped ? 3 : 2);
-        realParameterBlock['args0'].push({"type": "input_value", "name": "DEFAULT"});
-    }
-    BlockMirrorTextToBlocks.BLOCKS.push(realParameterBlock);
-
-    Blockly.Python["ast_Function" + parameterType] = function (block) {
-        let name = Blockly.Python.variableDB_.getName(block.getFieldValue('NAME'),
-            Blockly.Variables.NAME_TYPE);
-        let typed = "";
-        if (parameterTyped) {
-            typed = ": " + Blockly.Python.valueToCode(block, 'TYPE',
-                Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-        }
-        let defaulted = "";
-        if (parameterDefault) {
-            defaulted = "=" + Blockly.Python.valueToCode(block, 'DEFAULT',
-                Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-        }
-        return [parameterPrefix + name + typed + defaulted, Blockly.Python.ORDER_ATOMIC];
-    }
+BlockMirrorTextToBlocks.BLOCKS.push({
+  "type": "ast_comprehensionIf",
+  "message0": "if %1",
+  "args0": [{
+    "type": "input_value",
+    "name": "TEST"
+  }],
+  "inputsInline": true,
+  "output": "ComprehensionIf",
+  "colour": BlockMirrorTextToBlocks.COLOR.SEQUENCES
 });
-
-// TODO: Figure out an elegant "complexity" flag feature to allow different levels of Mutators
-
-Blockly.Blocks['ast_FunctionDef'] = {
-    init: function () {
-        this.appendDummyInput()
-            .appendField("define")
-            .appendField(new Blockly.FieldTextInput("function"), "NAME");
-        this.decoratorsCount_ = 0;
-        this.parametersCount_ = 0;
-        this.hasReturn_ = false;
-        this.mutatorComplexity_ = 0;
-        this.appendStatementInput("BODY")
-            .setCheck(null);
-        this.setInputsInline(false);
-        this.setPreviousStatement(true, null);
-        this.setNextStatement(true, null);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.FUNCTIONS);
-        this.updateShape_();
-        this.setMutator(new Blockly.Mutator(['ast_FunctionMutantParameter',
-            'ast_FunctionMutantParameterType']));
+Blockly.Blocks['ast_Comp_create_with_container'] = {
+  /**
+   * Mutator block for dict container.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.setColour(BlockMirrorTextToBlocks.COLOR.SEQUENCES);
+    this.appendDummyInput().appendField('Add new comprehensions below');
+    this.appendDummyInput().appendField('   For clause');
+    this.appendStatementInput('STACK');
+    this.contextMenu = false;
+  }
+};
+Blockly.Blocks['ast_Comp_create_with_for'] = {
+  /**
+   * Mutator block for adding items.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.setColour(BlockMirrorTextToBlocks.COLOR.SEQUENCES);
+    this.appendDummyInput().appendField('For clause');
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+    this.contextMenu = false;
+  }
+};
+Blockly.Blocks['ast_Comp_create_with_if'] = {
+  /**
+   * Mutator block for adding items.
+   * @this Blockly.Block
+   */
+  init: function init() {
+    this.setColour(BlockMirrorTextToBlocks.COLOR.SEQUENCES);
+    this.appendDummyInput().appendField('If clause');
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+    this.contextMenu = false;
+  }
+};
+BlockMirrorTextToBlocks.COMP_SETTINGS = {
+  'ListComp': {
+    start: '[',
+    end: ']',
+    color: BlockMirrorTextToBlocks.COLOR.LIST
+  },
+  'SetComp': {
+    start: '{',
+    end: '}',
+    color: BlockMirrorTextToBlocks.COLOR.SET
+  },
+  'GeneratorExp': {
+    start: '(',
+    end: ')',
+    color: BlockMirrorTextToBlocks.COLOR.SEQUENCES
+  },
+  'DictComp': {
+    start: '{',
+    end: '}',
+    color: BlockMirrorTextToBlocks.COLOR.DICTIONARY
+  }
+};
+['ListComp', 'SetComp', 'GeneratorExp', 'DictComp'].forEach(function (kind) {
+  Blockly.Blocks['ast_' + kind] = {
+    /**
+     * Block for creating a dict with any number of elements of any type.
+     * @this Blockly.Block
+     */
+    init: function init() {
+      this.setStyle('loop_blocks');
+      this.setColour(BlockMirrorTextToBlocks.COMP_SETTINGS[kind].color);
+      this.itemCount_ = 3;
+      var input = this.appendValueInput("ELT").appendField(BlockMirrorTextToBlocks.COMP_SETTINGS[kind].start);
+
+      if (kind === 'DictComp') {
+        input.setCheck('DictPair');
+      }
+
+      this.appendDummyInput("END_BRACKET").appendField(BlockMirrorTextToBlocks.COMP_SETTINGS[kind].end);
+      this.updateShape_();
+      this.setOutput(true);
+      this.setMutator(new Blockly.Mutator(['ast_Comp_create_with_for', 'ast_Comp_create_with_if']));
     },
+
     /**
-     * Create XML to represent list inputs.
+     * Create XML to represent dict inputs.
      * @return {!Element} XML storage element.
      * @this Blockly.Block
      */
-    mutationToDom: function () {
-        var container = document.createElement('mutation');
-        container.setAttribute('decorators', this.decoratorsCount_);
-        container.setAttribute('parameters', this.parametersCount_);
-        container.setAttribute('returns', this.hasReturn_);
-        return container;
+    mutationToDom: function mutationToDom() {
+      var container = document.createElement('mutation');
+      container.setAttribute('items', this.itemCount_);
+      return container;
     },
+
     /**
-     * Parse XML to restore the list inputs.
+     * Parse XML to restore the dict inputs.
      * @param {!Element} xmlElement XML storage element.
      * @this Blockly.Block
      */
-    domToMutation: function (xmlElement) {
-        this.decoratorsCount_ = parseInt(xmlElement.getAttribute('decorators'), 10);
-        this.parametersCount_ = parseInt(xmlElement.getAttribute('parameters'), 10);
-        this.hasReturn_ = "true" === xmlElement.getAttribute('returns');
-        this.updateShape_();
-    },
-    setReturnAnnotation_: function (status) {
-        let currentReturn = this.getInput('RETURNS');
-        if (status) {
-            if (!currentReturn) {
-                this.appendValueInput("RETURNS")
-                    .setCheck(null)
-                    .setAlign(Blockly.ALIGN_RIGHT)
-                    .appendField("returns");
-            }
-            this.moveInputBefore('RETURNS', 'BODY');
-        } else if (!status && currentReturn) {
-            this.removeInput('RETURNS');
-        }
-        this.hasReturn_ = status;
-    },
-    updateShape_: function () {
-        // Set up decorators and parameters
-        let block = this;
-        let position = 1;
-        [
-            ['DECORATOR', 'decoratorsCount_', null, 'decorated by'],
-            ['PARAMETER', 'parametersCount_', 'Parameter', 'parameters:']
-        ].forEach(function (childTypeTuple) {
-            let childTypeName = childTypeTuple[0],
-                countVariable = childTypeTuple[1],
-                inputCheck = childTypeTuple[2],
-                childTypeMessage = childTypeTuple[3];
-            for (var i = 0; i < block[countVariable]; i++) {
-                if (!block.getInput(childTypeName + i)) {
-                    let input = block.appendValueInput(childTypeName + i)
-                        .setCheck(inputCheck)
-                        .setAlign(Blockly.ALIGN_RIGHT);
-                    if (i === 0) {
-                        input.appendField(childTypeMessage);
-                    }
-                }
-                block.moveInputBefore(childTypeName + i, 'BODY');
-            }
-            // Remove deleted inputs.
-            while (block.getInput(childTypeName + i)) {
-                block.removeInput(childTypeName + i);
-                i++;
-            }
-        });
-        // Set up optional Returns annotation
-        this.setReturnAnnotation_(this.hasReturn_);
+    domToMutation: function domToMutation(xmlElement) {
+      this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
+      this.updateShape_();
     },
+
     /**
      * Populate the mutator's dialog with this block's components.
      * @param {!Blockly.Workspace} workspace Mutator's workspace.
      * @return {!Blockly.Block} Root block in mutator.
      * @this Blockly.Block
      */
-    decompose: function (workspace) {
-        var containerBlock = workspace.newBlock('ast_FunctionHeaderMutator');
-        containerBlock.initSvg();
-
-        // Check/uncheck the allow statement box.
-        if (this.getInput('RETURNS')) {
-            containerBlock.setFieldValue(
-                this.hasReturn_ ? 'TRUE' : 'FALSE', 'RETURNS');
+    decompose: function decompose(workspace) {
+      var containerBlock = workspace.newBlock('ast_Comp_create_with_container');
+      containerBlock.initSvg();
+      var connection = containerBlock.getInput('STACK').connection;
+      var generators = [];
+
+      for (var i = 1; i < this.itemCount_; i++) {
+        var generator = this.getInput('GENERATOR' + i).connection;
+        var createName = void 0;
+
+        if (generator.targetConnection.getSourceBlock().type === 'ast_comprehensionIf') {
+          createName = 'ast_Comp_create_with_if';
+        } else if (generator.targetConnection.getSourceBlock().type === 'ast_comprehensionFor') {
+          createName = 'ast_Comp_create_with_for';
         } else {
-            // TODO: set up "canReturns" for lambda mode
-            //containerBlock.getField('RETURNS').setVisible(false);
+          throw Error("Unknown block type: " + generator.targetConnection.getSourceBlock().type);
         }
 
-        // Set up parameters
-        var connection = containerBlock.getInput('STACK').connection;
-        let parameters = [];
-        for (var i = 0; i < this.parametersCount_; i++) {
-            let parameter = this.getInput('PARAMETER' + i).connection;
-            let sourceType = parameter.targetConnection.getSourceBlock().type;
-            let createName = 'ast_FunctionMutant' + sourceType.substring('ast_Function'.length);
-            var itemBlock = workspace.newBlock(createName);
-            itemBlock.initSvg();
-            connection.connect(itemBlock.previousConnection);
-            connection = itemBlock.nextConnection;
-            parameters.push(itemBlock);
-        }
-        return containerBlock;
+        var itemBlock = workspace.newBlock(createName);
+        itemBlock.initSvg();
+        connection.connect(itemBlock.previousConnection);
+        connection = itemBlock.nextConnection;
+        generators.push(itemBlock);
+      }
+
+      return containerBlock;
     },
+
     /**
      * Reconfigure this block based on the mutator dialog's components.
      * @param {!Blockly.Block} containerBlock Root block in mutator.
      * @this Blockly.Block
      */
-    compose: function (containerBlock) {
-        var itemBlock = containerBlock.getInputTargetBlock('STACK');
-        // Count number of inputs.
-        var connections = [];
-        let blockTypes = [];
-        while (itemBlock) {
-            connections.push(itemBlock.valueConnection_);
-            blockTypes.push(itemBlock.type);
-            itemBlock = itemBlock.nextConnection &&
-                itemBlock.nextConnection.targetBlock();
-        }
-        // Disconnect any children that don't belong.
-        for (let i = 0; i < this.parametersCount_; i++) {
-            var connection = this.getInput('PARAMETER' + i).connection.targetConnection;
-            if (connection && connections.indexOf(connection) === -1) {
-                // Disconnect all children of this block
-                let connectedBlock = connection.getSourceBlock();
-                for (let j = 0; j < connectedBlock.inputList.length; j++) {
-                    let field = connectedBlock.inputList[j].connection;
-                    if (field && field.targetConnection) {
-                        field.targetConnection.getSourceBlock().unplug(true);
-                    }
-                }
-                connection.disconnect();
-                connection.getSourceBlock().dispose();
+    compose: function compose(containerBlock) {
+      var itemBlock = containerBlock.getInputTargetBlock('STACK'); // Count number of inputs.
+
+      var connections = [containerBlock.valueConnection_];
+      var blockTypes = ['ast_Comp_create_with_for'];
+
+      while (itemBlock) {
+        connections.push(itemBlock.valueConnection_);
+        blockTypes.push(itemBlock.type);
+        itemBlock = itemBlock.nextConnection && itemBlock.nextConnection.targetBlock();
+      } // Disconnect any children that don't belong.
+
+
+      for (var i = 1; i < this.itemCount_; i++) {
+        var connection = this.getInput('GENERATOR' + i).connection.targetConnection;
+
+        if (connection && connections.indexOf(connection) === -1) {
+          var connectedBlock = connection.getSourceBlock();
+
+          if (connectedBlock.type === 'ast_comprehensionIf') {
+            var testField = connectedBlock.getInput('TEST');
+
+            if (testField.connection.targetConnection) {
+              testField.connection.targetConnection.getSourceBlock().unplug(true);
             }
-        }
-        this.parametersCount_ = connections.length;
-        this.updateShape_();
-        // Reconnect any child blocks.
-        for (let i = 0; i < this.parametersCount_; i++) {
-            Blockly.Mutator.reconnect(connections[i], this, 'PARAMETER' + i);
-            if (!connections[i]) {
-                let createName = 'ast_Function' + blockTypes[i].substring('ast_FunctionMutant'.length);
-                let itemBlock = this.workspace.newBlock(createName);
-                itemBlock.setDeletable(false);
-                itemBlock.setMovable(false);
-                itemBlock.initSvg();
-                this.getInput('PARAMETER' + i).connection.connect(itemBlock.outputConnection);
-                itemBlock.render();
-                //this.get(itemBlock, 'ADD'+i)
+          } else if (connectedBlock.type === 'ast_comprehensionFor') {
+            var iterField = connectedBlock.getInput('ITER');
+
+            if (iterField.connection.targetConnection) {
+              iterField.connection.targetConnection.getSourceBlock().unplug(true);
             }
-        }
-        // Show/hide the returns annotation
-        let hasReturns = containerBlock.getFieldValue('RETURNS');
-        if (hasReturns !== null) {
-            hasReturns = hasReturns === 'TRUE';
-            if (this.hasReturn_ != hasReturns) {
-                if (hasReturns) {
-                    this.setReturnAnnotation_(true);
-                    Blockly.Mutator.reconnect(this.returnConnection_, this, 'RETURNS');
-                    this.returnConnection_ = null;
-                } else {
-                    let returnConnection = this.getInput('RETURNS').connection
-                    this.returnConnection_ = returnConnection.targetConnection;
-                    if (this.returnConnection_) {
-                        let returnBlock = returnConnection.targetBlock();
-                        returnBlock.unplug();
-                        returnBlock.bumpNeighbours_();
-                    }
-                    this.setReturnAnnotation_(false);
-                }
+
+            var targetField = connectedBlock.getInput('TARGET');
+
+            if (targetField.connection.targetConnection) {
+              targetField.connection.targetConnection.getSourceBlock().unplug(true);
             }
+          } else {
+            throw Error("Unknown block type: " + connectedBlock.type);
+          }
+
+          connection.disconnect();
+          connection.getSourceBlock().dispose();
+        }
+      }
+
+      this.itemCount_ = connections.length;
+      this.updateShape_(); // Reconnect any child blocks.
+
+      for (var i = 1; i < this.itemCount_; i++) {
+        Blockly.Mutator.reconnect(connections[i], this, 'GENERATOR' + i); // TODO: glitch when inserting into middle, deletes children values
+
+        if (!connections[i]) {
+          var createName = void 0;
+
+          if (blockTypes[i] === 'ast_Comp_create_with_if') {
+            createName = 'ast_comprehensionIf';
+          } else if (blockTypes[i] === 'ast_Comp_create_with_for') {
+            createName = 'ast_comprehensionFor';
+          } else {
+            throw Error("Unknown block type: " + blockTypes[i]);
+          }
+
+          var _itemBlock2 = this.workspace.newBlock(createName);
+
+          _itemBlock2.setDeletable(false);
+
+          _itemBlock2.setMovable(false);
+
+          _itemBlock2.initSvg();
+
+          this.getInput('GENERATOR' + i).connection.connect(_itemBlock2.outputConnection);
+
+          _itemBlock2.render(); //this.get(itemBlock, 'ADD'+i)
+
         }
+      }
     },
+
     /**
      * Store pointers to any connected child blocks.
      * @param {!Blockly.Block} containerBlock Root block in mutator.
      * @this Blockly.Block
      */
-    saveConnections: function (containerBlock) {
-        var itemBlock = containerBlock.getInputTargetBlock('STACK');
-        var i = 0;
-        while (itemBlock) {
-            var input = this.getInput('PARAMETER' + i);
-            itemBlock.valueConnection_ = input && input.connection.targetConnection;
-            i++;
-            itemBlock = itemBlock.nextConnection &&
-                itemBlock.nextConnection.targetBlock();
-        }
+    saveConnections: function saveConnections(containerBlock) {
+      containerBlock.valueConnection_ = this.getInput('GENERATOR0').connection.targetConnection;
+      var itemBlock = containerBlock.getInputTargetBlock('STACK');
+      var i = 1;
+
+      while (itemBlock) {
+        var input = this.getInput('GENERATOR' + i);
+        itemBlock.valueConnection_ = input && input.connection.targetConnection;
+        i++;
+        itemBlock = itemBlock.nextConnection && itemBlock.nextConnection.targetBlock();
+      }
     },
-};
 
-Blockly.Python['ast_FunctionDef'] = function (block) {
-    // Name
-    let name = Blockly.Python.variableDB_.getName(block.getFieldValue('NAME'), Blockly.Variables.NAME_TYPE);
-    // Decorators
-    let decorators = new Array(block.decoratorsCount_);
-    for (let i = 0; i < block.decoratorsCount_; i++) {
-        let decorator = (Blockly.Python.valueToCode(block, 'DECORATOR' + i, Blockly.Python.ORDER_NONE) ||
-            Blockly.Python.blank);
-        decorators[i] = "@" + decorator + "\n";
-    }
-    // Parameters
-    let parameters = new Array(block.parametersCount_);
-    for (let i = 0; i < block.parametersCount_; i++) {
-        parameters[i] = (Blockly.Python.valueToCode(block, 'PARAMETER' + i, Blockly.Python.ORDER_NONE) ||
-            Blockly.Python.blank);
-    }
-    // Return annotation
-    let returns = "";
-    if (this.hasReturn_) {
-        returns = " -> " + Blockly.Python.valueToCode(block, 'RETURNS', Blockly.Python.ORDER_NONE) ||
-            Blockly.Python.blank;
-    }
-    // Body
-    let body = Blockly.Python.statementToCode(block, 'BODY') || Blockly.Python.PASS;
-    return decorators.join('') + "def " + name + "(" + parameters.join(', ') + ")" + returns + ":\n" + body;
-};
+    /**
+     * Modify this block to have the correct number of inputs.
+     * @private
+     * @this Blockly.Block
+     */
+    updateShape_: function updateShape_() {
+      // Add new inputs.
+      for (var i = 0; i < this.itemCount_; i++) {
+        if (!this.getInput('GENERATOR' + i)) {
+          var input = this.appendValueInput('GENERATOR' + i);
 
-BlockMirrorTextToBlocks.prototype.parseArg = function (arg, type, lineno, values, node) {
-    let settings = {
-        "movable": false,
-        "deletable": false
-    };
-    if (arg.annotation === null) {
-        return BlockMirrorTextToBlocks.create_block(type,
-            lineno, {'NAME': Sk.ffi.remapToJs(arg.arg)}, values, settings);
+          if (i === 0) {
+            input.setCheck("ComprehensionFor");
+          } else {
+            input.setCheck(["ComprehensionFor", "ComprehensionIf"]);
+          }
+
+          this.moveInputBefore('GENERATOR' + i, 'END_BRACKET');
+        }
+      } // Remove deleted inputs.
+
+
+      while (this.getInput('GENERATOR' + i)) {
+        this.removeInput('GENERATOR' + i);
+        i++;
+      }
+    }
+  };
+
+  Blockly.Python['ast_' + kind] = function (block) {
+    // elt
+    var elt;
+
+    if (kind === 'DictComp') {
+      var child = block.getInputTargetBlock('ELT');
+
+      if (child === null || child.type !== 'ast_DictItem') {
+        elt = Blockly.Python.blank + ": " + Blockly.Python.blank;
+      } else {
+        var key = Blockly.Python.valueToCode(child, 'KEY', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+        var value = Blockly.Python.valueToCode(child, 'VALUE', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+        elt = key + ": " + value;
+      }
+    } else {
+      elt = Blockly.Python.valueToCode(block, 'ELT', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+    } // generators
+
+
+    var elements = new Array(block.itemCount_);
+    var BAD_DEFAULT = elt + " for " + Blockly.Python.blank + " in" + Blockly.Python.blank;
+
+    for (var i = 0; i < block.itemCount_; i++) {
+      var _child = block.getInputTargetBlock('GENERATOR' + i);
+
+      if (_child === null) {
+        elements[i] = BAD_DEFAULT;
+      } else if (_child.type === 'ast_comprehensionIf') {
+        var test = Blockly.Python.valueToCode(_child, 'TEST', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+        elements[i] = "if " + test;
+      } else if (_child.type === 'ast_comprehensionFor') {
+        var target = Blockly.Python.valueToCode(_child, 'TARGET', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+        var iter = Blockly.Python.valueToCode(_child, 'ITER', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+        elements[i] = "for " + target + " in " + iter;
+      } else {
+        elements[i] = BAD_DEFAULT;
+      }
+    } // Put it all together
+
+
+    var code = BlockMirrorTextToBlocks.COMP_SETTINGS[kind].start + elt + " " + elements.join(' ') + BlockMirrorTextToBlocks.COMP_SETTINGS[kind].end;
+    return [code, Blockly.Python.ORDER_ATOMIC];
+  };
+
+  BlockMirrorTextToBlocks.prototype['ast_' + kind] = function (node, parent) {
+    var generators = node.generators;
+    var elements = {};
+
+    if (kind === 'DictComp') {
+      var key = node.key;
+      var value = node.value;
+      elements["ELT"] = BlockMirrorTextToBlocks.create_block("ast_DictItem", node.lineno, {}, {
+        "KEY": this.convert(key, node),
+        "VALUE": this.convert(value, node)
+      }, {
+        "inline": "true",
+        'deletable': "false",
+        "movable": "false"
+      });
     } else {
-        values['TYPE'] = this.convert(arg.annotation, node);
-        return BlockMirrorTextToBlocks.create_block(type + "Type",
-            lineno, {'NAME': Sk.ffi.remapToJs(arg.arg)}, values, settings);
+      var elt = node.elt;
+      elements["ELT"] = this.convert(elt, node);
     }
-};
 
-BlockMirrorTextToBlocks.prototype.parseArgs = function (args, values, lineno, node) {
-    let positional = args.args,
-        vararg = args.vararg,
-        kwonlyargs = args.kwonlyargs,
-        kwarg = args.kwarg,
-        defaults = args.defaults,
-        kw_defaults = args.kw_defaults;
-    let totalArgs = 0;
-    // args (positional)
-    if (positional !== null) {
-        // "If there are fewer defaults, they correspond to the last n arguments."
-        let defaultOffset = defaults ? defaults.length - positional.length : 0;
-        for (let i = 0; i < positional.length; i++) {
-            let childValues = {};
-            let type = 'ast_FunctionParameter';
-            if (defaults[defaultOffset + i]) {
-                childValues['DEFAULT'] = this.convert(defaults[defaultOffset + i], node);
-                type += "Default";
-            }
-            values['PARAMETER' + totalArgs] = this.parseArg(positional[i], type, lineno, childValues, node);
-            totalArgs += 1;
+    var DEFAULT_SETTINGS = {
+      "inline": "true",
+      'deletable': "false",
+      "movable": "false"
+    };
+    var g = 0;
+
+    for (var i = 0; i < generators.length; i++) {
+      var target = generators[i].target;
+      var iter = generators[i].iter;
+      var ifs = generators[i].ifs;
+      var is_async = generators[i].is_async;
+      elements["GENERATOR" + g] = BlockMirrorTextToBlocks.create_block("ast_comprehensionFor", node.lineno, {}, {
+        "ITER": this.convert(iter, node),
+        "TARGET": this.convert(target, node)
+      }, DEFAULT_SETTINGS);
+      g += 1;
+
+      if (ifs) {
+        for (var j = 0; j < ifs.length; j++) {
+          elements["GENERATOR" + g] = BlockMirrorTextToBlocks.create_block("ast_comprehensionIf", node.lineno, {}, {
+            "TEST": this.convert(ifs[j], node)
+          }, DEFAULT_SETTINGS);
+          g += 1;
         }
+      }
     }
-    // *arg
-    if (vararg !== null) {
-        values['PARAMETER' + totalArgs] = this.parseArg(vararg, 'ast_FunctionParameterVararg', lineno, {}, node);
-        totalArgs += 1;
-    }
-    // keyword arguments that must be referenced by name
-    if (kwonlyargs !== null) {
-        for (let i = 0; i < kwonlyargs.length; i++) {
-            let childValues = {};
-            let type = 'ast_FunctionParameter';
-            if (kw_defaults[i]) {
-                childValues['DEFAULT'] = this.convert(kw_defaults[i], node);
-                type += "Default";
-            }
-            values['PARAMETER' + totalArgs] = this.parseArg(kwonlyargs[i], type, lineno, childValues, node);
-            totalArgs += 1;
+
+    return BlockMirrorTextToBlocks.create_block("ast_" + kind, node.lineno, {}, elements, {
+      "inline": "false"
+    }, {
+      "@items": g
+    });
+  };
+}); // TODO: what if a user deletes a parameter through the context menu?
+// The mutator container
+
+BlockMirrorTextToBlocks.BLOCKS.push({
+  "type": "ast_FunctionHeaderMutator",
+  "message0": "Setup parameters below: %1 %2 returns %3",
+  "args0": [{
+    "type": "input_dummy"
+  }, {
+    "type": "input_statement",
+    "name": "STACK",
+    "align": "RIGHT"
+  }, {
+    "type": "field_checkbox",
+    "name": "RETURNS",
+    "checked": true,
+    "align": "RIGHT"
+  }],
+  "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
+  "enableContextMenu": false
+}); // The elements you can put into the mutator
+
+[['Parameter', 'Parameter', '', false, false], ['ParameterType', 'Parameter with type', '', true, false], ['ParameterDefault', 'Parameter with default value', '', false, true], ['ParameterDefaultType', 'Parameter with type and default value', '', true, true], ['ParameterVararg', 'Variable length parameter', '*', false, false], ['ParameterVarargType', 'Variable length parameter with type', '*', true, false], ['ParameterKwarg', 'Keyworded Variable length parameter', '**', false], ['ParameterKwargType', 'Keyworded Variable length parameter with type', '**', true, false]].forEach(function (parameterTypeTuple) {
+  var parameterType = parameterTypeTuple[0],
+      parameterDescription = parameterTypeTuple[1],
+      parameterPrefix = parameterTypeTuple[2],
+      parameterTyped = parameterTypeTuple[3],
+      parameterDefault = parameterTypeTuple[4];
+  BlockMirrorTextToBlocks.BLOCKS.push({
+    "type": "ast_FunctionMutant" + parameterType,
+    "message0": parameterDescription,
+    "previousStatement": null,
+    "nextStatement": null,
+    "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
+    "enableContextMenu": false
+  });
+  var realParameterBlock = {
+    "type": "ast_Function" + parameterType,
+    "output": "Parameter",
+    "message0": parameterPrefix + (parameterPrefix ? ' ' : '') + "%1",
+    "args0": [{
+      "type": "field_variable",
+      "name": "NAME",
+      "variable": "param"
+    }],
+    "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
+    "enableContextMenu": false,
+    "inputsInline": parameterTyped && parameterDefault
+  };
+
+  if (parameterTyped) {
+    realParameterBlock['message0'] += " : %2";
+    realParameterBlock['args0'].push({
+      "type": "input_value",
+      "name": "TYPE"
+    });
+  }
+
+  if (parameterDefault) {
+    realParameterBlock['message0'] += " = %" + (parameterTyped ? 3 : 2);
+    realParameterBlock['args0'].push({
+      "type": "input_value",
+      "name": "DEFAULT"
+    });
+  }
+
+  BlockMirrorTextToBlocks.BLOCKS.push(realParameterBlock);
+
+  Blockly.Python["ast_Function" + parameterType] = function (block) {
+    var name = Blockly.Python.variableDB_.getName(block.getFieldValue('NAME'), Blockly.Variables.NAME_TYPE);
+    var typed = "";
+
+    if (parameterTyped) {
+      typed = ": " + Blockly.Python.valueToCode(block, 'TYPE', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+    }
+
+    var defaulted = "";
+
+    if (parameterDefault) {
+      defaulted = "=" + Blockly.Python.valueToCode(block, 'DEFAULT', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+    }
+
+    return [parameterPrefix + name + typed + defaulted, Blockly.Python.ORDER_ATOMIC];
+  };
+}); // TODO: Figure out an elegant "complexity" flag feature to allow different levels of Mutators
+
+Blockly.Blocks['ast_FunctionDef'] = {
+  init: function init() {
+    this.appendDummyInput().appendField("define").appendField(new Blockly.FieldTextInput("function"), "NAME");
+    this.decoratorsCount_ = 0;
+    this.parametersCount_ = 0;
+    this.hasReturn_ = false;
+    this.mutatorComplexity_ = 0;
+    this.appendStatementInput("BODY").setCheck(null);
+    this.setInputsInline(false);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.FUNCTIONS);
+    this.updateShape_();
+    this.setMutator(new Blockly.Mutator(['ast_FunctionMutantParameter', 'ast_FunctionMutantParameterType']));
+  },
+
+  /**
+   * Create XML to represent list inputs.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('decorators', this.decoratorsCount_);
+    container.setAttribute('parameters', this.parametersCount_);
+    container.setAttribute('returns', this.hasReturn_);
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the list inputs.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.decoratorsCount_ = parseInt(xmlElement.getAttribute('decorators'), 10);
+    this.parametersCount_ = parseInt(xmlElement.getAttribute('parameters'), 10);
+    this.hasReturn_ = "true" === xmlElement.getAttribute('returns');
+    this.updateShape_();
+  },
+  setReturnAnnotation_: function setReturnAnnotation_(status) {
+    var currentReturn = this.getInput('RETURNS');
+
+    if (status) {
+      if (!currentReturn) {
+        this.appendValueInput("RETURNS").setCheck(null).setAlign(Blockly.ALIGN_RIGHT).appendField("returns");
+      }
+
+      this.moveInputBefore('RETURNS', 'BODY');
+    } else if (!status && currentReturn) {
+      this.removeInput('RETURNS');
+    }
+
+    this.hasReturn_ = status;
+  },
+  updateShape_: function updateShape_() {
+    // Set up decorators and parameters
+    var block = this;
+    var position = 1;
+    [['DECORATOR', 'decoratorsCount_', null, 'decorated by'], ['PARAMETER', 'parametersCount_', 'Parameter', 'parameters:']].forEach(function (childTypeTuple) {
+      var childTypeName = childTypeTuple[0],
+          countVariable = childTypeTuple[1],
+          inputCheck = childTypeTuple[2],
+          childTypeMessage = childTypeTuple[3];
+
+      for (var i = 0; i < block[countVariable]; i++) {
+        if (!block.getInput(childTypeName + i)) {
+          var input = block.appendValueInput(childTypeName + i).setCheck(inputCheck).setAlign(Blockly.ALIGN_RIGHT);
+
+          if (i === 0) {
+            input.appendField(childTypeMessage);
+          }
+        }
+
+        block.moveInputBefore(childTypeName + i, 'BODY');
+      } // Remove deleted inputs.
+
+
+      while (block.getInput(childTypeName + i)) {
+        block.removeInput(childTypeName + i);
+        i++;
+      }
+    }); // Set up optional Returns annotation
+
+    this.setReturnAnnotation_(this.hasReturn_);
+  },
+
+  /**
+   * Populate the mutator's dialog with this block's components.
+   * @param {!Blockly.Workspace} workspace Mutator's workspace.
+   * @return {!Blockly.Block} Root block in mutator.
+   * @this Blockly.Block
+   */
+  decompose: function decompose(workspace) {
+    var containerBlock = workspace.newBlock('ast_FunctionHeaderMutator');
+    containerBlock.initSvg(); // Check/uncheck the allow statement box.
+
+    if (this.getInput('RETURNS')) {
+      containerBlock.setFieldValue(this.hasReturn_ ? 'TRUE' : 'FALSE', 'RETURNS');
+    } else {} // TODO: set up "canReturns" for lambda mode
+    //containerBlock.getField('RETURNS').setVisible(false);
+    // Set up parameters
+
+
+    var connection = containerBlock.getInput('STACK').connection;
+    var parameters = [];
+
+    for (var i = 0; i < this.parametersCount_; i++) {
+      var parameter = this.getInput('PARAMETER' + i).connection;
+      var sourceType = parameter.targetConnection.getSourceBlock().type;
+      var createName = 'ast_FunctionMutant' + sourceType.substring('ast_Function'.length);
+      var itemBlock = workspace.newBlock(createName);
+      itemBlock.initSvg();
+      connection.connect(itemBlock.previousConnection);
+      connection = itemBlock.nextConnection;
+      parameters.push(itemBlock);
+    }
+
+    return containerBlock;
+  },
+
+  /**
+   * Reconfigure this block based on the mutator dialog's components.
+   * @param {!Blockly.Block} containerBlock Root block in mutator.
+   * @this Blockly.Block
+   */
+  compose: function compose(containerBlock) {
+    var itemBlock = containerBlock.getInputTargetBlock('STACK'); // Count number of inputs.
+
+    var connections = [];
+    var blockTypes = [];
+
+    while (itemBlock) {
+      connections.push(itemBlock.valueConnection_);
+      blockTypes.push(itemBlock.type);
+      itemBlock = itemBlock.nextConnection && itemBlock.nextConnection.targetBlock();
+    } // Disconnect any children that don't belong.
+
+
+    for (var i = 0; i < this.parametersCount_; i++) {
+      var connection = this.getInput('PARAMETER' + i).connection.targetConnection;
+
+      if (connection && connections.indexOf(connection) === -1) {
+        // Disconnect all children of this block
+        var connectedBlock = connection.getSourceBlock();
+
+        for (var j = 0; j < connectedBlock.inputList.length; j++) {
+          var field = connectedBlock.inputList[j].connection;
+
+          if (field && field.targetConnection) {
+            field.targetConnection.getSourceBlock().unplug(true);
+          }
         }
+
+        connection.disconnect();
+        connection.getSourceBlock().dispose();
+      }
     }
-    // **kwarg
-    if (kwarg) {
-        values['PARAMETER' + totalArgs] = this.parseArg(kwarg, 'ast_FunctionParameterKwarg', lineno, {}, node);
-        totalArgs += 1;
+
+    this.parametersCount_ = connections.length;
+    this.updateShape_(); // Reconnect any child blocks.
+
+    for (var _i3 = 0; _i3 < this.parametersCount_; _i3++) {
+      Blockly.Mutator.reconnect(connections[_i3], this, 'PARAMETER' + _i3);
+
+      if (!connections[_i3]) {
+        var createName = 'ast_Function' + blockTypes[_i3].substring('ast_FunctionMutant'.length);
+
+        var _itemBlock3 = this.workspace.newBlock(createName);
+
+        _itemBlock3.setDeletable(false);
+
+        _itemBlock3.setMovable(false);
+
+        _itemBlock3.initSvg();
+
+        this.getInput('PARAMETER' + _i3).connection.connect(_itemBlock3.outputConnection);
+
+        _itemBlock3.render(); //this.get(itemBlock, 'ADD'+i)
+
+      }
+    } // Show/hide the returns annotation
+
+
+    var hasReturns = containerBlock.getFieldValue('RETURNS');
+
+    if (hasReturns !== null) {
+      hasReturns = hasReturns === 'TRUE';
+
+      if (this.hasReturn_ != hasReturns) {
+        if (hasReturns) {
+          this.setReturnAnnotation_(true);
+          Blockly.Mutator.reconnect(this.returnConnection_, this, 'RETURNS');
+          this.returnConnection_ = null;
+        } else {
+          var returnConnection = this.getInput('RETURNS').connection;
+          this.returnConnection_ = returnConnection.targetConnection;
+
+          if (this.returnConnection_) {
+            var returnBlock = returnConnection.targetBlock();
+            returnBlock.unplug();
+            returnBlock.bumpNeighbours_();
+          }
+
+          this.setReturnAnnotation_(false);
+        }
+      }
     }
+  },
+
+  /**
+   * Store pointers to any connected child blocks.
+   * @param {!Blockly.Block} containerBlock Root block in mutator.
+   * @this Blockly.Block
+   */
+  saveConnections: function saveConnections(containerBlock) {
+    var itemBlock = containerBlock.getInputTargetBlock('STACK');
+    var i = 0;
 
-    return totalArgs;
+    while (itemBlock) {
+      var input = this.getInput('PARAMETER' + i);
+      itemBlock.valueConnection_ = input && input.connection.targetConnection;
+      i++;
+      itemBlock = itemBlock.nextConnection && itemBlock.nextConnection.targetBlock();
+    }
+  }
 };
 
-BlockMirrorTextToBlocks.prototype['ast_FunctionDef'] = function (node, parent) {
-    let name = node.name;
-    let args = node.args;
-    let body = node.body;
-    let decorator_list = node.decorator_list;
-    let returns = node.returns;
+Blockly.Python['ast_FunctionDef'] = function (block) {
+  // Name
+  var name = Blockly.Python.variableDB_.getName(block.getFieldValue('NAME'), Blockly.Variables.NAME_TYPE); // Decorators
 
-    let values = {};
+  var decorators = new Array(block.decoratorsCount_);
 
-    if (decorator_list !== null) {
-        for (let i = 0; i < decorator_list.length; i++) {
-            values['DECORATOR' + i] = this.convert(decorator_list[i], node);
-        }
+  for (var i = 0; i < block.decoratorsCount_; i++) {
+    var decorator = Blockly.Python.valueToCode(block, 'DECORATOR' + i, Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+    decorators[i] = "@" + decorator + "\n";
+  } // Parameters
+
+
+  var parameters = new Array(block.parametersCount_);
+
+  for (var _i4 = 0; _i4 < block.parametersCount_; _i4++) {
+    parameters[_i4] = Blockly.Python.valueToCode(block, 'PARAMETER' + _i4, Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  } // Return annotation
+
+
+  var returns = "";
+
+  if (this.hasReturn_) {
+    returns = " -> " + Blockly.Python.valueToCode(block, 'RETURNS', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  } // Body
+
+
+  var body = Blockly.Python.statementToCode(block, 'BODY') || Blockly.Python.PASS;
+  return decorators.join('') + "def " + name + "(" + parameters.join(', ') + ")" + returns + ":\n" + body;
+};
+
+BlockMirrorTextToBlocks.prototype.parseArg = function (arg, type, lineno, values, node) {
+  var settings = {
+    "movable": false,
+    "deletable": false
+  };
+
+  if (arg.annotation === null) {
+    return BlockMirrorTextToBlocks.create_block(type, lineno, {
+      'NAME': Sk.ffi.remapToJs(arg.arg)
+    }, values, settings);
+  } else {
+    values['TYPE'] = this.convert(arg.annotation, node);
+    return BlockMirrorTextToBlocks.create_block(type + "Type", lineno, {
+      'NAME': Sk.ffi.remapToJs(arg.arg)
+    }, values, settings);
+  }
+};
+
+BlockMirrorTextToBlocks.prototype.parseArgs = function (args, values, lineno, node) {
+  var positional = args.args,
+      vararg = args.vararg,
+      kwonlyargs = args.kwonlyargs,
+      kwarg = args.kwarg,
+      defaults = args.defaults,
+      kw_defaults = args.kw_defaults;
+  var totalArgs = 0; // args (positional)
+
+  if (positional !== null) {
+    // "If there are fewer defaults, they correspond to the last n arguments."
+    var defaultOffset = defaults ? defaults.length - positional.length : 0;
+
+    for (var i = 0; i < positional.length; i++) {
+      var childValues = {};
+      var type = 'ast_FunctionParameter';
+
+      if (defaults[defaultOffset + i]) {
+        childValues['DEFAULT'] = this.convert(defaults[defaultOffset + i], node);
+        type += "Default";
+      }
+
+      values['PARAMETER' + totalArgs] = this.parseArg(positional[i], type, lineno, childValues, node);
+      totalArgs += 1;
     }
+  } // *arg
+
+
+  if (vararg !== null) {
+    values['PARAMETER' + totalArgs] = this.parseArg(vararg, 'ast_FunctionParameterVararg', lineno, {}, node);
+    totalArgs += 1;
+  } // keyword arguments that must be referenced by name
+
 
-    let parsedArgs = 0;
-    if (args !== null) {
-        parsedArgs = this.parseArgs(args, values, node.lineno, node);
+  if (kwonlyargs !== null) {
+    for (var _i5 = 0; _i5 < kwonlyargs.length; _i5++) {
+      var _childValues = {};
+      var _type = 'ast_FunctionParameter';
+
+      if (kw_defaults[_i5]) {
+        _childValues['DEFAULT'] = this.convert(kw_defaults[_i5], node);
+        _type += "Default";
+      }
+
+      values['PARAMETER' + totalArgs] = this.parseArg(kwonlyargs[_i5], _type, lineno, _childValues, node);
+      totalArgs += 1;
     }
+  } // **kwarg
+
+
+  if (kwarg) {
+    values['PARAMETER' + totalArgs] = this.parseArg(kwarg, 'ast_FunctionParameterKwarg', lineno, {}, node);
+    totalArgs += 1;
+  }
+
+  return totalArgs;
+};
+
+BlockMirrorTextToBlocks.prototype['ast_FunctionDef'] = function (node, parent) {
+  var name = node.name;
+  var args = node.args;
+  var body = node.body;
+  var decorator_list = node.decorator_list;
+  var returns = node.returns;
+  var values = {};
 
-    let hasReturn = (returns !== null &&
-        (returns._astname !== 'NameConstant' || returns.value !== Sk.builtin.none.none$));
-    if (hasReturn) {
-        values['RETURNS'] = this.convert(returns, node);
+  if (decorator_list !== null) {
+    for (var i = 0; i < decorator_list.length; i++) {
+      values['DECORATOR' + i] = this.convert(decorator_list[i], node);
     }
+  }
+
+  var parsedArgs = 0;
+
+  if (args !== null) {
+    parsedArgs = this.parseArgs(args, values, node.lineno, node);
+  }
+
+  var hasReturn = returns !== null && (returns._astname !== 'NameConstant' || returns.value !== Sk.builtin.none.none$);
+
+  if (hasReturn) {
+    values['RETURNS'] = this.convert(returns, node);
+  }
 
-    return BlockMirrorTextToBlocks.create_block("ast_FunctionDef", node.lineno, {
-            'NAME': Sk.ffi.remapToJs(name)
-        },
-        values,
-        {
-            "inline": "false"
-        }, {
-            "@decorators": (decorator_list === null ? 0 : decorator_list.length),
-            "@parameters": parsedArgs,
-            "@returns": hasReturn,
-        }, {
-            'BODY': this.convertBody(body, node)
-        });
+  return BlockMirrorTextToBlocks.create_block("ast_FunctionDef", node.lineno, {
+    'NAME': Sk.ffi.remapToJs(name)
+  }, values, {
+    "inline": "false"
+  }, {
+    "@decorators": decorator_list === null ? 0 : decorator_list.length,
+    "@parameters": parsedArgs,
+    "@returns": hasReturn
+  }, {
+    'BODY': this.convertBody(body, node)
+  });
 };
 
 Blockly.Blocks['ast_Lambda'] = {
-    init: function () {
-        this.appendDummyInput()
-            .appendField("lambda")
-            .setAlign(Blockly.ALIGN_RIGHT);
-        this.decoratorsCount_ = 0;
-        this.parametersCount_ = 0;
-        this.hasReturn_ = false;
-        this.appendValueInput("BODY")
-            .appendField("body")
-            .setAlign(Blockly.ALIGN_RIGHT)
-            .setCheck(null);
-        this.setInputsInline(false);
-        this.setOutput(true);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.FUNCTIONS);
-        this.updateShape_();
-    },
-    mutationToDom: Blockly.Blocks['ast_FunctionDef'].mutationToDom,
-    domToMutation: Blockly.Blocks['ast_FunctionDef'].domToMutation,
-    updateShape_: Blockly.Blocks['ast_FunctionDef'].updateShape_,
-    setReturnAnnotation_: Blockly.Blocks['ast_FunctionDef'].setReturnAnnotation_,
+  init: function init() {
+    this.appendDummyInput().appendField("lambda").setAlign(Blockly.ALIGN_RIGHT);
+    this.decoratorsCount_ = 0;
+    this.parametersCount_ = 0;
+    this.hasReturn_ = false;
+    this.appendValueInput("BODY").appendField("body").setAlign(Blockly.ALIGN_RIGHT).setCheck(null);
+    this.setInputsInline(false);
+    this.setOutput(true);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.FUNCTIONS);
+    this.updateShape_();
+  },
+  mutationToDom: Blockly.Blocks['ast_FunctionDef'].mutationToDom,
+  domToMutation: Blockly.Blocks['ast_FunctionDef'].domToMutation,
+  updateShape_: Blockly.Blocks['ast_FunctionDef'].updateShape_,
+  setReturnAnnotation_: Blockly.Blocks['ast_FunctionDef'].setReturnAnnotation_
 };
 
 Blockly.Python['ast_Lambda'] = function (block) {
-    // Parameters
-    let parameters = new Array(block.parametersCount_);
-    for (let i = 0; i < block.parametersCount_; i++) {
-        parameters[i] = (Blockly.Python.valueToCode(block, 'PARAMETER' + i, Blockly.Python.ORDER_NONE) ||
-            Blockly.Python.blank);
-    }
-    // Body
-    let body = Blockly.Python.valueToCode(block, 'BODY', Blockly.Python.ORDER_LAMBDA) || Blockly.Python.PASS;
-    return ["lambda " + parameters.join(', ') + ": " + body, Blockly.Python.ORDER_LAMBDA];
-};
+  // Parameters
+  var parameters = new Array(block.parametersCount_);
 
-BlockMirrorTextToBlocks.prototype['ast_Lambda'] = function (node, parent) {
-    let args = node.args;
-    let body = node.body;
+  for (var i = 0; i < block.parametersCount_; i++) {
+    parameters[i] = Blockly.Python.valueToCode(block, 'PARAMETER' + i, Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  } // Body
 
-    let values = {'BODY': this.convert(body, node)};
 
-    let parsedArgs = 0;
-    if (args !== null) {
-        parsedArgs = this.parseArgs(args, values, node.lineno);
-    }
+  var body = Blockly.Python.valueToCode(block, 'BODY', Blockly.Python.ORDER_LAMBDA) || Blockly.Python.PASS;
+  return ["lambda " + parameters.join(', ') + ": " + body, Blockly.Python.ORDER_LAMBDA];
+};
+
+BlockMirrorTextToBlocks.prototype['ast_Lambda'] = function (node, parent) {
+  var args = node.args;
+  var body = node.body;
+  var values = {
+    'BODY': this.convert(body, node)
+  };
+  var parsedArgs = 0;
+
+  if (args !== null) {
+    parsedArgs = this.parseArgs(args, values, node.lineno);
+  }
 
-    return BlockMirrorTextToBlocks.create_block("ast_Lambda", node.lineno, {},
-        values,
-        {
-            "inline": "false"
-        }, {
-            "@decorators": 0,
-            "@parameters": parsedArgs,
-            "@returns": false,
-        });
+  return BlockMirrorTextToBlocks.create_block("ast_Lambda", node.lineno, {}, values, {
+    "inline": "false"
+  }, {
+    "@decorators": 0,
+    "@parameters": parsedArgs,
+    "@returns": false
+  });
 };
+
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_ReturnFull",
-    "message0": "return %1",
-    "args0": [
-        {"type": "input_value", "name": "VALUE"}
-    ],
-    "inputsInline": true,
-    "previousStatement": null,
-    "nextStatement": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
+  "type": "ast_ReturnFull",
+  "message0": "return %1",
+  "args0": [{
+    "type": "input_value",
+    "name": "VALUE"
+  }],
+  "inputsInline": true,
+  "previousStatement": null,
+  "nextStatement": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS
 });
-
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_Return",
-    "message0": "return",
-    "inputsInline": true,
-    "previousStatement": null,
-    "nextStatement": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
+  "type": "ast_Return",
+  "message0": "return",
+  "inputsInline": true,
+  "previousStatement": null,
+  "nextStatement": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS
 });
 
 Blockly.Python['ast_Return'] = function (block) {
-    return "return\n";
+  return "return\n";
 };
 
 Blockly.Python['ast_ReturnFull'] = function (block) {
-    var value = Blockly.Python.valueToCode(block, 'VALUE', Blockly.Python.ORDER_ATOMIC) || Blockly.Python.blank;
-    return "return " + value + "\n";
+  var value = Blockly.Python.valueToCode(block, 'VALUE', Blockly.Python.ORDER_ATOMIC) || Blockly.Python.blank;
+  return "return " + value + "\n";
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Return'] = function (node, parent) {
-    let value = node.value;
+  var value = node.value;
 
-    if (value == null) {
-        return BlockMirrorTextToBlocks.create_block("ast_Return", node.lineno);
-    } else {
-        return BlockMirrorTextToBlocks.create_block("ast_ReturnFull", node.lineno, {}, {
-            "VALUE": this.convert(value, node)
-        });
-    }
+  if (value == null) {
+    return BlockMirrorTextToBlocks.create_block("ast_Return", node.lineno);
+  } else {
+    return BlockMirrorTextToBlocks.create_block("ast_ReturnFull", node.lineno, {}, {
+      "VALUE": this.convert(value, node)
+    });
+  }
 };
+
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_YieldFull",
-    "message0": "yield %1",
-    "args0": [
-        {"type": "input_value", "name": "VALUE"}
-    ],
-    "inputsInline": false,
-    "output": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
+  "type": "ast_YieldFull",
+  "message0": "yield %1",
+  "args0": [{
+    "type": "input_value",
+    "name": "VALUE"
+  }],
+  "inputsInline": false,
+  "output": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS
 });
-
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_Yield",
-    "message0": "yield",
-    "inputsInline": false,
-    "output": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
+  "type": "ast_Yield",
+  "message0": "yield",
+  "inputsInline": false,
+  "output": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS
 });
 
 Blockly.Python['ast_Yield'] = function (block) {
-    return ["yield", Blockly.Python.ORDER_LAMBDA];
+  return ["yield", Blockly.Python.ORDER_LAMBDA];
 };
 
 Blockly.Python['ast_YieldFull'] = function (block) {
-    var value = Blockly.Python.valueToCode(block, 'VALUE', Blockly.Python.ORDER_LAMBDA) || Blockly.Python.blank;
-    return ["yield " + value, Blockly.Python.ORDER_LAMBDA];
+  var value = Blockly.Python.valueToCode(block, 'VALUE', Blockly.Python.ORDER_LAMBDA) || Blockly.Python.blank;
+  return ["yield " + value, Blockly.Python.ORDER_LAMBDA];
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Yield'] = function (node, parent) {
-    let value = node.value;
+  var value = node.value;
 
-    if (value == null) {
-        return BlockMirrorTextToBlocks.create_block("ast_Yield", node.lineno);
-    } else {
-        return BlockMirrorTextToBlocks.create_block("ast_YieldFull", node.lineno, {}, {
-            "VALUE": this.convert(value, node)
-        });
-    }
+  if (value == null) {
+    return BlockMirrorTextToBlocks.create_block("ast_Yield", node.lineno);
+  } else {
+    return BlockMirrorTextToBlocks.create_block("ast_YieldFull", node.lineno, {}, {
+      "VALUE": this.convert(value, node)
+    });
+  }
 };
+
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_YieldFrom",
-    "message0": "yield from %1",
-    "args0": [
-        {"type": "input_value", "name": "VALUE"}
-    ],
-    "inputsInline": false,
-    "output": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
+  "type": "ast_YieldFrom",
+  "message0": "yield from %1",
+  "args0": [{
+    "type": "input_value",
+    "name": "VALUE"
+  }],
+  "inputsInline": false,
+  "output": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS
 });
 
 Blockly.Python['ast_YieldFrom'] = function (block) {
-    var value = Blockly.Python.valueToCode(block, 'VALUE', Blockly.Python.ORDER_LAMBDA) || Blockly.Python.blank;
-    return ["yield from " + value, Blockly.Python.ORDER_LAMBDA];
+  var value = Blockly.Python.valueToCode(block, 'VALUE', Blockly.Python.ORDER_LAMBDA) || Blockly.Python.blank;
+  return ["yield from " + value, Blockly.Python.ORDER_LAMBDA];
 };
 
 BlockMirrorTextToBlocks.prototype['ast_YieldFrom'] = function (node, parent) {
-    let value = node.value;
-
-    return BlockMirrorTextToBlocks.create_block("ast_YieldFrom", node.lineno, {}, {
-        "VALUE": this.convert(value, node)
-    });
+  var value = node.value;
+  return BlockMirrorTextToBlocks.create_block("ast_YieldFrom", node.lineno, {}, {
+    "VALUE": this.convert(value, node)
+  });
 };
+
 Blockly.Blocks['ast_Global'] = {
-    init: function () {
-        this.setInputsInline(true);
-        this.setPreviousStatement(true, null);
-        this.setNextStatement(true, null);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
-        this.nameCount_ = 1;
-        this.appendDummyInput('GLOBAL')
-            .appendField("make global", "START_GLOBALS");
-        this.updateShape_();
-    },
-    updateShape_: function () {
-        let input = this.getInput("GLOBAL");
-        // Update pluralization
-        if (this.getField('START_GLOBALS')) {
-            this.setFieldValue(this.nameCount_ > 1 ? "make globals" : "make global", "START_GLOBALS");
-        }
-        // Update fields
-        for (var i = 0; i < this.nameCount_; i++) {
-            if (!this.getField('NAME' + i)) {
-                if (i !== 0) {
-                    input.appendField(',').setAlign(Blockly.ALIGN_RIGHT);
-                }
-                input.appendField(new Blockly.FieldVariable("variable"), 'NAME' + i);
-            }
-        }
-        // Remove deleted fields.
-        while (this.getField('NAME' + i)) {
-            input.removeField('NAME' + i);
-            i++;
-        }
-        // Delete and re-add ending field
-        if (this.getField("END_GLOBALS")) {
-            input.removeField("END_GLOBALS");
-        }
-        input.appendField("available", "END_GLOBALS");
-    },
-    /**
-     * Create XML to represent list inputs.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        var container = document.createElement('mutation');
-        container.setAttribute('names', this.nameCount_);
-        return container;
-    },
-    /**
-     * Parse XML to restore the list inputs.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.nameCount_ = parseInt(xmlElement.getAttribute('names'), 10);
-        this.updateShape_();
-    },
+  init: function init() {
+    this.setInputsInline(true);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
+    this.nameCount_ = 1;
+    this.appendDummyInput('GLOBAL').appendField("make global", "START_GLOBALS");
+    this.updateShape_();
+  },
+  updateShape_: function updateShape_() {
+    var input = this.getInput("GLOBAL"); // Update pluralization
+
+    if (this.getField('START_GLOBALS')) {
+      this.setFieldValue(this.nameCount_ > 1 ? "make globals" : "make global", "START_GLOBALS");
+    } // Update fields
+
+
+    for (var i = 0; i < this.nameCount_; i++) {
+      if (!this.getField('NAME' + i)) {
+        if (i !== 0) {
+          input.appendField(',').setAlign(Blockly.ALIGN_RIGHT);
+        }
+
+        input.appendField(new Blockly.FieldVariable("variable"), 'NAME' + i);
+      }
+    } // Remove deleted fields.
+
+
+    while (this.getField('NAME' + i)) {
+      input.removeField('NAME' + i);
+      i++;
+    } // Delete and re-add ending field
+
+
+    if (this.getField("END_GLOBALS")) {
+      input.removeField("END_GLOBALS");
+    }
+
+    input.appendField("available", "END_GLOBALS");
+  },
+
+  /**
+   * Create XML to represent list inputs.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('names', this.nameCount_);
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the list inputs.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.nameCount_ = parseInt(xmlElement.getAttribute('names'), 10);
+    this.updateShape_();
+  }
 };
 
 Blockly.Python['ast_Global'] = function (block) {
-    // Create a list with any number of elements of any type.
-    let elements = new Array(block.nameCount_);
-    for (let i = 0; i < block.nameCount_; i++) {
-        elements[i] = Blockly.Python.variableDB_.getName(block.getFieldValue('NAME' + i), Blockly.Variables.NAME_TYPE);
-    }
-    return 'global ' + elements.join(', ') + "\n";
+  // Create a list with any number of elements of any type.
+  var elements = new Array(block.nameCount_);
+
+  for (var i = 0; i < block.nameCount_; i++) {
+    elements[i] = Blockly.Python.variableDB_.getName(block.getFieldValue('NAME' + i), Blockly.Variables.NAME_TYPE);
+  }
+
+  return 'global ' + elements.join(', ') + "\n";
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Global'] = function (node, parent) {
-    let names = node.names;
+  var names = node.names;
+  var fields = {};
 
-    let fields = {};
-    for (var i = 0; i < names.length; i++) {
-        fields["NAME" + i] = Sk.ffi.remapToJs(names[i]);
-    }
+  for (var i = 0; i < names.length; i++) {
+    fields["NAME" + i] = Sk.ffi.remapToJs(names[i]);
+  }
 
-    return BlockMirrorTextToBlocks.create_block("ast_Global", node.lineno,
-        fields,
-        {}, {
-            "inline": "true",
-        }, {
-            "@names": names.length
-        });
+  return BlockMirrorTextToBlocks.create_block("ast_Global", node.lineno, fields, {}, {
+    "inline": "true"
+  }, {
+    "@names": names.length
+  });
 };
+
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_Break",
-    "message0": "break",
-    "inputsInline": false,
-    "previousStatement": null,
-    "nextStatement": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.CONTROL,
+  "type": "ast_Break",
+  "message0": "break",
+  "inputsInline": false,
+  "previousStatement": null,
+  "nextStatement": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.CONTROL
 });
 
 Blockly.Python['ast_Break'] = function (block) {
-    return "break\n";
+  return "break\n";
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Break'] = function (node, parent) {
-    return BlockMirrorTextToBlocks.create_block("ast_Break", node.lineno);
+  return BlockMirrorTextToBlocks.create_block("ast_Break", node.lineno);
 };
+
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_Continue",
-    "message0": "continue",
-    "inputsInline": false,
-    "previousStatement": null,
-    "nextStatement": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.CONTROL,
+  "type": "ast_Continue",
+  "message0": "continue",
+  "inputsInline": false,
+  "previousStatement": null,
+  "nextStatement": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.CONTROL
 });
 
 Blockly.Python['ast_Continue'] = function (block) {
-    return "continue\n";
+  return "continue\n";
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Continue'] = function (node, parent) {
-    return BlockMirrorTextToBlocks.create_block("ast_Continue", node.lineno);
+  return BlockMirrorTextToBlocks.create_block("ast_Continue", node.lineno);
 };
+
 BlockMirrorTextToBlocks.HANDLERS_CATCH_ALL = 0;
 BlockMirrorTextToBlocks.HANDLERS_NO_AS = 1;
 BlockMirrorTextToBlocks.HANDLERS_COMPLETE = 3;
-
 Blockly.Blocks['ast_Try'] = {
-    init: function () {
-        this.handlersCount_ = 0;
-        this.handlers_ = [];
-        this.hasElse_ = false;
-        this.hasFinally_ = false;
-        this.appendDummyInput()
-            .appendField("try:");
-        this.appendStatementInput("BODY")
-            .setCheck(null)
-            .setAlign(Blockly.ALIGN_RIGHT);
-        this.setInputsInline(true);
-        this.setPreviousStatement(true, null);
-        this.setNextStatement(true, null);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.EXCEPTIONS);
-        this.updateShape_();
-    },
-    // TODO: Not mutable currently
-    updateShape_: function () {
-        for (let i = 0; i < this.handlersCount_; i++) {
-            if (this.handlers_[i] === BlockMirrorTextToBlocks.HANDLERS_CATCH_ALL) {
-                this.appendDummyInput()
-                    .appendField('except');
-            } else {
-                this.appendValueInput("TYPE"+i)
-                    .setCheck(null)
-                    .appendField("except");
-                if (this.handlers_[i] === BlockMirrorTextToBlocks.HANDLERS_COMPLETE) {
-                    this.appendDummyInput()
-                        .appendField("as")
-                        .appendField(new Blockly.FieldVariable("item"), "NAME"+i);
-                }
-            }
-            this.appendStatementInput("HANDLER"+i)
-                .setCheck(null);
-        }
-        if (this.hasElse_) {
-            this.appendDummyInput()
-                .appendField("else:");
-            this.appendStatementInput("ORELSE")
-                .setCheck(null);
-        }
-        if (this.hasFinally_) {
-            this.appendDummyInput()
-                .appendField("finally:");
-            this.appendStatementInput("FINALBODY")
-                .setCheck(null);
-        }
-    },
-    /**
-     * Create XML to represent the (non-editable) name and arguments.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        let container = document.createElement('mutation');
-        container.setAttribute('orelse', this.hasElse_);
-        container.setAttribute('finalbody', this.hasFinally_);
-        container.setAttribute('handlers', this.handlersCount_);
-        for (let i = 0; i < this.handlersCount_; i++) {
-            let parameter = document.createElement('arg');
-            parameter.setAttribute('name', this.handlers_[i]);
-            container.appendChild(parameter);
-        }
-        return container;
-    },
-    /**
-     * Parse XML to restore the (non-editable) name and parameters.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.hasElse_ = "true" === xmlElement.getAttribute('orelse');
-        this.hasFinally_ = "true" === xmlElement.getAttribute('finalbody');
-        this.handlersCount_ = parseInt(xmlElement.getAttribute('handlers'), 10);
-        this.handlers_ = [];
-        for (let i = 0, childNode; childNode = xmlElement.childNodes[i]; i++) {
-            if (childNode.nodeName.toLowerCase() === 'arg') {
-                this.handlers_.push(parseInt(childNode.getAttribute('name'), 10));
-            }
-        }
-        this.updateShape_();
-    },
-};
-
-Blockly.Python['ast_Try'] = function (block) {
-    // Try:
-    let body = Blockly.Python.statementToCode(block, 'BODY') || Blockly.Python.PASS;
-    // Except clauses
-    var handlers = new Array(block.handlersCount_);
-    for (let i = 0; i < block.handlersCount_; i++) {
-        let level = block.handlers_[i];
-        let clause = "except";
-        if (level !== BlockMirrorTextToBlocks.HANDLERS_CATCH_ALL) {
-            clause += " " + Blockly.Python.valueToCode(block, 'TYPE' + i,
-                Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-            if (level === BlockMirrorTextToBlocks.HANDLERS_COMPLETE) {
-                clause += " as " + Blockly.Python.variableDB_.getName(block.getFieldValue('NAME' + i),
-                    Blockly.Variables.NAME_TYPE);
-            }
-        }
-        clause += ":\n" + (Blockly.Python.statementToCode(block, 'HANDLER' + i) || Blockly.Python.PASS);
-        handlers[i] = clause;
+  init: function init() {
+    this.handlersCount_ = 0;
+    this.handlers_ = [];
+    this.hasElse_ = false;
+    this.hasFinally_ = false;
+    this.appendDummyInput().appendField("try:");
+    this.appendStatementInput("BODY").setCheck(null).setAlign(Blockly.ALIGN_RIGHT);
+    this.setInputsInline(true);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.EXCEPTIONS);
+    this.updateShape_();
+  },
+  // TODO: Not mutable currently
+  updateShape_: function updateShape_() {
+    for (var i = 0; i < this.handlersCount_; i++) {
+      if (this.handlers_[i] === BlockMirrorTextToBlocks.HANDLERS_CATCH_ALL) {
+        this.appendDummyInput().appendField('except');
+      } else {
+        this.appendValueInput("TYPE" + i).setCheck(null).appendField("except");
+
+        if (this.handlers_[i] === BlockMirrorTextToBlocks.HANDLERS_COMPLETE) {
+          this.appendDummyInput().appendField("as").appendField(new Blockly.FieldVariable("item"), "NAME" + i);
+        }
+      }
+
+      this.appendStatementInput("HANDLER" + i).setCheck(null);
     }
-    // Orelse:
-    let orelse = "";
+
     if (this.hasElse_) {
-        orelse = "else:\n" + (Blockly.Python.statementToCode(block, 'ORELSE') || Blockly.Python.PASS);
+      this.appendDummyInput().appendField("else:");
+      this.appendStatementInput("ORELSE").setCheck(null);
     }
-    // Finally:
-    let finalbody = "";
+
     if (this.hasFinally_) {
-        finalbody = "finally:\n" + (Blockly.Python.statementToCode(block, 'FINALBODY') || Blockly.Python.PASS);
+      this.appendDummyInput().appendField("finally:");
+      this.appendStatementInput("FINALBODY").setCheck(null);
+    }
+  },
+
+  /**
+   * Create XML to represent the (non-editable) name and arguments.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('orelse', this.hasElse_);
+    container.setAttribute('finalbody', this.hasFinally_);
+    container.setAttribute('handlers', this.handlersCount_);
+
+    for (var i = 0; i < this.handlersCount_; i++) {
+      var parameter = document.createElement('arg');
+      parameter.setAttribute('name', this.handlers_[i]);
+      container.appendChild(parameter);
+    }
+
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the (non-editable) name and parameters.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.hasElse_ = "true" === xmlElement.getAttribute('orelse');
+    this.hasFinally_ = "true" === xmlElement.getAttribute('finalbody');
+    this.handlersCount_ = parseInt(xmlElement.getAttribute('handlers'), 10);
+    this.handlers_ = [];
+
+    for (var i = 0, childNode; childNode = xmlElement.childNodes[i]; i++) {
+      if (childNode.nodeName.toLowerCase() === 'arg') {
+        this.handlers_.push(parseInt(childNode.getAttribute('name'), 10));
+      }
+    }
+
+    this.updateShape_();
+  }
+};
+
+Blockly.Python['ast_Try'] = function (block) {
+  // Try:
+  var body = Blockly.Python.statementToCode(block, 'BODY') || Blockly.Python.PASS; // Except clauses
+
+  var handlers = new Array(block.handlersCount_);
+
+  for (var i = 0; i < block.handlersCount_; i++) {
+    var level = block.handlers_[i];
+    var clause = "except";
+
+    if (level !== BlockMirrorTextToBlocks.HANDLERS_CATCH_ALL) {
+      clause += " " + Blockly.Python.valueToCode(block, 'TYPE' + i, Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+
+      if (level === BlockMirrorTextToBlocks.HANDLERS_COMPLETE) {
+        clause += " as " + Blockly.Python.variableDB_.getName(block.getFieldValue('NAME' + i), Blockly.Variables.NAME_TYPE);
+      }
     }
-    return "try:\n" + body + handlers.join("") + orelse + finalbody;
+
+    clause += ":\n" + (Blockly.Python.statementToCode(block, 'HANDLER' + i) || Blockly.Python.PASS);
+    handlers[i] = clause;
+  } // Orelse:
+
+
+  var orelse = "";
+
+  if (this.hasElse_) {
+    orelse = "else:\n" + (Blockly.Python.statementToCode(block, 'ORELSE') || Blockly.Python.PASS);
+  } // Finally:
+
+
+  var finalbody = "";
+
+  if (this.hasFinally_) {
+    finalbody = "finally:\n" + (Blockly.Python.statementToCode(block, 'FINALBODY') || Blockly.Python.PASS);
+  }
+
+  return "try:\n" + body + handlers.join("") + orelse + finalbody;
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Try'] = function (node, parent) {
-    let body = node.body;
-    let handlers = node.handlers;
-    let orelse = node.orelse;
-    let finalbody = node.finalbody;
-
-    let fields = {};
-    let values = {};
-    let mutations = {
-        "@ORELSE": orelse !== null  && orelse.length > 0,
-        "@FINALBODY": finalbody !== null  && finalbody.length > 0,
-        "@HANDLERS": handlers.length
-    };
+  var body = node.body;
+  var handlers = node.handlers;
+  var orelse = node.orelse;
+  var finalbody = node.finalbody;
+  var fields = {};
+  var values = {};
+  var mutations = {
+    "@ORELSE": orelse !== null && orelse.length > 0,
+    "@FINALBODY": finalbody !== null && finalbody.length > 0,
+    "@HANDLERS": handlers.length
+  };
+  var statements = {
+    "BODY": this.convertBody(body, node)
+  };
+
+  if (orelse !== null) {
+    statements['ORELSE'] = this.convertBody(orelse, node);
+  }
 
-    let statements = {"BODY": this.convertBody(body, node)};
-    if (orelse !== null) {
-        statements['ORELSE'] = this.convertBody(orelse, node);
-    }
-    if (finalbody !== null && finalbody.length) {
-        statements['FINALBODY'] = this.convertBody(finalbody, node);
-    }
+  if (finalbody !== null && finalbody.length) {
+    statements['FINALBODY'] = this.convertBody(finalbody, node);
+  }
 
-    let handledLevels = [];
-    for (let i = 0; i < handlers.length; i++) {
-        let handler = handlers[i];
-        statements["HANDLER" + i] = this.convertBody(handler.body, node);
-        if (handler.type === null) {
-            handledLevels.push(BlockMirrorTextToBlocks.HANDLERS_CATCH_ALL);
-        } else {
-            values["TYPE" + i] = this.convert(handler.type, node);
-            if (handler.name === null) {
-                handledLevels.push(BlockMirrorTextToBlocks.HANDLERS_NO_AS);
-            } else {
-                handledLevels.push(BlockMirrorTextToBlocks.HANDLERS_COMPLETE);
-                fields["NAME" + i] = Sk.ffi.remapToJs(handler.name.id);
-            }
-        }
-    }
+  var handledLevels = [];
+
+  for (var i = 0; i < handlers.length; i++) {
+    var handler = handlers[i];
+    statements["HANDLER" + i] = this.convertBody(handler.body, node);
 
-    mutations["ARG"] = handledLevels;
+    if (handler.type === null) {
+      handledLevels.push(BlockMirrorTextToBlocks.HANDLERS_CATCH_ALL);
+    } else {
+      values["TYPE" + i] = this.convert(handler.type, node);
+
+      if (handler.name === null) {
+        handledLevels.push(BlockMirrorTextToBlocks.HANDLERS_NO_AS);
+      } else {
+        handledLevels.push(BlockMirrorTextToBlocks.HANDLERS_COMPLETE);
+        fields["NAME" + i] = Sk.ffi.remapToJs(handler.name.id);
+      }
+    }
+  }
 
-    return BlockMirrorTextToBlocks.create_block("ast_Try", node.lineno, fields,
-        values, {}, mutations, statements);
+  mutations["ARG"] = handledLevels;
+  return BlockMirrorTextToBlocks.create_block("ast_Try", node.lineno, fields, values, {}, mutations, statements);
 };
-Blockly.Blocks['ast_ClassDef'] = {
-    init: function () {
-        this.decorators_ = 0;
-        this.bases_ = 0;
-        this.keywords_ = 0;
-        this.appendDummyInput('HEADER')
-            .appendField("Class")
-            .appendField(new Blockly.FieldVariable("item"), "NAME");
-        this.appendStatementInput("BODY")
-            .setCheck(null);
-        this.setInputsInline(false);
-        this.setPreviousStatement(true, null);
-        this.setNextStatement(true, null);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.OO);
-        this.updateShape_();
-    },
-    // TODO: Not mutable currently
-    updateShape_: function () {
-        for (let i = 0; i < this.decorators_; i++) {
-            let input = this.appendValueInput("DECORATOR" + i)
-                .setCheck(null)
-                .setAlign(Blockly.ALIGN_RIGHT);
-            if (i === 0) {
-                input.appendField("decorated by");
-            }
-            this.moveInputBefore('DECORATOR' + i, 'BODY');
-        }
-        for (let i = 0; i < this.bases_; i++) {
-            let input = this.appendValueInput("BASE" + i)
-                .setCheck(null)
-                .setAlign(Blockly.ALIGN_RIGHT);
-            if (i === 0) {
-                input.appendField("inherits from");
-            }
-            this.moveInputBefore('BASE' + i, 'BODY');
-        }
 
-        for (let i = 0; i < this.keywords_; i++) {
-            this.appendValueInput("KEYWORDVALUE" + i)
-                .setCheck(null)
-                .setAlign(Blockly.ALIGN_RIGHT)
-                .appendField(new Blockly.FieldTextInput("metaclass"), "KEYWORDNAME" + i)
-                .appendField("=");
-            this.moveInputBefore('KEYWORDVALUE' + i, 'BODY');
-        }
-    },
-    /**
-     * Create XML to represent the (non-editable) name and arguments.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        let container = document.createElement('mutation');
-        container.setAttribute('decorators', this.decorators_);
-        container.setAttribute('bases', this.bases_);
-        container.setAttribute('keywords', this.keywords_);
-        return container;
-    },
-    /**
-     * Parse XML to restore the (non-editable) name and parameters.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.decorators_ = parseInt(xmlElement.getAttribute('decorators'), 10);
-        this.bases_ = parseInt(xmlElement.getAttribute('bases'), 10);
-        this.keywords_ = parseInt(xmlElement.getAttribute('keywords'), 10);
-        this.updateShape_();
-    },
+Blockly.Blocks['ast_ClassDef'] = {
+  init: function init() {
+    this.decorators_ = 0;
+    this.bases_ = 0;
+    this.keywords_ = 0;
+    this.appendDummyInput('HEADER').appendField("Class").appendField(new Blockly.FieldVariable("item"), "NAME");
+    this.appendStatementInput("BODY").setCheck(null);
+    this.setInputsInline(false);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.OO);
+    this.updateShape_();
+  },
+  // TODO: Not mutable currently
+  updateShape_: function updateShape_() {
+    for (var i = 0; i < this.decorators_; i++) {
+      var input = this.appendValueInput("DECORATOR" + i).setCheck(null).setAlign(Blockly.ALIGN_RIGHT);
+
+      if (i === 0) {
+        input.appendField("decorated by");
+      }
+
+      this.moveInputBefore('DECORATOR' + i, 'BODY');
+    }
+
+    for (var _i6 = 0; _i6 < this.bases_; _i6++) {
+      var _input = this.appendValueInput("BASE" + _i6).setCheck(null).setAlign(Blockly.ALIGN_RIGHT);
+
+      if (_i6 === 0) {
+        _input.appendField("inherits from");
+      }
+
+      this.moveInputBefore('BASE' + _i6, 'BODY');
+    }
+
+    for (var _i7 = 0; _i7 < this.keywords_; _i7++) {
+      this.appendValueInput("KEYWORDVALUE" + _i7).setCheck(null).setAlign(Blockly.ALIGN_RIGHT).appendField(new Blockly.FieldTextInput("metaclass"), "KEYWORDNAME" + _i7).appendField("=");
+      this.moveInputBefore('KEYWORDVALUE' + _i7, 'BODY');
+    }
+  },
+
+  /**
+   * Create XML to represent the (non-editable) name and arguments.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('decorators', this.decorators_);
+    container.setAttribute('bases', this.bases_);
+    container.setAttribute('keywords', this.keywords_);
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the (non-editable) name and parameters.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.decorators_ = parseInt(xmlElement.getAttribute('decorators'), 10);
+    this.bases_ = parseInt(xmlElement.getAttribute('bases'), 10);
+    this.keywords_ = parseInt(xmlElement.getAttribute('keywords'), 10);
+    this.updateShape_();
+  }
 };
 
 Blockly.Python['ast_ClassDef'] = function (block) {
-    // Name
-    let name = Blockly.Python.variableDB_.getName(block.getFieldValue('NAME'), Blockly.Variables.NAME_TYPE);
-    // Decorators
-    let decorators = new Array(block.decorators_);
-    for (let i = 0; i < block.decorators_; i++) {
-        let decorator = (Blockly.Python.valueToCode(block, 'DECORATOR' + i, Blockly.Python.ORDER_NONE) ||
-            Blockly.Python.blank);
-        decorators[i] = "@" + decorator + "\n";
-    }
-    // Bases
-    let bases = new Array(block.bases_);
-    for (let i = 0; i < block.bases_; i++) {
-        bases[i] = (Blockly.Python.valueToCode(block, 'BASE' + i, Blockly.Python.ORDER_NONE) ||
-            Blockly.Python.blank);
-    }
-    // Keywords
-    let keywords = new Array(block.keywords_);
-    for (let i = 0; i < block.keywords_; i++) {
-        let name = block.getFieldValue('KEYWORDNAME' + i);
-        let value = (Blockly.Python.valueToCode(block, 'KEYWORDVALUE' + i, Blockly.Python.ORDER_NONE) ||
-            Blockly.Python.blank);
-        if (name == '**') {
-            keywords[i] = '**' + value;
-        } else {
-            keywords[i] = name + '=' + value;
-        }
+  // Name
+  var name = Blockly.Python.variableDB_.getName(block.getFieldValue('NAME'), Blockly.Variables.NAME_TYPE); // Decorators
+
+  var decorators = new Array(block.decorators_);
+
+  for (var i = 0; i < block.decorators_; i++) {
+    var decorator = Blockly.Python.valueToCode(block, 'DECORATOR' + i, Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+    decorators[i] = "@" + decorator + "\n";
+  } // Bases
+
+
+  var bases = new Array(block.bases_);
+
+  for (var _i8 = 0; _i8 < block.bases_; _i8++) {
+    bases[_i8] = Blockly.Python.valueToCode(block, 'BASE' + _i8, Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  } // Keywords
+
+
+  var keywords = new Array(block.keywords_);
+
+  for (var _i9 = 0; _i9 < block.keywords_; _i9++) {
+    var _name = block.getFieldValue('KEYWORDNAME' + _i9);
+
+    var value = Blockly.Python.valueToCode(block, 'KEYWORDVALUE' + _i9, Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+
+    if (_name == '**') {
+      keywords[_i9] = '**' + value;
+    } else {
+      keywords[_i9] = _name + '=' + value;
     }
-    // Body:
-    let body = Blockly.Python.statementToCode(block, 'BODY') || Blockly.Python.PASS;
-    // Put it together
-    let arguments = (bases.concat(keywords));
-    arguments = (arguments.length === 0) ? "" : "(" + arguments.join(', ') + ")";
-    return decorators.join('') + "class " + name + arguments + ":\n" + body;
-}
-;
+  } // Body:
+
+
+  var body = Blockly.Python.statementToCode(block, 'BODY') || Blockly.Python.PASS; // Put it together
+
+  var args = bases.concat(keywords);
+  args = args.length === 0 ? "" : "(" + args.join(', ') + ")";
+  return decorators.join('') + "class " + name + args + ":\n" + body;
+};
 
 BlockMirrorTextToBlocks.prototype['ast_ClassDef'] = function (node, parent) {
-    let name = node.name;
-    let bases = node.bases;
-    let keywords = node.keywords;
-    let body = node.body;
-    let decorator_list = node.decorator_list;
-
-    let values = {};
-    let fields = {'NAME': Sk.ffi.remapToJs(name)};
-
-    if (decorator_list !== null) {
-        for (let i = 0; i < decorator_list.length; i++) {
-            values['DECORATOR' + i] = this.convert(decorator_list[i], node);
-        }
+  var name = node.name;
+  var bases = node.bases;
+  var keywords = node.keywords;
+  var body = node.body;
+  var decorator_list = node.decorator_list;
+  var values = {};
+  var fields = {
+    'NAME': Sk.ffi.remapToJs(name)
+  };
+
+  if (decorator_list !== null) {
+    for (var i = 0; i < decorator_list.length; i++) {
+      values['DECORATOR' + i] = this.convert(decorator_list[i], node);
     }
+  }
 
-    if (bases !== null) {
-        for (let i = 0; i < bases.length; i++) {
-            values['BASE' + i] = this.convert(bases[i], node);
-        }
+  if (bases !== null) {
+    for (var _i10 = 0; _i10 < bases.length; _i10++) {
+      values['BASE' + _i10] = this.convert(bases[_i10], node);
     }
+  }
 
-    if (keywords !== null) {
-        for (let i = 0; i < keywords.length; i++) {
-            values['KEYWORDVALUE' + i] = this.convert(keywords[i].value, node);
-            let arg = keywords[i].arg;
-            if (arg === null) {
-                fields['KEYWORDNAME' + i] = "**";
-            } else {
-                fields['KEYWORDNAME' + i] = Sk.ffi.remapToJs(arg);
-            }
-        }
-    }
+  if (keywords !== null) {
+    for (var _i11 = 0; _i11 < keywords.length; _i11++) {
+      values['KEYWORDVALUE' + _i11] = this.convert(keywords[_i11].value, node);
+      var arg = keywords[_i11].arg;
 
-    return BlockMirrorTextToBlocks.create_block("ast_ClassDef", node.lineno, fields,
-        values,
-        {
-            "inline": "false"
-        }, {
-            "@decorators": (decorator_list === null ? 0 : decorator_list.length),
-            "@bases": (bases === null ? 0 : bases.length),
-            "@keywords": (keywords === null ? 0 : keywords.length),
-        }, {
-            'BODY': this.convertBody(body, node)
-        });
-};
+      if (arg === null) {
+        fields['KEYWORDNAME' + _i11] = "**";
+      } else {
+        fields['KEYWORDNAME' + _i11] = Sk.ffi.remapToJs(arg);
+      }
+    }
+  }
 
-// TODO: direct imports are not variables, because you can do stuff like:
+  return BlockMirrorTextToBlocks.create_block("ast_ClassDef", node.lineno, fields, values, {
+    "inline": "false"
+  }, {
+    "@decorators": decorator_list === null ? 0 : decorator_list.length,
+    "@bases": bases === null ? 0 : bases.length,
+    "@keywords": keywords === null ? 0 : keywords.length
+  }, {
+    'BODY': this.convertBody(body, node)
+  });
+}; // TODO: direct imports are not variables, because you can do stuff like:
 //         import os.path
 //       What should the variable be? Blockly will mangle it, but we should really be
 //       doing something more complicated here with namespaces (probably make `os` the
 //       variable and have some kind of list of attributes. But that's in the fading zone.
+
+
 Blockly.Blocks['ast_Import'] = {
-    init: function () {
-        this.nameCount_ = 1;
-        this.from_ = false;
-        this.regulars_ = [true];
-        this.setInputsInline(false);
-        this.setPreviousStatement(true, null);
-        this.setNextStatement(true, null);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.PYTHON);
-        this.updateShape_();
-    },
-    // TODO: Not mutable currently
-    updateShape_: function () {
-        // Possible FROM part
-        if (this.from_ && !this.getInput('FROM')) {
-            this.appendDummyInput('FROM')
-                .setAlign(Blockly.ALIGN_RIGHT)
-                .appendField('from')
-                .appendField(new Blockly.FieldTextInput("module"), "MODULE");
-        } else if (!this.from_ && this.getInput('FROM')) {
-            this.removeInput('FROM');
-        }
-        // Import clauses
-        for (var i = 0; i < this.nameCount_; i++) {
-            let input = this.getInput('CLAUSE' + i);
-            if (!input) {
-                input = this.appendDummyInput('CLAUSE' + i)
-                    .setAlign(Blockly.ALIGN_RIGHT);
-                if (i === 0) {
-                    input.appendField("import");
-                }
-                input.appendField(new Blockly.FieldTextInput("default"), "NAME" + i)
-            }
-            if (this.regulars_[i] && this.getField('AS' + i)) {
-                input.removeField('AS' + i);
-                input.removeField('ASNAME' + i);
-            } else if (!this.regulars_[i] && !this.getField('AS' + i)) {
-                input.appendField("as", 'AS' + i)
-                    .appendField(new Blockly.FieldVariable("alias"), "ASNAME" + i);
-            }
-        }
-        // Remove deleted inputs.
-        while (this.getInput('CLAUSE' + i)) {
-            this.removeInput('CLAUSE' + i);
-            i++;
-        }
-        // Reposition everything
-        if (this.from_ && this.nameCount_ > 0) {
-            this.moveInputBefore('FROM', 'CLAUSE0');
-        }
-        for (i = 0; i + 1 < this.nameCount_; i++) {
-            this.moveInputBefore('CLAUSE' + i, 'CLAUSE' + (i + 1));
-        }
-    },
-    /**
-     * Create XML to represent the (non-editable) name and arguments.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        let container = document.createElement('mutation');
-        container.setAttribute('names', this.nameCount_);
-        container.setAttribute('from', this.from_);
-        for (let i = 0; i < this.nameCount_; i++) {
-            let parameter = document.createElement('regular');
-            parameter.setAttribute('name', this.regulars_[i]);
-            container.appendChild(parameter);
-        }
-        return container;
-    },
-    /**
-     * Parse XML to restore the (non-editable) name and parameters.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.nameCount_ = parseInt(xmlElement.getAttribute('names'), 10);
-        this.from_ = "true" === xmlElement.getAttribute('from');
-        this.regulars_ = [];
-        for (let i = 0, childNode; childNode = xmlElement.childNodes[i]; i++) {
-            if (childNode.nodeName.toLowerCase() === 'regular') {
-                this.regulars_.push("true" === childNode.getAttribute('name'));
-            }
-        }
-        this.updateShape_();
-    },
+  init: function init() {
+    this.nameCount_ = 1;
+    this.from_ = false;
+    this.regulars_ = [true];
+    this.setInputsInline(false);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.PYTHON);
+    this.updateShape_();
+  },
+  // TODO: Not mutable currently
+  updateShape_: function updateShape_() {
+    // Possible FROM part
+    if (this.from_ && !this.getInput('FROM')) {
+      this.appendDummyInput('FROM').setAlign(Blockly.ALIGN_RIGHT).appendField('from').appendField(new Blockly.FieldTextInput("module"), "MODULE");
+    } else if (!this.from_ && this.getInput('FROM')) {
+      this.removeInput('FROM');
+    } // Import clauses
+
+
+    for (var i = 0; i < this.nameCount_; i++) {
+      var input = this.getInput('CLAUSE' + i);
+
+      if (!input) {
+        input = this.appendDummyInput('CLAUSE' + i).setAlign(Blockly.ALIGN_RIGHT);
+
+        if (i === 0) {
+          input.appendField("import");
+        }
+
+        input.appendField(new Blockly.FieldTextInput("default"), "NAME" + i);
+      }
+
+      if (this.regulars_[i] && this.getField('AS' + i)) {
+        input.removeField('AS' + i);
+        input.removeField('ASNAME' + i);
+      } else if (!this.regulars_[i] && !this.getField('AS' + i)) {
+        input.appendField("as", 'AS' + i).appendField(new Blockly.FieldVariable("alias"), "ASNAME" + i);
+      }
+    } // Remove deleted inputs.
+
+
+    while (this.getInput('CLAUSE' + i)) {
+      this.removeInput('CLAUSE' + i);
+      i++;
+    } // Reposition everything
+
+
+    if (this.from_ && this.nameCount_ > 0) {
+      this.moveInputBefore('FROM', 'CLAUSE0');
+    }
+
+    for (i = 0; i + 1 < this.nameCount_; i++) {
+      this.moveInputBefore('CLAUSE' + i, 'CLAUSE' + (i + 1));
+    }
+  },
+
+  /**
+   * Create XML to represent the (non-editable) name and arguments.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('names', this.nameCount_);
+    container.setAttribute('from', this.from_);
+
+    for (var i = 0; i < this.nameCount_; i++) {
+      var parameter = document.createElement('regular');
+      parameter.setAttribute('name', this.regulars_[i]);
+      container.appendChild(parameter);
+    }
+
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the (non-editable) name and parameters.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.nameCount_ = parseInt(xmlElement.getAttribute('names'), 10);
+    this.from_ = "true" === xmlElement.getAttribute('from');
+    this.regulars_ = [];
+
+    for (var i = 0, childNode; childNode = xmlElement.childNodes[i]; i++) {
+      if (childNode.nodeName.toLowerCase() === 'regular') {
+        this.regulars_.push("true" === childNode.getAttribute('name'));
+      }
+    }
+
+    this.updateShape_();
+  }
 };
 
 Blockly.Python['ast_Import'] = function (block) {
-    // Optional from part
-    let from = "";
-    if (this.from_) {
-        from = "from "+block.getFieldValue('MODULE') + " ";
-    }
-    // Create a list with any number of elements of any type.
-    let elements = new Array(block.nameCount_);
-    for (let i = 0; i < block.nameCount_; i++) {
-        elements[i] = block.getFieldValue('NAME' + i);
-        if (!this.regulars_[i]) {
-            elements[i] += " as " + Blockly.Python.variableDB_.getName(block.getFieldValue('ASNAME' + i), Blockly.Variables.NAME_TYPE);
-        }
+  // Optional from part
+  var from = "";
+
+  if (this.from_) {
+    from = "from " + block.getFieldValue('MODULE') + " ";
+  } // Create a list with any number of elements of any type.
+
+
+  var elements = new Array(block.nameCount_);
+
+  for (var i = 0; i < block.nameCount_; i++) {
+    elements[i] = block.getFieldValue('NAME' + i);
+
+    if (!this.regulars_[i]) {
+      elements[i] += " as " + Blockly.Python.variableDB_.getName(block.getFieldValue('ASNAME' + i), Blockly.Variables.NAME_TYPE);
     }
-    return from + 'import ' + elements.join(', ') + "\n";
+  }
+
+  return from + 'import ' + elements.join(', ') + "\n";
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Import'] = function (node, parent) {
-    let names = node.names;
+  var names = node.names;
+  var fields = {};
+  var mutations = {
+    '@names': names.length
+  };
+  var regulars = [];
 
-    let fields = {};
-    let mutations = {'@names': names.length};
+  for (var i = 0; i < names.length; i++) {
+    fields["NAME" + i] = Sk.ffi.remapToJs(names[i].name);
+    var isRegular = names[i].asname === null;
 
-    let regulars = [];
-    for (let i = 0; i < names.length; i++) {
-        fields["NAME" + i] = Sk.ffi.remapToJs(names[i].name);
-        let isRegular = (names[i].asname === null);
-        if (!isRegular) {
-            fields["ASNAME" + i] = Sk.ffi.remapToJs(names[i].asname);
-        }
-        regulars.push(isRegular);
+    if (!isRegular) {
+      fields["ASNAME" + i] = Sk.ffi.remapToJs(names[i].asname);
     }
-    mutations['regular'] = regulars;
 
-    if (node._astname === 'ImportFrom') {
-        // acbart: GTS suggests module can be None for '.' but it's an empty string in Skulpt
-        mutations['@from'] = true;
-        fields['MODULE'] = ('.'.repeat(node.level)) + Sk.ffi.remapToJs(node.module);
-    } else {
-        mutations['@from'] = false;
-    }
+    regulars.push(isRegular);
+  }
+
+  mutations['regular'] = regulars;
+
+  if (node._astname === 'ImportFrom') {
+    // acbart: GTS suggests module can be None for '.' but it's an empty string in Skulpt
+    mutations['@from'] = true;
+    fields['MODULE'] = '.'.repeat(node.level) + Sk.ffi.remapToJs(node.module);
+  } else {
+    mutations['@from'] = false;
+  }
+
+  return BlockMirrorTextToBlocks.create_block("ast_Import", node.lineno, fields, {}, {}, mutations);
+}; // Alias ImportFrom because of big overlap
 
-    return BlockMirrorTextToBlocks.create_block("ast_Import", node.lineno, fields,
-        {}, {}, mutations);
-};
 
-// Alias ImportFrom because of big overlap
 BlockMirrorTextToBlocks.prototype['ast_ImportFrom'] = BlockMirrorTextToBlocks.prototype['ast_Import'];
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_WithItem",
-    "output": "WithItem",
-    "message0": "context %1",
-    "args0": [{"type": "input_value", "name": "CONTEXT"}],
-    "enableContextMenu": false,
-    "colour": BlockMirrorTextToBlocks.COLOR.CONTROL,
-    "inputsInline": false,
+  "type": "ast_WithItem",
+  "output": "WithItem",
+  "message0": "context %1",
+  "args0": [{
+    "type": "input_value",
+    "name": "CONTEXT"
+  }],
+  "enableContextMenu": false,
+  "colour": BlockMirrorTextToBlocks.COLOR.CONTROL,
+  "inputsInline": false
 });
+
 Blockly.Python["ast_WithItem"] = function (block) {
-    let context = Blockly.Python.valueToCode(block, 'CONTEXT',
-        Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-    return [context, Blockly.Python.ORDER_NONE];
+  var context = Blockly.Python.valueToCode(block, 'CONTEXT', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  return [context, Blockly.Python.ORDER_NONE];
 };
+
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_WithItemAs",
-    "output": "WithItem",
-    "message0": "context %1 as %2",
-    "args0": [{"type": "input_value", "name": "CONTEXT"},
-        {"type": "input_value", "name": "AS"}],
-    "enableContextMenu": false,
-    "colour": BlockMirrorTextToBlocks.COLOR.CONTROL,
-    "inputsInline": true,
+  "type": "ast_WithItemAs",
+  "output": "WithItem",
+  "message0": "context %1 as %2",
+  "args0": [{
+    "type": "input_value",
+    "name": "CONTEXT"
+  }, {
+    "type": "input_value",
+    "name": "AS"
+  }],
+  "enableContextMenu": false,
+  "colour": BlockMirrorTextToBlocks.COLOR.CONTROL,
+  "inputsInline": true
 });
+
 Blockly.Python["ast_WithItemAs"] = function (block) {
-    let context = Blockly.Python.valueToCode(block, 'CONTEXT',
-        Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-    let as = Blockly.Python.valueToCode(block, 'AS',
-        Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
-    return [context + " as " + as, Blockly.Python.ORDER_NONE];
+  var context = Blockly.Python.valueToCode(block, 'CONTEXT', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  var as = Blockly.Python.valueToCode(block, 'AS', Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  return [context + " as " + as, Blockly.Python.ORDER_NONE];
 };
 
 Blockly.Blocks['ast_With'] = {
-    init: function () {
-        this.appendValueInput('ITEM0')
-            .appendField("with");
-        this.appendStatementInput("BODY")
-            .setCheck(null);
-        this.itemCount_ = 1;
-        this.renames_ = [false];
-        this.setInputsInline(false);
-        this.setPreviousStatement(true, null);
-        this.setNextStatement(true, null);
-        this.setColour(BlockMirrorTextToBlocks.COLOR.CONTROL);
-        this.updateShape_();
-    },
-    /**
-     * Create XML to represent list inputs.
-     * @return {!Element} XML storage element.
-     * @this Blockly.Block
-     */
-    mutationToDom: function () {
-        var container = document.createElement('mutation');
-        container.setAttribute('items', this.itemCount_);
-        for (let i = 0; i < this.itemCount_; i++) {
-            let parameter = document.createElement('as');
-            parameter.setAttribute('name', this.renames_[i]);
-            container.appendChild(parameter);
-        }
-        return container;
-    },
-    /**
-     * Parse XML to restore the list inputs.
-     * @param {!Element} xmlElement XML storage element.
-     * @this Blockly.Block
-     */
-    domToMutation: function (xmlElement) {
-        this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
-        this.renames_ = [];
-        for (let i = 0, childNode; childNode = xmlElement.childNodes[i]; i++) {
-            if (childNode.nodeName.toLowerCase() === 'as') {
-                this.renames_.push("true" === childNode.getAttribute('name'));
-            }
-        }
-        this.updateShape_();
-    },
-    updateShape_: function () {
-        // With clauses
-        for (var i = 1; i < this.itemCount_; i++) {
-            let input = this.getInput('ITEM' + i);
-            if (!input) {
-                input = this.appendValueInput('ITEM' + i);
-            }
-        }
-        // Remove deleted inputs.
-        while (this.getInput('ITEM' + i)) {
-            this.removeInput('ITEM' + i);
-            i++;
-        }
-        // Reposition everything
-        for (i = 0; i < this.itemCount_; i++) {
-            this.moveInputBefore('ITEM' + i, 'BODY');
-        }
-    },
+  init: function init() {
+    this.appendValueInput('ITEM0').appendField("with");
+    this.appendStatementInput("BODY").setCheck(null);
+    this.itemCount_ = 1;
+    this.renames_ = [false];
+    this.setInputsInline(false);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(BlockMirrorTextToBlocks.COLOR.CONTROL);
+    this.updateShape_();
+  },
+
+  /**
+   * Create XML to represent list inputs.
+   * @return {!Element} XML storage element.
+   * @this Blockly.Block
+   */
+  mutationToDom: function mutationToDom() {
+    var container = document.createElement('mutation');
+    container.setAttribute('items', this.itemCount_);
+
+    for (var i = 0; i < this.itemCount_; i++) {
+      var parameter = document.createElement('as');
+      parameter.setAttribute('name', this.renames_[i]);
+      container.appendChild(parameter);
+    }
+
+    return container;
+  },
+
+  /**
+   * Parse XML to restore the list inputs.
+   * @param {!Element} xmlElement XML storage element.
+   * @this Blockly.Block
+   */
+  domToMutation: function domToMutation(xmlElement) {
+    this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
+    this.renames_ = [];
+
+    for (var i = 0, childNode; childNode = xmlElement.childNodes[i]; i++) {
+      if (childNode.nodeName.toLowerCase() === 'as') {
+        this.renames_.push("true" === childNode.getAttribute('name'));
+      }
+    }
+
+    this.updateShape_();
+  },
+  updateShape_: function updateShape_() {
+    // With clauses
+    for (var i = 1; i < this.itemCount_; i++) {
+      var input = this.getInput('ITEM' + i);
+
+      if (!input) {
+        input = this.appendValueInput('ITEM' + i);
+      }
+    } // Remove deleted inputs.
+
+
+    while (this.getInput('ITEM' + i)) {
+      this.removeInput('ITEM' + i);
+      i++;
+    } // Reposition everything
+
+
+    for (i = 0; i < this.itemCount_; i++) {
+      this.moveInputBefore('ITEM' + i, 'BODY');
+    }
+  }
 };
 
 Blockly.Python['ast_With'] = function (block) {
-    // Contexts
-    let items = new Array(block.itemCount_);
-    for (let i = 0; i < block.itemCount_; i++) {
-        items[i] = (Blockly.Python.valueToCode(block, 'ITEM' + i, Blockly.Python.ORDER_NONE) ||
-            Blockly.Python.blank);
-    }
-    // Body
-    let body = Blockly.Python.statementToCode(block, 'BODY') || Blockly.Python.PASS;
-    return "with " + items.join(', ') + ":\n" + body;
+  // Contexts
+  var items = new Array(block.itemCount_);
+
+  for (var i = 0; i < block.itemCount_; i++) {
+    items[i] = Blockly.Python.valueToCode(block, 'ITEM' + i, Blockly.Python.ORDER_NONE) || Blockly.Python.blank;
+  } // Body
+
+
+  var body = Blockly.Python.statementToCode(block, 'BODY') || Blockly.Python.PASS;
+  return "with " + items.join(', ') + ":\n" + body;
 };
 
 BlockMirrorTextToBlocks.prototype['ast_With'] = function (node, parent) {
-    let items = node.items;
-    let body = node.body;
-
-    let values = {};
-    let mutations = {"@items": items.length};
-
-    let renamedItems = [];
-    for (let i = 0; i < items.length; i++) {
-        let hasRename = items[i].optional_vars;
-        renamedItems.push(hasRename);
-        let innerValues = {'CONTEXT':this.convert(items[i].context_expr, node)};
-        if (hasRename) {
-            innerValues['AS'] = this.convert(items[i].optional_vars, node);
-            values['ITEM'+i] = BlockMirrorTextToBlocks.create_block("ast_WithItemAs", node.lineno,
-                {}, innerValues, this.LOCKED_BLOCK);
-        } else {
-            values['ITEM'+i] = BlockMirrorTextToBlocks.create_block("ast_WithItem", node.lineno,
-                {}, innerValues, this.LOCKED_BLOCK);
-        }
+  var items = node.items;
+  var body = node.body;
+  var values = {};
+  var mutations = {
+    "@items": items.length
+  };
+  var renamedItems = [];
+
+  for (var i = 0; i < items.length; i++) {
+    var hasRename = items[i].optional_vars;
+    renamedItems.push(hasRename);
+    var innerValues = {
+      'CONTEXT': this.convert(items[i].context_expr, node)
+    };
+
+    if (hasRename) {
+      innerValues['AS'] = this.convert(items[i].optional_vars, node);
+      values['ITEM' + i] = BlockMirrorTextToBlocks.create_block("ast_WithItemAs", node.lineno, {}, innerValues, this.LOCKED_BLOCK);
+    } else {
+      values['ITEM' + i] = BlockMirrorTextToBlocks.create_block("ast_WithItem", node.lineno, {}, innerValues, this.LOCKED_BLOCK);
     }
-    mutations['as'] = renamedItems;
+  }
 
-    return BlockMirrorTextToBlocks.create_block("ast_With", node.lineno, {},
-        values,
-        {
-            "inline": "false"
-        }, mutations, {
-            'BODY': this.convertBody(body, node)
-        });
+  mutations['as'] = renamedItems;
+  return BlockMirrorTextToBlocks.create_block("ast_With", node.lineno, {}, values, {
+    "inline": "false"
+  }, mutations, {
+    'BODY': this.convertBody(body, node)
+  });
 };
 
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_Comment",
-    "message0": "# Comment: %1",
-    "args0": [{"type": "field_input", "name": "BODY", "text": "will be ignored"}],
-    "inputsInline": true,
-    "previousStatement": null,
-    "nextStatement": null,
-    "colour": BlockMirrorTextToBlocks.COLOR.PYTHON,
+  "type": "ast_Comment",
+  "message0": "# Comment: %1",
+  "args0": [{
+    "type": "field_input",
+    "name": "BODY",
+    "text": "will be ignored"
+  }],
+  "inputsInline": true,
+  "previousStatement": null,
+  "nextStatement": null,
+  "colour": BlockMirrorTextToBlocks.COLOR.PYTHON
 });
 
-Blockly.Python['ast_Comment'] = function(block) {
-    var text_body = block.getFieldValue('BODY');
-    return '#'+text_body+'\n';
+Blockly.Python['ast_Comment'] = function (block) {
+  var text_body = block.getFieldValue('BODY');
+  return '#' + text_body + '\n';
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Comment'] = function (txt, lineno) {
-    var commentText = txt.slice(1);
-    /*if (commentText.length && commentText[0] === " ") {
-        commentText = commentText.substring(1);
-    }*/
-    return BlockMirrorTextToBlocks.create_block("ast_Comment", lineno, {
-        "BODY": commentText
-    })
+  var commentText = txt.slice(1);
+  /*if (commentText.length && commentText[0] === " ") {
+      commentText = commentText.substring(1);
+  }*/
+
+  return BlockMirrorTextToBlocks.create_block("ast_Comment", lineno, {
+    "BODY": commentText
+  });
 };
+
 BlockMirrorTextToBlocks.BLOCKS.push({
-    "type": "ast_Raw",
-    "message0": "Code Block: %1 %2",
-    "args0": [
-        {"type": "input_dummy"},
-        {"type": "field_multilinetext", "name": "TEXT", "value": ''}
-    ],
-    "colour": BlockMirrorTextToBlocks.COLOR.PYTHON,
-    "previousStatement": null,
-    "nextStatement": null,
+  "type": "ast_Raw",
+  "message0": "Code Block: %1 %2",
+  "args0": [{
+    "type": "input_dummy"
+  }, {
+    "type": "field_multilinetext",
+    "name": "TEXT",
+    "value": ''
+  }],
+  "colour": BlockMirrorTextToBlocks.COLOR.PYTHON,
+  "previousStatement": null,
+  "nextStatement": null
 });
 
 Blockly.Python['ast_Raw'] = function (block) {
-    var code = block.getFieldValue('TEXT') + "\n";
-    return code;
-};
+  var code = block.getFieldValue('TEXT') + "\n";
+  return code;
+};
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index e847d1a..b6a42d2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,24 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@babel/cli": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.5.5.tgz",
+      "integrity": "sha512-UHI+7pHv/tk9g6WXQKYz+kmXTI77YtuY3vqC59KIqcoWEjsJJSG6rAxKaLsgj3LDyadsPrCB929gVOKM6Hui0w==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^2.0.4",
+        "commander": "^2.8.1",
+        "convert-source-map": "^1.1.0",
+        "fs-readdir-recursive": "^1.1.0",
+        "glob": "^7.0.0",
+        "lodash": "^4.17.13",
+        "mkdirp": "^0.5.1",
+        "output-file-sync": "^2.0.0",
+        "slash": "^2.0.0",
+        "source-map": "^0.5.0"
+      }
+    },
     "@babel/code-frame": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
@@ -74,6 +92,57 @@
         "trim-right": "^1.0.1"
       }
     },
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz",
+      "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz",
+      "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-explode-assignable-expression": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-call-delegate": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz",
+      "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/traverse": "^7.4.4",
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/helper-define-map": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz",
+      "integrity": "sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/types": "^7.5.5",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz",
+      "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==",
+      "dev": true,
+      "requires": {
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
     "@babel/helper-function-name": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
@@ -94,6 +163,106 @@
         "@babel/types": "^7.0.0"
       }
     },
+    "@babel/helper-hoist-variables": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz",
+      "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz",
+      "integrity": "sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.5.5"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz",
+      "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz",
+      "integrity": "sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/template": "^7.4.4",
+        "@babel/types": "^7.5.5",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz",
+      "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
+      "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==",
+      "dev": true
+    },
+    "@babel/helper-regex": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.5.5.tgz",
+      "integrity": "sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz",
+      "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-wrap-function": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-replace-supers": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz",
+      "integrity": "sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.5.5",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz",
+      "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
     "@babel/helper-split-export-declaration": {
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
@@ -103,6 +272,18 @@
         "@babel/types": "^7.4.4"
       }
     },
+    "@babel/helper-wrap-function": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz",
+      "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.2.0"
+      }
+    },
     "@babel/helpers": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz",
@@ -131,1211 +312,1345 @@
       "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==",
       "dev": true
     },
-    "@babel/template": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
-      "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz",
+      "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.4.4",
-        "@babel/types": "^7.4.4"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0",
+        "@babel/plugin-syntax-async-generators": "^7.2.0"
       }
     },
-    "@babel/traverse": {
+    "@babel/plugin-proposal-dynamic-import": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz",
+      "integrity": "sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-json-strings": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
+      "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-json-strings": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-object-rest-spread": {
       "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz",
-      "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz",
+      "integrity": "sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.5.5",
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.4.4",
-        "@babel/parser": "^7.5.5",
-        "@babel/types": "^7.5.5",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.13"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz",
+      "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz",
+      "integrity": "sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.5.4"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        },
+        "regexpu-core": {
+          "version": "4.5.4",
+          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz",
+          "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "regenerate": "^1.4.0",
+            "regenerate-unicode-properties": "^8.0.2",
+            "regjsgen": "^0.5.0",
+            "regjsparser": "^0.6.0",
+            "unicode-match-property-ecmascript": "^1.0.4",
+            "unicode-match-property-value-ecmascript": "^1.1.0"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "regjsgen": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz",
+          "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==",
           "dev": true
+        },
+        "regjsparser": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
+          "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
+          "dev": true,
+          "requires": {
+            "jsesc": "~0.5.0"
+          }
         }
       }
     },
-    "@babel/types": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz",
-      "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==",
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz",
+      "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.13",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "@webassemblyjs/ast": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+    "@babel/plugin-syntax-dynamic-import": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz",
+      "integrity": "sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-api-error": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
-      "dev": true
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz",
+      "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
     },
-    "@webassemblyjs/helper-buffer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
-      "dev": true
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz",
+      "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
     },
-    "@webassemblyjs/helper-code-frame": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz",
+      "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/wast-printer": "1.8.5"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "@webassemblyjs/helper-fsm": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
-      "dev": true
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz",
+      "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
     },
-    "@webassemblyjs/helper-module-context": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz",
+      "integrity": "sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "mamacro": "^0.0.3"
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0"
       }
     },
-    "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
-      "dev": true
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz",
+      "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
     },
-    "@webassemblyjs/helper-wasm-section": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz",
+      "integrity": "sha512-82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "lodash": "^4.17.13"
       }
     },
-    "@webassemblyjs/ieee754": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+    "@babel/plugin-transform-classes": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz",
+      "integrity": "sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg==",
       "dev": true,
       "requires": {
-        "@xtuc/ieee754": "^1.2.0"
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-define-map": "^7.5.5",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.5.5",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "globals": "^11.1.0"
       }
     },
-    "@webassemblyjs/leb128": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz",
+      "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==",
       "dev": true,
       "requires": {
-        "@xtuc/long": "4.2.2"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "@webassemblyjs/utf8": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
-      "dev": true
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz",
+      "integrity": "sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
     },
-    "@webassemblyjs/wasm-edit": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz",
+      "integrity": "sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/helper-wasm-section": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-opt": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "@webassemblyjs/wast-printer": "1.8.5"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.5.4"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        },
+        "regexpu-core": {
+          "version": "4.5.4",
+          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz",
+          "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==",
+          "dev": true,
+          "requires": {
+            "regenerate": "^1.4.0",
+            "regenerate-unicode-properties": "^8.0.2",
+            "regjsgen": "^0.5.0",
+            "regjsparser": "^0.6.0",
+            "unicode-match-property-ecmascript": "^1.0.4",
+            "unicode-match-property-value-ecmascript": "^1.1.0"
+          }
+        },
+        "regjsgen": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz",
+          "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==",
+          "dev": true
+        },
+        "regjsparser": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
+          "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
+          "dev": true,
+          "requires": {
+            "jsesc": "~0.5.0"
+          }
+        }
       }
     },
-    "@webassemblyjs/wasm-gen": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz",
+      "integrity": "sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "@webassemblyjs/wasm-opt": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz",
+      "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "@webassemblyjs/wasm-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+    "@babel/plugin-transform-for-of": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz",
+      "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "@webassemblyjs/wast-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+    "@babel/plugin-transform-function-name": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz",
+      "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-code-frame": "1.8.5",
-        "@webassemblyjs/helper-fsm": "1.8.5",
-        "@xtuc/long": "4.2.2"
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "@webassemblyjs/wast-printer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+    "@babel/plugin-transform-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz",
+      "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5",
-        "@xtuc/long": "4.2.2"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz",
+      "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
     },
-    "@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz",
+      "integrity": "sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
+      }
     },
-    "acorn": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz",
-      "integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==",
-      "dev": true
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz",
+      "integrity": "sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
+      }
     },
-    "ajv": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz",
+      "integrity": "sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^2.0.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
-    "ajv-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz",
+      "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
     },
-    "ajv-keywords": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
-      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
-      "dev": true
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz",
+      "integrity": "sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==",
+      "dev": true,
+      "requires": {
+        "regexp-tree": "^0.1.6"
+      }
     },
-    "ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "dev": true
+    "@babel/plugin-transform-new-target": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz",
+      "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
     },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+    "@babel/plugin-transform-object-super": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz",
+      "integrity": "sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==",
       "dev": true,
       "requires": {
-        "color-convert": "^1.9.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.5.5"
       }
     },
-    "anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+    "@babel/plugin-transform-parameters": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz",
+      "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==",
       "dev": true,
       "requires": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
+        "@babel/helper-call-delegate": "^7.4.4",
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz",
+      "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz",
+      "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "^0.14.0"
       },
       "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+        "regenerator-transform": {
+          "version": "0.14.1",
+          "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz",
+          "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==",
           "dev": true,
           "requires": {
-            "remove-trailing-separator": "^1.0.1"
+            "private": "^0.1.6"
           }
         }
       }
     },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz",
+      "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
     },
-    "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
+    "@babel/plugin-transform-runtime": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz",
+      "integrity": "sha512-6Xmeidsun5rkwnGfMOp6/z9nSzWpHFNVr2Jx7kwoq4mVatQfQx5S56drBgEHF+XQbKOdIaOiMIINvp/kAwMN+w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "resolve": "^1.8.1",
+        "semver": "^5.5.1"
+      }
     },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz",
+      "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
     },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
+    "@babel/plugin-transform-spread": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz",
+      "integrity": "sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
     },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz",
+      "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.0.0"
+      }
     },
-    "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz",
+      "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz",
+      "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==",
       "dev": true,
       "requires": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz",
+      "integrity": "sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.5.4"
       },
       "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
           "dev": true
         },
-        "util": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+        "regexpu-core": {
+          "version": "4.5.4",
+          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz",
+          "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==",
           "dev": true,
           "requires": {
-            "inherits": "2.0.1"
+            "regenerate": "^1.4.0",
+            "regenerate-unicode-properties": "^8.0.2",
+            "regjsgen": "^0.5.0",
+            "regjsparser": "^0.6.0",
+            "unicode-match-property-ecmascript": "^1.0.4",
+            "unicode-match-property-value-ecmascript": "^1.1.0"
+          }
+        },
+        "regjsgen": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz",
+          "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==",
+          "dev": true
+        },
+        "regjsparser": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
+          "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
+          "dev": true,
+          "requires": {
+            "jsesc": "~0.5.0"
           }
         }
       }
     },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
-    },
-    "async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true
+    "@babel/preset-env": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.5.tgz",
+      "integrity": "sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
+        "@babel/plugin-proposal-dynamic-import": "^7.5.0",
+        "@babel/plugin-proposal-json-strings": "^7.2.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-syntax-async-generators": "^7.2.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+        "@babel/plugin-syntax-json-strings": "^7.2.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-transform-arrow-functions": "^7.2.0",
+        "@babel/plugin-transform-async-to-generator": "^7.5.0",
+        "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
+        "@babel/plugin-transform-block-scoping": "^7.5.5",
+        "@babel/plugin-transform-classes": "^7.5.5",
+        "@babel/plugin-transform-computed-properties": "^7.2.0",
+        "@babel/plugin-transform-destructuring": "^7.5.0",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/plugin-transform-duplicate-keys": "^7.5.0",
+        "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
+        "@babel/plugin-transform-for-of": "^7.4.4",
+        "@babel/plugin-transform-function-name": "^7.4.4",
+        "@babel/plugin-transform-literals": "^7.2.0",
+        "@babel/plugin-transform-member-expression-literals": "^7.2.0",
+        "@babel/plugin-transform-modules-amd": "^7.5.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.5.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.5.0",
+        "@babel/plugin-transform-modules-umd": "^7.2.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5",
+        "@babel/plugin-transform-new-target": "^7.4.4",
+        "@babel/plugin-transform-object-super": "^7.5.5",
+        "@babel/plugin-transform-parameters": "^7.4.4",
+        "@babel/plugin-transform-property-literals": "^7.2.0",
+        "@babel/plugin-transform-regenerator": "^7.4.5",
+        "@babel/plugin-transform-reserved-words": "^7.2.0",
+        "@babel/plugin-transform-shorthand-properties": "^7.2.0",
+        "@babel/plugin-transform-spread": "^7.2.0",
+        "@babel/plugin-transform-sticky-regex": "^7.2.0",
+        "@babel/plugin-transform-template-literals": "^7.4.4",
+        "@babel/plugin-transform-typeof-symbol": "^7.2.0",
+        "@babel/plugin-transform-unicode-regex": "^7.4.4",
+        "@babel/types": "^7.5.5",
+        "browserslist": "^4.6.0",
+        "core-js-compat": "^3.1.1",
+        "invariant": "^2.2.2",
+        "js-levenshtein": "^1.1.3",
+        "semver": "^5.5.0"
+      }
     },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
+    "@babel/template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
+      "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.4.4",
+        "@babel/types": "^7.4.4"
+      }
     },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+    "@babel/traverse": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz",
+      "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.5.5",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/parser": "^7.5.5",
+        "@babel/types": "^7.5.5",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.13"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "js-tokens": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ms": "^2.1.1"
           }
         },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
     },
-    "babel-helper-call-delegate": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
-      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+    "@babel/types": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz",
+      "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.13",
+        "to-fast-properties": "^2.0.0"
       }
     },
-    "babel-helper-define-map": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
-      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+    "@cnakazawa/watch": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz",
+      "integrity": "sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
+        "exec-sh": "^0.3.2",
+        "minimist": "^1.2.0"
       }
     },
-    "babel-helper-evaluate-path": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.5.0.tgz",
-      "integrity": "sha512-mUh0UhS607bGh5wUMAQfOpt2JX2ThXMtppHRdRU1kL7ZLRWIXxoV2UIV1r2cAeeNeU1M5SB5/RSUgUxrK8yOkA==",
-      "dev": true
-    },
-    "babel-helper-flip-expressions": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.4.3.tgz",
-      "integrity": "sha1-NpZzahKKwYvCUlS19AoizrPB0/0=",
-      "dev": true
-    },
-    "babel-helper-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+    "@jest/console": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.7.1.tgz",
+      "integrity": "sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==",
       "dev": true,
       "requires": {
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "@jest/source-map": "^24.3.0",
+        "chalk": "^2.0.1",
+        "slash": "^2.0.0"
       }
     },
-    "babel-helper-get-function-arity": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+    "@jest/fake-timers": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.8.0.tgz",
+      "integrity": "sha512-2M4d5MufVXwi6VzZhJ9f5S/wU4ud2ck0kxPof1Iz3zWx6Y+V2eJrES9jEktB6O3o/oEyk+il/uNu9PvASjWXQw==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "@jest/types": "^24.8.0",
+        "jest-message-util": "^24.8.0",
+        "jest-mock": "^24.8.0"
       }
     },
-    "babel-helper-hoist-variables": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
-      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+    "@jest/source-map": {
+      "version": "24.3.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.3.0.tgz",
+      "integrity": "sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.1.15",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
-    "babel-helper-is-nodes-equiv": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz",
-      "integrity": "sha1-NOmzALFHnd2Y7HfqC76TQt/jloQ=",
-      "dev": true
-    },
-    "babel-helper-is-void-0": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/babel-helper-is-void-0/-/babel-helper-is-void-0-0.4.3.tgz",
-      "integrity": "sha1-fZwBtFYee5Xb2g9u7kj1tg5nMT4=",
-      "dev": true
-    },
-    "babel-helper-mark-eval-scopes": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.4.3.tgz",
-      "integrity": "sha1-0kSjvvmESHJgP/tG4izorN9VFWI=",
-      "dev": true
-    },
-    "babel-helper-optimise-call-expression": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
-      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+    "@jest/test-result": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.8.0.tgz",
+      "integrity": "sha512-+YdLlxwizlfqkFDh7Mc7ONPQAhA4YylU1s529vVM1rsf67vGZH/2GGm5uO8QzPeVyaVMobCQ7FTxl38QrKRlng==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "@jest/console": "^24.7.1",
+        "@jest/types": "^24.8.0",
+        "@types/istanbul-lib-coverage": "^2.0.0"
       }
     },
-    "babel-helper-regex": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
-      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+    "@jest/transform": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.8.0.tgz",
+      "integrity": "sha512-xBMfFUP7TortCs0O+Xtez2W7Zu1PLH9bvJgtraN1CDST6LBM/eTOZ9SfwS/lvV8yOfcDpFmwf9bq5cYbXvqsvA==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^24.8.0",
+        "babel-plugin-istanbul": "^5.1.0",
+        "chalk": "^2.0.1",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.1.15",
+        "jest-haste-map": "^24.8.0",
+        "jest-regex-util": "^24.3.0",
+        "jest-util": "^24.8.0",
+        "micromatch": "^3.1.10",
+        "realpath-native": "^1.1.0",
+        "slash": "^2.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "2.4.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
-    "babel-helper-remove-or-void": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.4.3.tgz",
-      "integrity": "sha1-pPA7QAd6D/6I5F0HAQ3uJB/1rmA=",
-      "dev": true
-    },
-    "babel-helper-replace-supers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
-      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+    "@jest/types": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.8.0.tgz",
+      "integrity": "sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg==",
       "dev": true,
       "requires": {
-        "babel-helper-optimise-call-expression": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^1.1.1",
+        "@types/yargs": "^12.0.9"
       }
     },
-    "babel-helper-to-multiple-sequence-expressions": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.5.0.tgz",
-      "integrity": "sha512-m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA==",
-      "dev": true
-    },
-    "babel-loader": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
-      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
+    "@types/babel__core": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.2.tgz",
+      "integrity": "sha512-cfCCrFmiGY/yq0NuKNxIQvZFy9kY/1immpSpTngOnyIbD4+eJOG5mxphhHDv3CHL9GltO4GcKr54kGBg3RNdbg==",
       "dev": true,
       "requires": {
-        "find-cache-dir": "^2.0.0",
-        "loader-utils": "^1.0.2",
-        "mkdirp": "^0.5.1",
-        "pify": "^4.0.1"
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
       }
     },
-    "babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+    "@types/babel__generator": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.0.2.tgz",
+      "integrity": "sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "@babel/types": "^7.0.0"
       }
     },
-    "babel-minify": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/babel-minify/-/babel-minify-0.5.0.tgz",
-      "integrity": "sha512-fgoyQCWmqly7CT1rk4FL90qT+4ixzjZ7Q+vuO9dmNO1AUGCjPhk3IemKQhMpLnb0oQn5rZAMZm9072gE0rSrPw==",
+    "@types/babel__template": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
+      "integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.1.0",
-        "babel-preset-minify": "^0.5.0",
-        "fs-readdir-recursive": "^1.1.0",
-        "lodash.pick": "^4.4.0",
-        "mkdirp": "^0.5.1",
-        "util.promisify": "^1.0.0",
-        "yargs-parser": "^10.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "yargs-parser": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-          "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^4.1.0"
-          }
-        }
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
-    "babel-plugin-check-es2015-constants": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
-      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+    "@types/babel__traverse": {
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.7.tgz",
+      "integrity": "sha512-CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "@babel/types": "^7.3.0"
       }
     },
-    "babel-plugin-minify-builtins": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.5.0.tgz",
-      "integrity": "sha512-wpqbN7Ov5hsNwGdzuzvFcjgRlzbIeVv1gMIlICbPj0xkexnfoIDe7q+AZHMkQmAE/F9R5jkrB6TLfTegImlXag==",
+    "@types/events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
       "dev": true
     },
-    "babel-plugin-minify-constant-folding": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.5.0.tgz",
-      "integrity": "sha512-Vj97CTn/lE9hR1D+jKUeHfNy+m1baNiJ1wJvoGyOBUx7F7kJqDZxr9nCHjO/Ad+irbR3HzR6jABpSSA29QsrXQ==",
+    "@types/glob": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
+      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
       "dev": true,
       "requires": {
-        "babel-helper-evaluate-path": "^0.5.0"
+        "@types/events": "*",
+        "@types/minimatch": "*",
+        "@types/node": "*"
       }
     },
-    "babel-plugin-minify-dead-code-elimination": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.5.0.tgz",
-      "integrity": "sha512-XQteBGXlgEoAKc/BhO6oafUdT4LBa7ARi55mxoyhLHNuA+RlzRmeMAfc31pb/UqU01wBzRc36YqHQzopnkd/6Q==",
-      "dev": true,
-      "requires": {
-        "babel-helper-evaluate-path": "^0.5.0",
-        "babel-helper-mark-eval-scopes": "^0.4.3",
-        "babel-helper-remove-or-void": "^0.4.3",
-        "lodash.some": "^4.6.0"
-      }
+    "@types/istanbul-lib-coverage": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
+      "integrity": "sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==",
+      "dev": true
     },
-    "babel-plugin-minify-flip-comparisons": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.4.3.tgz",
-      "integrity": "sha1-AMqHDLjxO0XAOLPB68DyJyk8llo=",
+    "@types/istanbul-lib-report": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz",
+      "integrity": "sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==",
       "dev": true,
       "requires": {
-        "babel-helper-is-void-0": "^0.4.3"
+        "@types/istanbul-lib-coverage": "*"
       }
     },
-    "babel-plugin-minify-guarded-expressions": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.3.tgz",
-      "integrity": "sha1-zHCbRFP9IbHzAod0RMifiEJ845c=",
+    "@types/istanbul-reports": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz",
+      "integrity": "sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==",
       "dev": true,
       "requires": {
-        "babel-helper-flip-expressions": "^0.4.3"
+        "@types/istanbul-lib-coverage": "*",
+        "@types/istanbul-lib-report": "*"
       }
     },
-    "babel-plugin-minify-infinity": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.4.3.tgz",
-      "integrity": "sha1-37h2obCKBldjhO8/kuZTumB7Oco=",
+    "@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
       "dev": true
     },
-    "babel-plugin-minify-mangle-names": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.5.0.tgz",
-      "integrity": "sha512-3jdNv6hCAw6fsX1p2wBGPfWuK69sfOjfd3zjUXkbq8McbohWy23tpXfy5RnToYWggvqzuMOwlId1PhyHOfgnGw==",
-      "dev": true,
-      "requires": {
-        "babel-helper-mark-eval-scopes": "^0.4.3"
-      }
+    "@types/node": {
+      "version": "12.6.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.8.tgz",
+      "integrity": "sha512-aX+gFgA5GHcDi89KG5keey2zf0WfZk/HAQotEamsK2kbey+8yGKcson0hbK8E+v0NArlCJQCqMP161YhV6ZXLg==",
+      "dev": true
     },
-    "babel-plugin-minify-numeric-literals": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.4.3.tgz",
-      "integrity": "sha1-jk/VYcefeAEob/YOjF/Z3u6TwLw=",
+    "@types/stack-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
+      "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
       "dev": true
     },
-    "babel-plugin-minify-replace": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.5.0.tgz",
-      "integrity": "sha512-aXZiaqWDNUbyNNNpWs/8NyST+oU7QTpK7J9zFEFSA0eOmtUNMU3fczlTTTlnCxHmq/jYNFEmkkSG3DDBtW3Y4Q==",
+    "@types/yargs": {
+      "version": "12.0.12",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.12.tgz",
+      "integrity": "sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw==",
       "dev": true
     },
-    "babel-plugin-minify-simplify": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.5.0.tgz",
-      "integrity": "sha512-TM01J/YcKZ8XIQd1Z3nF2AdWHoDsarjtZ5fWPDksYZNsoOjQ2UO2EWm824Ym6sp127m44gPlLFiO5KFxU8pA5Q==",
+    "@webassemblyjs/ast": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
+      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
       "dev": true,
       "requires": {
-        "babel-helper-flip-expressions": "^0.4.3",
-        "babel-helper-is-nodes-equiv": "^0.0.1",
-        "babel-helper-to-multiple-sequence-expressions": "^0.5.0"
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5"
       }
     },
-    "babel-plugin-minify-type-constructors": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.4.3.tgz",
-      "integrity": "sha1-G8bxW4f3qxCF1CszC3F2V6IVZQA=",
-      "dev": true,
-      "requires": {
-        "babel-helper-is-void-0": "^0.4.3"
-      }
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
+      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+      "dev": true
     },
-    "babel-plugin-transform-es2015-arrow-functions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
-      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
+      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+      "dev": true
     },
-    "babel-plugin-transform-es2015-block-scoped-functions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
-      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
+      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+      "dev": true
     },
-    "babel-plugin-transform-es2015-block-scoping": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
-      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
+      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
+        "@webassemblyjs/wast-printer": "1.8.5"
       }
     },
-    "babel-plugin-transform-es2015-classes": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
-      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
-      "dev": true,
-      "requires": {
-        "babel-helper-define-map": "^6.24.1",
-        "babel-helper-function-name": "^6.24.1",
-        "babel-helper-optimise-call-expression": "^6.24.1",
-        "babel-helper-replace-supers": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
+      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+      "dev": true
     },
-    "babel-plugin-transform-es2015-computed-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
-      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
+      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "@webassemblyjs/ast": "1.8.5",
+        "mamacro": "^0.0.3"
       }
     },
-    "babel-plugin-transform-es2015-destructuring": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
-      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
+      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+      "dev": true
     },
-    "babel-plugin-transform-es2015-duplicate-keys": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
-      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
+      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5"
       }
     },
-    "babel-plugin-transform-es2015-for-of": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
-      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+    "@webassemblyjs/ieee754": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
+      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "@xtuc/ieee754": "^1.2.0"
       }
     },
-    "babel-plugin-transform-es2015-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
-      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+    "@webassemblyjs/leb128": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
+      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "@xtuc/long": "4.2.2"
       }
     },
-    "babel-plugin-transform-es2015-literals": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
-      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+    "@webassemblyjs/utf8": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
+      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+      "dev": true
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
+      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/helper-wasm-section": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-opt": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/wast-printer": "1.8.5"
       }
     },
-    "babel-plugin-transform-es2015-modules-amd": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
-      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
+      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
       }
     },
-    "babel-plugin-transform-es2015-modules-commonjs": {
-      "version": "6.26.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz",
-      "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
+      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-strict-mode": "^6.24.1",
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-types": "^6.26.0"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5"
       }
     },
-    "babel-plugin-transform-es2015-modules-systemjs": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
-      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
+      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
       }
     },
-    "babel-plugin-transform-es2015-modules-umd": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
-      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+    "@webassemblyjs/wast-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
+      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-code-frame": "1.8.5",
+        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@xtuc/long": "4.2.2"
       }
     },
-    "babel-plugin-transform-es2015-object-super": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
-      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+    "@webassemblyjs/wast-printer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
+      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
       "dev": true,
       "requires": {
-        "babel-helper-replace-supers": "^6.24.1",
-        "babel-runtime": "^6.22.0"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5",
+        "@xtuc/long": "4.2.2"
       }
     },
-    "babel-plugin-transform-es2015-parameters": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
-      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
       "dev": true,
       "requires": {
-        "babel-helper-call-delegate": "^6.24.1",
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
       }
     },
-    "babel-plugin-transform-es2015-shorthand-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
-      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+    "acorn": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz",
+      "integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==",
+      "dev": true
+    },
+    "ajv": {
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       }
     },
-    "babel-plugin-transform-es2015-spread": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
-      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+    "ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true
+    },
+    "ajv-keywords": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
+      "dev": true
+    },
+    "ansi-colors": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
+      "dev": true
+    },
+    "ansi-html": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "color-convert": "^1.9.0"
       }
     },
-    "babel-plugin-transform-es2015-sticky-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
-      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+    "anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        }
       }
     },
-    "babel-plugin-transform-es2015-template-literals": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
-      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-flatten": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+      "dev": true
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "array-uniq": "^1.0.1"
       }
     },
-    "babel-plugin-transform-es2015-typeof-symbol": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
-      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
       }
     },
-    "babel-plugin-transform-es2015-unicode-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
-      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+    "assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "regexpu-core": "^2.0.0"
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
       }
     },
-    "babel-plugin-transform-inline-consecutive-adds": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.3.tgz",
-      "integrity": "sha1-Mj1Ho+pjqDp6w8gRro5pQfrysNE=",
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true
     },
-    "babel-plugin-transform-member-expression-literals": {
-      "version": "6.9.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.4.tgz",
-      "integrity": "sha1-NwOcmgwzE6OUlfqsL/OmtbnQOL8=",
+    "async": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
       "dev": true
     },
-    "babel-plugin-transform-merge-sibling-variables": {
-      "version": "6.9.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.4.tgz",
-      "integrity": "sha1-hbQi/DN3tEnJ0c3kQIcgNTJAHa4=",
+    "async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
       "dev": true
     },
-    "babel-plugin-transform-minify-booleans": {
-      "version": "6.9.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.4.tgz",
-      "integrity": "sha1-rLs+VqNVXdI5KOS1gtKFFi3SsZg=",
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true
     },
-    "babel-plugin-transform-property-literals": {
-      "version": "6.9.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.4.tgz",
-      "integrity": "sha1-mMHSHiVXNlc/k+zlRFn2ziSYXTk=",
+    "babel-jest": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.8.0.tgz",
+      "integrity": "sha512-+5/kaZt4I9efoXzPlZASyK/lN9qdRKmmUav9smVc0ruPQD7IsfucQ87gpOE8mn2jbDuS6M/YOW6n3v9ZoIfgnw==",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2"
+        "@jest/transform": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "@types/babel__core": "^7.1.0",
+        "babel-plugin-istanbul": "^5.1.0",
+        "babel-preset-jest": "^24.6.0",
+        "chalk": "^2.4.2",
+        "slash": "^2.0.0"
       }
     },
-    "babel-plugin-transform-regenerator": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
-      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+    "babel-loader": {
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
+      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
       "dev": true,
       "requires": {
-        "regenerator-transform": "^0.10.0"
+        "find-cache-dir": "^2.0.0",
+        "loader-utils": "^1.0.2",
+        "mkdirp": "^0.5.1",
+        "pify": "^4.0.1"
       }
     },
-    "babel-plugin-transform-regexp-constructors": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.4.3.tgz",
-      "integrity": "sha1-WLd3W2OvzzMyj66aX4j71PsLSWU=",
-      "dev": true
-    },
-    "babel-plugin-transform-remove-console": {
-      "version": "6.9.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz",
-      "integrity": "sha1-uYA2DAZzhOJLNXpYjYB9PINSd4A=",
-      "dev": true
-    },
-    "babel-plugin-transform-remove-debugger": {
-      "version": "6.9.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.4.tgz",
-      "integrity": "sha1-QrcnYxyXl44estGZp67IShgznvI=",
-      "dev": true
-    },
-    "babel-plugin-transform-remove-undefined": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.5.0.tgz",
-      "integrity": "sha512-+M7fJYFaEE/M9CXa0/IRkDbiV3wRELzA1kKQFCJ4ifhrzLKn/9VCCgj9OFmYWwBd8IB48YdgPkHYtbYq+4vtHQ==",
+    "babel-plugin-add-module-exports": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-1.0.2.tgz",
+      "integrity": "sha512-4paN7RivvU3Rzju1vGSHWPjO8Y0rI6droWvSFKI6dvEQ4mvoV0zGojnlzVRfI6N8zISo6VERXt3coIuVmzuvNg==",
       "dev": true,
       "requires": {
-        "babel-helper-evaluate-path": "^0.5.0"
+        "chokidar": "^2.0.4"
       }
     },
-    "babel-plugin-transform-simplify-comparison-operators": {
-      "version": "6.9.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.4.tgz",
-      "integrity": "sha1-9ir+CWyrDh9ootdT/fKDiIRxzrk=",
-      "dev": true
-    },
-    "babel-plugin-transform-strict-mode": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
-      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+    "babel-plugin-dynamic-import-node": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
+      "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "object.assign": "^4.1.0"
       }
     },
-    "babel-plugin-transform-undefined-to-void": {
-      "version": "6.9.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz",
-      "integrity": "sha1-viQcqBQEAwZ4t0hxcyK4nQyP4oA=",
-      "dev": true
-    },
-    "babel-preset-es2015": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
-      "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
+    "babel-plugin-istanbul": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz",
+      "integrity": "sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==",
       "dev": true,
       "requires": {
-        "babel-plugin-check-es2015-constants": "^6.22.0",
-        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
-        "babel-plugin-transform-es2015-classes": "^6.24.1",
-        "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
-        "babel-plugin-transform-es2015-destructuring": "^6.22.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
-        "babel-plugin-transform-es2015-for-of": "^6.22.0",
-        "babel-plugin-transform-es2015-function-name": "^6.24.1",
-        "babel-plugin-transform-es2015-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-        "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
-        "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
-        "babel-plugin-transform-es2015-object-super": "^6.24.1",
-        "babel-plugin-transform-es2015-parameters": "^6.24.1",
-        "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
-        "babel-plugin-transform-es2015-spread": "^6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
-        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
-        "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
-        "babel-plugin-transform-regenerator": "^6.24.1"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "find-up": "^3.0.0",
+        "istanbul-lib-instrument": "^3.3.0",
+        "test-exclude": "^5.2.3"
       }
     },
-    "babel-preset-minify": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.5.0.tgz",
-      "integrity": "sha512-xj1s9Mon+RFubH569vrGCayA9Fm2GMsCgDRm1Jb8SgctOB7KFcrVc2o8K3YHUyMz+SWP8aea75BoS8YfsXXuiA==",
+    "babel-plugin-jest-hoist": {
+      "version": "24.6.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz",
+      "integrity": "sha512-3pKNH6hMt9SbOv0F3WVmy5CWQ4uogS3k0GY5XLyQHJ9EGpAT9XWkFd2ZiXXtkwFHdAHa5j7w7kfxSP5lAIwu7w==",
       "dev": true,
       "requires": {
-        "babel-plugin-minify-builtins": "^0.5.0",
-        "babel-plugin-minify-constant-folding": "^0.5.0",
-        "babel-plugin-minify-dead-code-elimination": "^0.5.0",
-        "babel-plugin-minify-flip-comparisons": "^0.4.3",
-        "babel-plugin-minify-guarded-expressions": "^0.4.3",
-        "babel-plugin-minify-infinity": "^0.4.3",
-        "babel-plugin-minify-mangle-names": "^0.5.0",
-        "babel-plugin-minify-numeric-literals": "^0.4.3",
-        "babel-plugin-minify-replace": "^0.5.0",
-        "babel-plugin-minify-simplify": "^0.5.0",
-        "babel-plugin-minify-type-constructors": "^0.4.3",
-        "babel-plugin-transform-inline-consecutive-adds": "^0.4.3",
-        "babel-plugin-transform-member-expression-literals": "^6.9.4",
-        "babel-plugin-transform-merge-sibling-variables": "^6.9.4",
-        "babel-plugin-transform-minify-booleans": "^6.9.4",
-        "babel-plugin-transform-property-literals": "^6.9.4",
-        "babel-plugin-transform-regexp-constructors": "^0.4.3",
-        "babel-plugin-transform-remove-console": "^6.9.4",
-        "babel-plugin-transform-remove-debugger": "^6.9.4",
-        "babel-plugin-transform-remove-undefined": "^0.5.0",
-        "babel-plugin-transform-simplify-comparison-operators": "^6.9.4",
-        "babel-plugin-transform-undefined-to-void": "^6.9.4",
-        "lodash.isplainobject": "^4.0.6"
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
-    "babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
-      },
-      "dependencies": {
-        "globals": {
-          "version": "9.18.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-          "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-          "dev": true
-        }
+        "@types/babel__traverse": "^7.0.6"
       }
     },
-    "babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+    "babel-preset-jest": {
+      "version": "24.6.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz",
+      "integrity": "sha512-pdZqLEdmy1ZK5kyRUfvBb2IfTPb2BUvIJczlPspS8fWmBQslNNDBqVfh7BW5leOVJMDZKzjD8XEyABTk6gQ5yw==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
-      },
-      "dependencies": {
-        "to-fast-properties": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-          "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-          "dev": true
-        }
+        "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
+        "babel-plugin-jest-hoist": "^24.6.0"
       }
     },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true
-    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -1403,6 +1718,12 @@
       "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
       "dev": true
     },
+    "batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+      "dev": true
+    },
     "big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -1427,6 +1748,46 @@
       "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
       "dev": true
     },
+    "body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.1.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+          "dev": true
+        }
+      }
+    },
+    "bonjour": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+      "dev": true,
+      "requires": {
+        "array-flatten": "^2.1.0",
+        "deep-equal": "^1.0.1",
+        "dns-equal": "^1.0.0",
+        "dns-txt": "^2.0.2",
+        "multicast-dns": "^6.0.1",
+        "multicast-dns-service-types": "^1.1.0"
+      }
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1543,6 +1904,26 @@
         "pako": "~1.0.5"
       }
     },
+    "browserslist": {
+      "version": "4.6.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz",
+      "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30000984",
+        "electron-to-chromium": "^1.3.191",
+        "node-releases": "^1.1.25"
+      }
+    },
+    "bser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz",
+      "integrity": "sha512-8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg==",
+      "dev": true,
+      "requires": {
+        "node-int64": "^0.4.0"
+      }
+    },
     "buffer": {
       "version": "4.9.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
@@ -1560,6 +1941,12 @@
       "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
       "dev": true
     },
+    "buffer-indexof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
+      "dev": true
+    },
     "buffer-xor": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
@@ -1572,6 +1959,12 @@
       "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
       "dev": true
     },
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+      "dev": true
+    },
     "cacache": {
       "version": "11.3.3",
       "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz",
@@ -1611,12 +2004,33 @@
         "unset-value": "^1.0.0"
       }
     },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
     "camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
+    "caniuse-lite": {
+      "version": "1.0.30000985",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000985.tgz",
+      "integrity": "sha512-1ngiwkgqAYPG0JSSUp3PUDGPKKY59EK7NrGGX+VOxaKCNzRbNc7uXMny+c3VJfZxtoK3wSImTvG9T9sXiTw2+w==",
+      "dev": true
+    },
+    "capture-exit": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+      "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+      "dev": true,
+      "requires": {
+        "rsvp": "^4.8.4"
+      }
+    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -1674,6 +2088,12 @@
         "tslib": "^1.9.0"
       }
     },
+    "ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
+    },
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -1718,6 +2138,12 @@
         "wrap-ansi": "^5.1.0"
       }
     },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
+    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -1761,6 +2187,30 @@
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
+    "compressible": {
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
+      "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
+      "dev": true,
+      "requires": {
+        "mime-db": ">= 1.40.0 < 2"
+      }
+    },
+    "compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      }
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -1779,6 +2229,12 @@
         "typedarray": "^0.0.6"
       }
     },
+    "connect-history-api-fallback": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+      "dev": true
+    },
     "console-browserify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
@@ -1794,6 +2250,21 @@
       "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
       "dev": true
     },
+    "content-disposition": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "dev": true
+    },
     "convert-source-map": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
@@ -1803,6 +2274,18 @@
         "safe-buffer": "~5.1.1"
       }
     },
+    "cookie": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+      "dev": true
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+      "dev": true
+    },
     "copy-concurrently": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
@@ -1823,10 +2306,29 @@
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
       "dev": true
     },
-    "core-js": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz",
-      "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==",
+    "core-js-compat": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.1.4.tgz",
+      "integrity": "sha512-Z5zbO9f1d0YrJdoaQhphVAnKPimX92D6z8lCGphH89MNRxlL1prI9ExJPqVwP0/kgkQCv8c4GJGT8X16yUncOg==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.6.2",
+        "core-js-pure": "3.1.4",
+        "semver": "^6.1.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "core-js-pure": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.1.4.tgz",
+      "integrity": "sha512-uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA==",
       "dev": true
     },
     "core-util-is": {
@@ -1937,6 +2439,22 @@
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true
     },
+    "deep-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
+      "dev": true
+    },
+    "default-gateway": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+      "dev": true,
+      "requires": {
+        "execa": "^1.0.0",
+        "ip-regex": "^2.1.0"
+      }
+    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -1987,6 +2505,27 @@
         }
       }
     },
+    "del": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+      "dev": true,
+      "requires": {
+        "@types/glob": "^7.1.1",
+        "globby": "^6.1.0",
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
+      }
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true
+    },
     "des.js": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
@@ -1997,12 +2536,24 @@
         "minimalistic-assert": "^1.0.0"
       }
     },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "dev": true
+    },
     "detect-file": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
       "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
       "dev": true
     },
+    "detect-node": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "dev": true
+    },
     "diffie-hellman": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
@@ -2014,6 +2565,31 @@
         "randombytes": "^2.0.0"
       }
     },
+    "dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
+      "dev": true
+    },
+    "dns-packet": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "dev": true,
+      "requires": {
+        "ip": "^1.1.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "dns-txt": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "dev": true,
+      "requires": {
+        "buffer-indexof": "^1.0.0"
+      }
+    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -2032,6 +2608,18 @@
         "stream-shift": "^1.0.0"
       }
     },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true
+    },
+    "electron-to-chromium": {
+      "version": "1.3.201",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.201.tgz",
+      "integrity": "sha512-aCTPIfY1Jvuam5b6vuWRjt1F8i4kY7zX0Qtpu5SNd6l1zjuxU9fDNpbM4o6+oJsra+TMD2o7D20GnkSIgpTr9w==",
+      "dev": true
+    },
     "elliptic": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz",
@@ -2059,6 +2647,12 @@
       "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
       "dev": true
     },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "dev": true
+    },
     "end-of-stream": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
@@ -2088,6 +2682,15 @@
         "prr": "~1.0.1"
       }
     },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
     "es-abstract": {
       "version": "1.13.0",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
@@ -2119,6 +2722,12 @@
       "integrity": "sha512-J3ZkwbEnnO+fGAKrjVpeUAnZshAdfZvbhQpqfIH9kSAspReRC4nJnu8ewm55b4y9ElyeuhCTzJD0XiH8Tsbhlw==",
       "dev": true
     },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true
+    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -2156,12 +2765,33 @@
       "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
       "dev": true
     },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "dev": true
+    },
+    "eventemitter3": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
+      "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==",
+      "dev": true
+    },
     "events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
       "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
       "dev": true
     },
+    "eventsource": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+      "dev": true,
+      "requires": {
+        "original": "^1.0.0"
+      }
+    },
     "evp_bytestokey": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
@@ -2172,6 +2802,12 @@
         "safe-buffer": "^5.1.1"
       }
     },
+    "exec-sh": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz",
+      "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==",
+      "dev": true
+    },
     "execa": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
@@ -2231,6 +2867,52 @@
         "homedir-polyfill": "^1.0.1"
       }
     },
+    "express": {
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.7",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
+        "content-type": "~1.0.4",
+        "cookie": "0.4.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "~1.1.2",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.1.2",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "array-flatten": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+          "dev": true
+        }
+      }
+    },
     "extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
@@ -2329,6 +3011,24 @@
       "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
       "dev": true
     },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "dev": true,
+      "requires": {
+        "websocket-driver": ">=0.5.1"
+      }
+    },
+    "fb-watchman": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
+      "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=",
+      "dev": true,
+      "requires": {
+        "bser": "^2.0.0"
+      }
+    },
     "figgy-pudding": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
@@ -2358,6 +3058,21 @@
         }
       }
     },
+    "finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      }
+    },
     "find-cache-dir": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
@@ -2400,12 +3115,44 @@
         "readable-stream": "^2.3.6"
       }
     },
+    "follow-redirects": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
+      "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.6"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
+      }
+    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
       "dev": true
     },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true
+    },
     "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -2415,6 +3162,12 @@
         "map-cache": "^0.2.2"
       }
     },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "dev": true
+    },
     "from2": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
@@ -3100,12 +3853,39 @@
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true
     },
+    "globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "dev": true,
+      "requires": {
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
     "graceful-fs": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz",
       "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==",
       "dev": true
     },
+    "handle-thing": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
+      "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
+      "dev": true
+    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -3115,23 +3895,6 @@
         "function-bind": "^1.1.1"
       }
     },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        }
-      }
-    },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -3216,12 +3979,101 @@
         "parse-passwd": "^1.0.0"
       }
     },
+    "hosted-git-info": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
+      "dev": true
+    },
+    "hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "html-entities": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
+      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+      "dev": true
+    },
+    "http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "dev": true,
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
+      }
+    },
+    "http-parser-js": {
+      "version": "0.4.10",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
+      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
+      "dev": true
+    },
+    "http-proxy": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "dev": true,
+      "requires": {
+        "eventemitter3": "^3.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "http-proxy-middleware": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
+      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+      "dev": true,
+      "requires": {
+        "http-proxy": "^1.17.0",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.11",
+        "micromatch": "^3.1.10"
+      }
+    },
     "https-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
       "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
       "dev": true
     },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
     "ieee754": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
@@ -3272,6 +4124,16 @@
       "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
       "dev": true
     },
+    "internal-ip": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
+      "dev": true,
+      "requires": {
+        "default-gateway": "^4.2.0",
+        "ipaddr.js": "^1.9.0"
+      }
+    },
     "interpret": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
@@ -3293,6 +4155,24 @@
       "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
       "dev": true
     },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
+      "dev": true
+    },
+    "ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "dev": true
+    },
+    "ipaddr.js": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
+      "dev": true
+    },
     "is-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
@@ -3313,6 +4193,12 @@
         }
       }
     },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
     "is-binary-path": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
@@ -3334,6 +4220,15 @@
       "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
       "dev": true
     },
+    "is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dev": true,
+      "requires": {
+        "ci-info": "^2.0.0"
+      }
+    },
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -3426,6 +4321,36 @@
         }
       }
     },
+    "is-path-cwd": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "^2.1.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "^1.0.2"
+      }
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true
+    },
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -3489,6 +4414,136 @@
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
       "dev": true
     },
+    "istanbul-lib-coverage": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
+      "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
+      "dev": true
+    },
+    "istanbul-lib-instrument": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz",
+      "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==",
+      "dev": true,
+      "requires": {
+        "@babel/generator": "^7.4.0",
+        "@babel/parser": "^7.4.3",
+        "@babel/template": "^7.4.0",
+        "@babel/traverse": "^7.4.3",
+        "@babel/types": "^7.4.0",
+        "istanbul-lib-coverage": "^2.0.5",
+        "semver": "^6.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "jest-haste-map": {
+      "version": "24.8.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.8.1.tgz",
+      "integrity": "sha512-SwaxMGVdAZk3ernAx2Uv2sorA7jm3Kx+lR0grp6rMmnY06Kn/urtKx1LPN2mGTea4fCT38impYT28FfcLUhX0g==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^24.8.0",
+        "anymatch": "^2.0.0",
+        "fb-watchman": "^2.0.0",
+        "fsevents": "^1.2.7",
+        "graceful-fs": "^4.1.15",
+        "invariant": "^2.2.4",
+        "jest-serializer": "^24.4.0",
+        "jest-util": "^24.8.0",
+        "jest-worker": "^24.6.0",
+        "micromatch": "^3.1.10",
+        "sane": "^4.0.3",
+        "walker": "^1.0.7"
+      }
+    },
+    "jest-message-util": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.8.0.tgz",
+      "integrity": "sha512-p2k71rf/b6ns8btdB0uVdljWo9h0ovpnEe05ZKWceQGfXYr4KkzgKo3PBi8wdnd9OtNh46VpNIJynUn/3MKm1g==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/test-result": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "@types/stack-utils": "^1.0.1",
+        "chalk": "^2.0.1",
+        "micromatch": "^3.1.10",
+        "slash": "^2.0.0",
+        "stack-utils": "^1.0.1"
+      }
+    },
+    "jest-mock": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.8.0.tgz",
+      "integrity": "sha512-6kWugwjGjJw+ZkK4mDa0Df3sDlUTsV47MSrT0nGQ0RBWJbpODDQ8MHDVtGtUYBne3IwZUhtB7elxHspU79WH3A==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^24.8.0"
+      }
+    },
+    "jest-regex-util": {
+      "version": "24.3.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.3.0.tgz",
+      "integrity": "sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg==",
+      "dev": true
+    },
+    "jest-serializer": {
+      "version": "24.4.0",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.4.0.tgz",
+      "integrity": "sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q==",
+      "dev": true
+    },
+    "jest-util": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.8.0.tgz",
+      "integrity": "sha512-DYZeE+XyAnbNt0BG1OQqKy/4GVLPtzwGx5tsnDrFcax36rVE3lTA5fbvgmbVPUZf9w77AJ8otqR4VBbfFJkUZA==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^24.7.1",
+        "@jest/fake-timers": "^24.8.0",
+        "@jest/source-map": "^24.3.0",
+        "@jest/test-result": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "callsites": "^3.0.0",
+        "chalk": "^2.0.1",
+        "graceful-fs": "^4.1.15",
+        "is-ci": "^2.0.0",
+        "mkdirp": "^0.5.1",
+        "slash": "^2.0.0",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "jest-worker": {
+      "version": "24.6.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.6.0.tgz",
+      "integrity": "sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==",
+      "dev": true,
+      "requires": {
+        "merge-stream": "^1.0.1",
+        "supports-color": "^6.1.0"
+      }
+    },
+    "js-levenshtein": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
+      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
+      "dev": true
+    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -3513,6 +4568,12 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
+    "json3": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
+      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
+      "dev": true
+    },
     "json5": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
@@ -3522,6 +4583,12 @@
         "minimist": "^1.2.0"
       }
     },
+    "killable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
+      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
+      "dev": true
+    },
     "kind-of": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
@@ -3537,6 +4604,26 @@
         "invert-kv": "^2.0.0"
       }
     },
+    "load-json-file": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
+      }
+    },
     "loader-runner": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
@@ -3570,22 +4657,10 @@
       "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
       "dev": true
     },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-      "dev": true
-    },
-    "lodash.pick": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
-      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
-      "dev": true
-    },
-    "lodash.some": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
-      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
+    "loglevel": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.3.tgz",
+      "integrity": "sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==",
       "dev": true
     },
     "loose-envify": {
@@ -3616,6 +4691,15 @@
         "semver": "^5.6.0"
       }
     },
+    "makeerror": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "dev": true,
+      "requires": {
+        "tmpl": "1.0.x"
+      }
+    },
     "mamacro": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
@@ -3657,6 +4741,12 @@
         "safe-buffer": "^5.1.2"
       }
     },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true
+    },
     "mem": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
@@ -3678,6 +4768,27 @@
         "readable-stream": "^2.0.1"
       }
     },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+      "dev": true
+    },
+    "merge-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
+      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "dev": true
+    },
     "micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -3709,6 +4820,27 @@
         "brorand": "^1.0.1"
       }
     },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true
+    },
+    "mime-db": {
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.40.0"
+      }
+    },
     "mimic-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -3818,6 +4950,22 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
+    "multicast-dns": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "dev": true,
+      "requires": {
+        "dns-packet": "^1.3.1",
+        "thunky": "^1.0.2"
+      }
+    },
+    "multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
+      "dev": true
+    },
     "nan": {
       "version": "2.14.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
@@ -3844,6 +4992,12 @@
         "to-regex": "^3.0.1"
       }
     },
+    "negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "dev": true
+    },
     "neo-async": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
@@ -3856,6 +5010,18 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
+    "node-forge": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
+      "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==",
+      "dev": true
+    },
+    "node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+      "dev": true
+    },
     "node-libs-browser": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
@@ -3895,6 +5061,27 @@
         }
       }
     },
+    "node-releases": {
+      "version": "1.1.26",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.26.tgz",
+      "integrity": "sha512-fZPsuhhUHMTlfkhDLGtfY80DSJTjOcx+qD1j5pqPkuhUHVS7xHZIg9EE4DHK8O3f0zTxXHX5VIkDG8pu98/wfQ==",
+      "dev": true,
+      "requires": {
+        "semver": "^5.3.0"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
     "normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -3910,6 +5097,12 @@
         "path-key": "^2.0.0"
       }
     },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
+    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -3962,6 +5155,18 @@
         "isobject": "^3.0.0"
       }
     },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
     "object.getownpropertydescriptors": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
@@ -3981,6 +5186,27 @@
         "isobject": "^3.0.1"
       }
     },
+    "obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "dev": true
+    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -3990,6 +5216,24 @@
         "wrappy": "1"
       }
     },
+    "opn": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+      "dev": true,
+      "requires": {
+        "is-wsl": "^1.1.0"
+      }
+    },
+    "original": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
+      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
+      "dev": true,
+      "requires": {
+        "url-parse": "^1.4.3"
+      }
+    },
     "os-browserify": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
@@ -4007,6 +5251,17 @@
         "mem": "^4.0.0"
       }
     },
+    "output-file-sync": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-2.0.1.tgz",
+      "integrity": "sha512-mDho4qm7WgIXIGf4eYU1RHN2UU5tPfVYVSRwDJw0uTmj35DQUt/eNp19N7v6T3SrR0ESTEf2up2CGO73qI35zQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "is-plain-obj": "^1.1.0",
+        "mkdirp": "^0.5.1"
+      }
+    },
     "p-defer": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
@@ -4043,6 +5298,21 @@
         "p-limit": "^2.0.0"
       }
     },
+    "p-map": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+      "dev": true
+    },
+    "p-retry": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
+      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
+      "dev": true,
+      "requires": {
+        "retry": "^0.12.0"
+      }
+    },
     "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -4080,12 +5350,28 @@
         "safe-buffer": "^5.1.1"
       }
     },
+    "parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+      "dev": true,
+      "requires": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      }
+    },
     "parse-passwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
       "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
       "dev": true
     },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true
+    },
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -4116,6 +5402,12 @@
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true
     },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
     "path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
@@ -4128,6 +5420,29 @@
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+      "dev": true
+    },
+    "path-type": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "dev": true,
+      "requires": {
+        "pify": "^3.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
+      }
+    },
     "pbkdf2": {
       "version": "3.0.17",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
@@ -4147,6 +5462,21 @@
       "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
       "dev": true
     },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
     "pkg-dir": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
@@ -4156,6 +5486,17 @@
         "find-up": "^3.0.0"
       }
     },
+    "portfinder": {
+      "version": "1.0.21",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.21.tgz",
+      "integrity": "sha512-ESabpDCzmBS3ekHbmpAIiESq3udRsCBGiBZLsC+HgBKv2ezb0R4oG+7RnYEVZ/ZCfhel5Tx3UzdNWA0Lox2QCA==",
+      "dev": true,
+      "requires": {
+        "async": "^1.5.2",
+        "debug": "^2.2.0",
+        "mkdirp": "0.5.x"
+      }
+    },
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -4186,6 +5527,16 @@
       "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
       "dev": true
     },
+    "proxy-addr": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
+      "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
+      "dev": true,
+      "requires": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.9.0"
+      }
+    },
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -4245,6 +5596,12 @@
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
+    "qs": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+      "dev": true
+    },
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -4257,6 +5614,12 @@
       "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
       "dev": true
     },
+    "querystringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
+      "dev": true
+    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -4276,6 +5639,53 @@
         "safe-buffer": "^5.1.0"
       }
     },
+    "range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true
+    },
+    "raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+          "dev": true
+        }
+      }
+    },
+    "read-pkg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "^4.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^3.0.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
+      "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
+      "dev": true,
+      "requires": {
+        "find-up": "^3.0.0",
+        "read-pkg": "^3.0.0"
+      }
+    },
     "readable-stream": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
@@ -4302,27 +5712,28 @@
         "readable-stream": "^2.0.2"
       }
     },
+    "realpath-native": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz",
+      "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==",
+      "dev": true,
+      "requires": {
+        "util.promisify": "^1.0.0"
+      }
+    },
     "regenerate": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
       "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
       "dev": true
     },
-    "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "dev": true
-    },
-    "regenerator-transform": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
-      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+    "regenerate-unicode-properties": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
+      "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.18.0",
-        "babel-types": "^6.19.0",
-        "private": "^0.1.6"
+        "regenerate": "^1.4.0"
       }
     },
     "regex-not": {
@@ -4335,40 +5746,12 @@
         "safe-regex": "^1.1.0"
       }
     },
-    "regexpu-core": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
-      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
-      "dev": true,
-      "requires": {
-        "regenerate": "^1.2.1",
-        "regjsgen": "^0.2.0",
-        "regjsparser": "^0.1.4"
-      }
-    },
-    "regjsgen": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+    "regexp-tree": {
+      "version": "0.1.11",
+      "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.11.tgz",
+      "integrity": "sha512-7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg==",
       "dev": true
     },
-    "regjsparser": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-      "dev": true,
-      "requires": {
-        "jsesc": "~0.5.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        }
-      }
-    },
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -4399,6 +5782,12 @@
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
       "dev": true
     },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "dev": true
+    },
     "resolve": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
@@ -4458,6 +5847,12 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
+    "retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+      "dev": true
+    },
     "rev-hash": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/rev-hash/-/rev-hash-2.0.0.tgz",
@@ -4483,6 +5878,12 @@
         "inherits": "^2.0.1"
       }
     },
+    "rsvp": {
+      "version": "4.8.5",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+      "dev": true
+    },
     "run-queue": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
@@ -4507,6 +5908,29 @@
         "ret": "~0.1.10"
       }
     },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "sane": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+      "dev": true,
+      "requires": {
+        "@cnakazawa/watch": "^1.0.3",
+        "anymatch": "^2.0.0",
+        "capture-exit": "^2.0.0",
+        "exec-sh": "^0.3.2",
+        "execa": "^1.0.0",
+        "fb-watchman": "^2.0.0",
+        "micromatch": "^3.1.4",
+        "minimist": "^1.1.1",
+        "walker": "~1.0.5"
+      }
+    },
     "schema-utils": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
@@ -4518,18 +5942,115 @@
         "ajv-keywords": "^3.1.0"
       }
     },
+    "select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
+      "dev": true
+    },
+    "selfsigned": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",
+      "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==",
+      "dev": true,
+      "requires": {
+        "node-forge": "0.7.5"
+      }
+    },
     "semver": {
       "version": "5.7.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
       "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
       "dev": true
     },
+    "send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.7.2",
+        "mime": "1.6.0",
+        "ms": "2.1.1",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.1",
+        "statuses": "~1.5.0"
+      },
+      "dependencies": {
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
     "serialize-javascript": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
       "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==",
       "dev": true
     },
+    "serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "dependencies": {
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "dev": true,
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        },
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+          "dev": true
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "dev": true,
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
+      }
+    },
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -4565,6 +6086,12 @@
       "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
       "dev": true
     },
+    "setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "dev": true
+    },
     "sha.js": {
       "version": "2.4.11",
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
@@ -4596,6 +6123,12 @@
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
       "dev": true
     },
+    "slash": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+      "dev": true
+    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -4703,6 +6236,56 @@
         }
       }
     },
+    "sockjs": {
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+      "dev": true,
+      "requires": {
+        "faye-websocket": "^0.10.0",
+        "uuid": "^3.0.1"
+      }
+    },
+    "sockjs-client": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
+      "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.5",
+        "eventsource": "^1.0.7",
+        "faye-websocket": "~0.11.1",
+        "inherits": "^2.0.3",
+        "json3": "^3.3.2",
+        "url-parse": "^1.4.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "faye-websocket": {
+          "version": "0.11.3",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+          "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
+          "dev": true,
+          "requires": {
+            "websocket-driver": ">=0.5.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
+      }
+    },
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -4721,37 +6304,141 @@
       "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
       "dev": true,
       "requires": {
-        "atob": "^2.1.1",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.5.12",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "dev": true
+    },
+    "spdx-correct": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "dev": true
+    },
+    "spdy": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
+      "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
-    "source-map-support": {
-      "version": "0.5.12",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
-      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
+    "spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
       "dev": true,
       "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
       },
       "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
+        },
+        "readable-stream": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
         }
       }
     },
-    "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-      "dev": true
-    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -4770,6 +6457,12 @@
         "figgy-pudding": "^3.5.1"
       }
     },
+    "stack-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
+      "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==",
+      "dev": true
+    },
     "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -4791,6 +6484,12 @@
         }
       }
     },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "dev": true
+    },
     "stream-browserify": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
@@ -4859,6 +6558,12 @@
         "ansi-regex": "^4.1.0"
       }
     },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true
+    },
     "strip-eof": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
@@ -4925,6 +6630,18 @@
         }
       }
     },
+    "test-exclude": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz",
+      "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3",
+        "minimatch": "^3.0.4",
+        "read-pkg-up": "^4.0.0",
+        "require-main-filename": "^2.0.0"
+      }
+    },
     "through2": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
@@ -4935,6 +6652,12 @@
         "xtend": "~4.0.1"
       }
     },
+    "thunky": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
+      "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
+      "dev": true
+    },
     "timers-browserify": {
       "version": "2.0.10",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
@@ -4944,6 +6667,12 @@
         "setimmediate": "^1.0.4"
       }
     },
+    "tmpl": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
+      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "dev": true
+    },
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
@@ -4998,6 +6727,12 @@
         "repeat-string": "^1.6.1"
       }
     },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true
+    },
     "trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
@@ -5016,6 +6751,16 @@
       "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
       "dev": true
     },
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dev": true,
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      }
+    },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@@ -5040,6 +6785,34 @@
         }
       }
     },
+    "unicode-canonical-property-names-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "dev": true
+    },
+    "unicode-match-property-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "dev": true,
+      "requires": {
+        "unicode-canonical-property-names-ecmascript": "^1.0.4",
+        "unicode-property-aliases-ecmascript": "^1.0.4"
+      }
+    },
+    "unicode-match-property-value-ecmascript": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==",
+      "dev": true
+    },
+    "unicode-property-aliases-ecmascript": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
+      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==",
+      "dev": true
+    },
     "union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -5070,6 +6843,12 @@
         "imurmurhash": "^0.1.4"
       }
     },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true
+    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -5149,6 +6928,16 @@
         }
       }
     },
+    "url-parse": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "dev": true,
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -5188,18 +6977,55 @@
         "object.getownpropertydescriptors": "^2.0.3"
       }
     },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "dev": true
+    },
     "v8-compile-cache": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
       "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==",
       "dev": true
     },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "dev": true
+    },
     "vm-browserify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
       "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==",
       "dev": true
     },
+    "walker": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
+      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "dev": true,
+      "requires": {
+        "makeerror": "1.0.x"
+      }
+    },
     "watchpack": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
@@ -5211,6 +7037,15 @@
         "neo-async": "^2.5.0"
       }
     },
+    "wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "requires": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
     "webpack": {
       "version": "4.37.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.37.0.tgz",
@@ -5259,6 +7094,263 @@
         "supports-color": "6.1.0",
         "v8-compile-cache": "2.0.3",
         "yargs": "13.2.4"
+      },
+      "dependencies": {
+        "yargs": {
+          "version": "13.2.4",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
+          "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
+          "dev": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "os-locale": "^3.1.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.0"
+          }
+        }
+      }
+    },
+    "webpack-dev-middleware": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz",
+      "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==",
+      "dev": true,
+      "requires": {
+        "memory-fs": "^0.4.1",
+        "mime": "^2.4.2",
+        "range-parser": "^1.2.1",
+        "webpack-log": "^2.0.0"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "2.4.4",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+          "dev": true
+        }
+      }
+    },
+    "webpack-dev-server": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.7.2.tgz",
+      "integrity": "sha512-mjWtrKJW2T9SsjJ4/dxDC2fkFVUw8jlpemDERqV0ZJIkjjjamR2AbQlr3oz+j4JLhYCHImHnXZK5H06P2wvUew==",
+      "dev": true,
+      "requires": {
+        "ansi-html": "0.0.7",
+        "bonjour": "^3.5.0",
+        "chokidar": "^2.1.6",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^1.6.0",
+        "debug": "^4.1.1",
+        "del": "^4.1.1",
+        "express": "^4.17.1",
+        "html-entities": "^1.2.1",
+        "http-proxy-middleware": "^0.19.1",
+        "import-local": "^2.0.0",
+        "internal-ip": "^4.3.0",
+        "ip": "^1.1.5",
+        "killable": "^1.0.1",
+        "loglevel": "^1.6.3",
+        "opn": "^5.5.0",
+        "p-retry": "^3.0.1",
+        "portfinder": "^1.0.20",
+        "schema-utils": "^1.0.0",
+        "selfsigned": "^1.10.4",
+        "semver": "^6.1.1",
+        "serve-index": "^1.9.1",
+        "sockjs": "0.3.19",
+        "sockjs-client": "1.3.0",
+        "spdy": "^4.0.0",
+        "strip-ansi": "^3.0.1",
+        "supports-color": "^6.1.0",
+        "url": "^0.11.0",
+        "webpack-dev-middleware": "^3.7.0",
+        "webpack-log": "^2.0.0",
+        "yargs": "12.0.5"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "get-caller-file": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "require-main-filename": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
+          },
+          "dependencies": {
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+              "dev": true,
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "dev": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            }
+          }
+        },
+        "yargs": {
+          "version": "12.0.5",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^4.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^3.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1 || ^4.0.0",
+            "yargs-parser": "^11.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
+    "webpack-log": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^3.0.0",
+        "uuid": "^3.3.2"
       }
     },
     "webpack-merge-and-include-globally": {
@@ -5290,6 +7382,23 @@
         }
       }
     },
+    "websocket-driver": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
+      "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
+      "dev": true,
+      "requires": {
+        "http-parser-js": ">=0.4.0 <0.4.11",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "dev": true
+    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -5331,6 +7440,17 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
     },
+    "write-file-atomic": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz",
+      "integrity": "sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.2"
+      }
+    },
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -5350,22 +7470,21 @@
       "dev": true
     },
     "yargs": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
-      "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
+      "version": "13.3.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
+      "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
       "dev": true,
       "requires": {
         "cliui": "^5.0.0",
         "find-up": "^3.0.0",
         "get-caller-file": "^2.0.1",
-        "os-locale": "^3.1.0",
         "require-directory": "^2.1.1",
         "require-main-filename": "^2.0.0",
         "set-blocking": "^2.0.0",
         "string-width": "^3.0.0",
         "which-module": "^2.0.0",
         "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.0"
+        "yargs-parser": "^13.1.1"
       }
     },
     "yargs-parser": {
diff --git a/package.json b/package.json
index 0af6297..ffb6794 100644
--- a/package.json
+++ b/package.json
@@ -22,12 +22,18 @@
   },
   "homepage": "https://github.com/blockpy-edu/BlockMirror#readme",
   "devDependencies": {
+    "@babel/cli": "^7.5.0",
+    "@babel/core": "^7.5.4",
+    "@babel/plugin-transform-runtime": "^7.5.5",
+    "@babel/preset-env": "^7.5.4",
+    "babel-jest": "^24.8.0",
     "babel-loader": "^8.0.6",
-    "babel-minify": "^0.5.0",
-    "babel-preset-es2015": "^6.24.1",
+    "babel-plugin-add-module-exports": "^1.0.2",
     "uglify-js": "^3.6.0",
-    "webpack": "^4.35.2",
-    "webpack-cli": "^3.3.5",
-    "webpack-merge-and-include-globally": "^2.1.16"
+    "webpack": "^4.35.3",
+    "webpack-cli": "^3.3.6",
+    "webpack-dev-server": "^3.7.2",
+    "webpack-merge-and-include-globally": "^2.1.16",
+    "yargs": "latest"
   }
 }
diff --git a/src/ast/ast_Call.js b/src/ast/ast_Call.js
index bc9d6b3..74dbeae 100644
--- a/src/ast/ast_Call.js
+++ b/src/ast/ast_Call.js
@@ -411,6 +411,8 @@ Blockly.Blocks['ast_Call'] = {
 };
 
 Blockly.Python['ast_Call'] = function (block) {
+    // TODO: Handle import
+    // Blockly.Python.definitions_['import_matplotlib'] = 'import matplotlib.pyplot as plt';
     // Get the caller
     let funcName = "";
     if (block.isMethod_) {
@@ -503,7 +505,14 @@ BlockMirrorTextToBlocks.prototype['ast_Call'] = function (node, parent) {
     }
     let returns = true;
 
-    if (signature !== null) {
+    if (signature !== null && signature !== undefined) {
+        if (signature.custom) {
+            try {
+                return signature.custom(node, parent)
+            } catch (e) {
+                // We tried to be fancy and failed, better fall back to default behavior!
+            }
+        }
         if ('returns' in signature) {
             returns = signature.returns;
         }
diff --git a/src/ast/ast_ClassDef.js b/src/ast/ast_ClassDef.js
index fca80b0..0ca2247 100644
--- a/src/ast/ast_ClassDef.js
+++ b/src/ast/ast_ClassDef.js
@@ -100,9 +100,9 @@ Blockly.Python['ast_ClassDef'] = function (block) {
     // Body:
     let body = Blockly.Python.statementToCode(block, 'BODY') || Blockly.Python.PASS;
     // Put it together
-    let arguments = (bases.concat(keywords));
-    arguments = (arguments.length === 0) ? "" : "(" + arguments.join(', ') + ")";
-    return decorators.join('') + "class " + name + arguments + ":\n" + body;
+    let args = (bases.concat(keywords));
+    args = (args.length === 0) ? "" : "(" + args.join(', ') + ")";
+    return decorators.join('') + "class " + name + args + ":\n" + body;
 }
 ;
 
diff --git a/src/ast/ast_functions.js b/src/ast/ast_functions.js
index a49f5f6..2a32aa9 100644
--- a/src/ast/ast_functions.js
+++ b/src/ast/ast_functions.js
@@ -7,7 +7,8 @@ BlockMirrorTextToBlocks.prototype.FUNCTION_SIGNATURES = {
     'any': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LOGIC},
     'ascii': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
     'bin': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'bool': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LOGIC},
+    'bool': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LOGIC,
+    simple: ['x']},
     'breakpoint': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
     'bytearray': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
     'bytes': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
@@ -24,7 +25,8 @@ BlockMirrorTextToBlocks.prototype.FUNCTION_SIGNATURES = {
     'eval': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
     'exec': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
     'filter': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'float': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
+    'float': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH,
+    simple: ['x']},
     'format': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
     'frozenset': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
     'getattr': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.OO},
@@ -34,8 +36,10 @@ BlockMirrorTextToBlocks.prototype.FUNCTION_SIGNATURES = {
     'help': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
     'hex': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
     'id': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
-    'input': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
-    'int': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
+    'input': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT,
+    simple: ['prompt']},
+    'int': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH,
+    simple: ['x']},
     'isinstance': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LOGIC},
     'issubclass': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.LOGIC},
     'iter': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
@@ -52,12 +56,16 @@ BlockMirrorTextToBlocks.prototype.FUNCTION_SIGNATURES = {
     'open': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.FILE},
     'ord': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
     'pow': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
-    'print': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
+    'print': {returns: false, colour: BlockMirrorTextToBlocks.COLOR.TEXT,
+    simple: ['message'], full: ['*messages', 'sep', 'end', 'file', 'flush']},
     'property': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.OO},
-    'range': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
+    'range': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES,
+    simple: ['stop'], full: ['start', 'stop', 'step']},
     'repr': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
     'reversed': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES},
-    'round': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
+    'round': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH,
+    full: ['x', 'ndigits'],
+    simple: ['x']},
     'set': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.SET},
     'setattr': {
         'returns': false,
@@ -71,7 +79,8 @@ BlockMirrorTextToBlocks.prototype.FUNCTION_SIGNATURES = {
         colour: BlockMirrorTextToBlocks.COLOR.SEQUENCES
     },
     'staticmethod': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.OO},
-    'str': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT},
+    'str': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TEXT,
+    simple: ['x']},
     'sum': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
     'super': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.OO},
     'tuple': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.TUPLE},
@@ -194,36 +203,43 @@ BlockMirrorTextToBlocks.prototype.MODULE_FUNCTION_SIGNATURES = {
     'plt': {
         'show': {
             returns: false,
+            simple: [],
             message: 'show plot canvas',
             colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
         },
         'hist': {
             returns: false,
+            simple: ['values'],
             message: 'plot histogram',
             colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
         },
         'plot': {
             returns: false,
+            simple: ['values'],
             message: 'plot line',
             colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
         },
         'scatter': {
             returns: false,
+            simple: ['xs', 'ys'],
             message: 'plot scatter',
             colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
         },
         'title': {
             returns: false,
+            simple: ['label'],
             message: "make plot's title",
             colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
         },
         'xlabel': {
             returns: false,
+            simple: ['label'],
             message: "make plot's x-axis label",
             colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
         },
         'ylabel': {
             returns: false,
+            simple: ['label'],
             message: "make plot's y-axis label",
             colour: BlockMirrorTextToBlocks.COLOR.PLOTTING
         }
@@ -231,4 +247,40 @@ BlockMirrorTextToBlocks.prototype.MODULE_FUNCTION_SIGNATURES = {
 };
 
 BlockMirrorTextToBlocks.prototype.MODULE_FUNCTION_SIGNATURES['matplotlib.pyplot'] =
-    BlockMirrorTextToBlocks.prototype.MODULE_FUNCTION_SIGNATURES['plt'];
\ No newline at end of file
+    BlockMirrorTextToBlocks.prototype.MODULE_FUNCTION_SIGNATURES['plt'];
+
+BlockMirrorTextToBlocks.getFunctionBlock = function(name, values, module) {
+    if (values === undefined) {
+        values = {};
+    }
+    // TODO: hack, we shouldn't be accessing the prototype like this
+    let signature;
+    let method = false;
+    if (module !== undefined) {
+        signature = BlockMirrorTextToBlocks.prototype.MODULE_FUNCTION_SIGNATURES[module][name];
+    } else if (name.startsWith('.')) {
+        signature = BlockMirrorTextToBlocks.prototype.METHOD_SIGNATURES[name.substr(1)];
+        method = true;
+    } else {
+        signature = BlockMirrorTextToBlocks.prototype.FUNCTION_SIGNATURES[name];
+    }
+    let args = (signature.simple !== undefined ? signature.simple :
+               signature.full !== undefined ? signature.full : []);
+    let argumentsMutation = {
+        "@arguments": args.length,
+        "@returns": (signature.returns || false),
+        "@parameters": true,
+        "@method": method,
+        "@name": name,
+        "@message": signature.message ? signature.message : name,
+        "@premessage": signature.premessage ? signature.premessage : "",
+        "@colour": signature.colour ? signature.colour : 0
+    };
+    for (let i = 0; i < args.length; i += 1) {
+        argumentsMutation["UNKNOWN_ARG:" + i] = null;
+    }
+    let newBlock = BlockMirrorTextToBlocks.create_block("ast_Call", null, {},
+        values, {inline: true}, argumentsMutation);
+    // Return as either statement or expression
+    return BlockMirrorTextToBlocks.xmlToString(newBlock);
+};
\ No newline at end of file
diff --git a/src/block_editor.js b/src/block_editor.js
index 3bd50e9..86ad661 100644
--- a/src/block_editor.js
+++ b/src/block_editor.js
@@ -25,7 +25,7 @@ function BlockMirrorBlockEditor(blockMirror) {
         readOnly: blockMirror.configuration.readOnly,
         scrollbars: true,
         toolbox: this.makeToolbox()
-    }
+    };
     this.workspace = Blockly.inject(blockMirror.tags.blockEditor,
         blocklyOptions);
     // Configure Blockly
@@ -36,7 +36,7 @@ function BlockMirrorBlockEditor(blockMirror) {
     this.blockContainer.style.float = 'left';
     this.blockEditor.style.position = 'absolute';
     this.blockEditor.style.width = '100%';
-    this.blockArea.style.height = blockMirror.configuration.height;
+    this.blockArea.style.height = blockMirror.configuration.height + "px";
 
     window.addEventListener('resize', this.resized.bind(this), false);
     this.resized();
@@ -45,42 +45,38 @@ function BlockMirrorBlockEditor(blockMirror) {
 BlockMirrorBlockEditor.prototype.updateWidth = function () {
     var newWidth = '0%';
     this.resized();
-}
+};
 
 BlockMirrorBlockEditor.prototype.resized = function (e) {
+    this.resizeResponsively();
     // Compute the absolute coordinates and dimensions of blocklyArea.
     var blockArea = this.blockMirror.tags.blockArea;
-    var current = blockArea;
+    /*var current = blockArea;
     var x = 0;
     var y = 0;
     do {
         x += current.offsetLeft;
         y += current.offsetTop;
         current = current.offsetParent;
-    } while (current);
+    } while (current);*/
     // Position blocklyDiv over blockArea.
     var blockEditor = this.blockMirror.tags.blockEditor;
-    blockEditor.style.left = x + 'px';
-    blockEditor.style.top = y + 'px';
+    /*blockEditor.style.left = x + 'px';
+    blockEditor.style.top = y + 'px';*/
     blockEditor.style.width = blockArea.offsetWidth + 'px';
     blockEditor.style.height = blockArea.offsetHeight + 'px';
     Blockly.svgResize(this.workspace);
-}
+};
 
 BlockMirrorBlockEditor.prototype.makeToolbox = function () {
-    var xml = '<xml id="toolbox" style="display: none">';
-    xml += '<category name="Variables" custom="VARIABLE" colour="240">' +
-        '</category>';
-    xml += '<category name="Iteration" colour="300">' +
-        '<block type="ast_For"></block>' +
-        '<block type="ast_ForElse"></block>' +
-        '</category>';
-    xml += '<category name="Values" colour="300">' +
-        '<block type="ast_Num"></block>' +
-        '</category>';
-    //xml += '<category name="Values" colour="300"><button value="From Code">From Code</button></category>';
-    xml += '</xml>';
-    return xml;
+    let toolbox = this.blockMirror.configuration.toolbox;
+    if (toolbox in this.TOOLBOXES) {
+        toolbox = this.TOOLBOXES[toolbox];
+    }
+    for (let name in BlockMirrorBlockEditor.EXTRA_TOOLS) {
+        toolbox += BlockMirrorBlockEditor.EXTRA_TOOLS[name];
+    }
+    return '<xml id="toolbox" style="display:none">'+toolbox+'</xml>';
 };
 
 BlockMirrorBlockEditor.prototype.remakeToolbox = function () {
@@ -114,21 +110,40 @@ BlockMirrorBlockEditor.prototype.VIEW_CONFIGURATIONS = {
         'width': '0%',
         'visible': false
     }
-}
+};
+
+BlockMirrorBlockEditor.prototype.resizeResponsively = function () {
+    let mode = this.blockMirror.mode_;
+    let configuration = this.VIEW_CONFIGURATIONS[mode];
+    if (mode === 'split') {
+        if (window.innerWidth >= this.blockMirror.BREAK_WIDTH) {
+            this.blockContainer.style.width = configuration.width;
+            this.blockContainer.style.height = this.blockMirror.configuration.height+"px";
+            this.blockArea.style.height = this.blockMirror.configuration.height + "px";
+        } else {
+            this.blockContainer.style.width = '100%';
+            this.blockContainer.style.height = (this.blockMirror.configuration.height/2)+"px";
+            this.blockArea.style.height = (this.blockMirror.configuration.height/2)+"px";
+        }
+    } else if (mode === 'block') {
+        this.blockContainer.style.width = configuration.width;
+        this.blockContainer.style.height = this.blockMirror.configuration.height+"px";
+        this.blockArea.style.height = this.blockMirror.configuration.height + "px";
+    }
+};
 
 BlockMirrorBlockEditor.prototype.setMode = function (mode) {
     mode = mode.toLowerCase();
     let configuration = this.VIEW_CONFIGURATIONS[mode];
 
     // Show/hide editor
-    this.blockContainer.style.width = configuration.width;
     this.workspace.setVisible(configuration.visible);
     if (configuration.visible) {
-        this.blockContainer.style.height = this.blockMirror.configuration.height;
         this.blockEditor.style.width = '100%';
         this.resized();
     } else {
         this.blockContainer.style.height = '0%';
+        this.blockArea.style.height = '0%';
     }
 
     // If there is an update waiting and we're visible, then update
@@ -167,6 +182,8 @@ BlockMirrorBlockEditor.prototype.setCode = function (code, quietly) {
         }
         if (quietly) {
             Blockly.Events.enable();
+        } else {
+            this.blockMirror.setCode(code, true);
         }
         this.outOfDate_ = null;
     } else {
@@ -183,10 +200,95 @@ BlockMirrorBlockEditor.prototype.changed = function (event) {
         !this.workspace.isDragging()) {
         let newCode = this.getCode();
         this.blockMirror.textEditor.setCode(newCode, true);
-        this.blockMirror.code_ = newCode;
+        this.blockMirror.setCode(newCode, true);
     }
 };
 
 BlockMirrorBlockEditor.prototype.isVisible = function () {
     return this.blockMirror.VISIBLE_MODES.block.indexOf(this.blockMirror.mode_) !== -1;
-};
\ No newline at end of file
+};
+
+BlockMirrorBlockEditor.prototype.DOCTYPE = '<?xml version="1.0" standalone="no"?> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">';
+BlockMirrorBlockEditor.prototype.BLOCKLY_LOADED_CSS = null;
+BlockMirrorBlockEditor.prototype.loadBlocklyCSS = function() {
+    if (this.BLOCKLY_LOADED_CSS === null) {
+        let result = [".blocklyDraggable {}"];
+        result = result.concat(Blockly.Css.CONTENT);
+        if (Blockly.FieldDate) {
+            result = result.concat(Blockly.FieldDate.CSS);
+        }
+        result = result.join("\n");
+        // Strip off any trailing slash (either Unix or Windows).
+        result = result.replace(/<<<PATH>>>/g, Blockly.Css.mediaPath_);
+        this.BLOCKLY_LOADED_CSS = result;
+    }
+}
+
+/**
+ * Generates a PNG version of the current workspace. This PNG is stored in a Base-64 encoded
+ * string as part of a data URL (e.g., "data:image/png;base64,...").
+ * TODO: There seems to be some problems capturing blocks that don't start with
+ * statement level blocks (e.g., expression blocks).
+ *
+ * @param {Function} callback - A function to be called with the results.
+ *  This function should take two parameters, the URL (as a string) of the generated
+ *  base64-encoded PNG and the IMG tag.
+ */
+BlockMirrorBlockEditor.prototype.getPngFromBlocks = function(callback) {
+    this.loadBlocklyCSS();
+    try {
+        // Retreive the entire canvas, strip some unnecessary tags
+        var blocks = this.workspace.svgBlockCanvas_.cloneNode(true);
+        blocks.removeAttribute("width");
+        blocks.removeAttribute("height");
+        // Ensure that we have some content
+        if (blocks.childNodes[0] !== undefined) {
+            // Remove tags that offset
+            blocks.removeAttribute("transform");
+            blocks.childNodes[0].removeAttribute("transform");
+            blocks.childNodes[0].childNodes[0].removeAttribute("transform");
+            // Add in styles
+            var linkElm = document.createElementNS("http://www.w3.org/1999/xhtml", "style");
+            linkElm.textContent = this.BLOCKLY_LOADED_CSS + "\n\n";
+            blocks.insertBefore(linkElm, blocks.firstChild);
+            // Get the bounding box
+            var bbox = document.getElementsByClassName("blocklyBlockCanvas")[0].getBBox();
+            // Create the XML representation of the SVG
+            var xml = new XMLSerializer().serializeToString(blocks);
+            xml = '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="'+bbox.width+'" height="'+bbox.height+'" viewBox="0 0 '+bbox.width+" "+bbox.height+'"><rect width="100%" height="100%" fill="white"></rect>'+xml+"</svg>";
+            // create a file blob of our SVG.
+            // Unfortunately, this crashes modern chrome for unknown reasons.
+            //var blob = new Blob([ this.DOCTYPE + xml], { type: 'image/svg+xml' });
+            //var url = window.URL.createObjectURL(blob);
+            // Old method: this failed on IE
+            var url = "data:image/svg+xml;base64," + btoa(unescape(encodeURIComponent(xml)));
+            // Create an IMG tag to hold the new element
+            var img  = document.createElement("img");
+            img.style.display = "block";
+            img.onload = function() {
+                var canvas = document.createElement("canvas");
+                canvas.width = bbox.width;
+                canvas.height = bbox.height;
+                var ctx = canvas.getContext("2d");
+                ctx.drawImage(img, 0, 0);
+                var canvasUrl;
+                try {
+                    canvasUrl = canvas.toDataURL("image/png");
+                } catch (e) {
+                    canvasUrl = url;
+                }
+                img.onload = null;
+                callback(canvasUrl, img);
+            };
+            img.onerror = function() {
+                callback("", img);
+            };
+            img.setAttribute("src", url);
+        } else {
+            callback("", document.createElement("img"));
+        }
+    } catch (e) {
+        callback("", document.createElement("img"));
+        console.error("PNG image creation not supported!", e);
+    }
+}
\ No newline at end of file
diff --git a/src/block_mirror.js b/src/block_mirror.js
index c8a0f45..d99978c 100644
--- a/src/block_mirror.js
+++ b/src/block_mirror.js
@@ -73,7 +73,7 @@ BlockMirror.prototype.validateConfiguration = function (configuration) {
     this.configuration['readOnly'] = configuration['readOnly'] || false;
 
     // height
-    this.configuration.height = configuration.height || '500px';
+    this.configuration.height = configuration.height || 500;
 
     // viewMode
     this.configuration.viewMode = configuration.viewMode || 'split';
@@ -83,7 +83,10 @@ BlockMirror.prototype.validateConfiguration = function (configuration) {
 
     // Delay?
     this.configuration.blockDelay = configuration.blockDelay || false;
-}
+
+    // Toolbox
+    this.configuration.toolbox = configuration.toolbox || "normal";
+};
 
 BlockMirror.prototype.initializeVariables = function () {
     this.tags = {
@@ -144,6 +147,17 @@ BlockMirror.prototype.loadSkulpt = function () {
     });
 };
 
+BlockMirror.prototype.removeAllChangeListeners = function () {
+    this.listeners_.length = 0;
+};
+
+BlockMirror.prototype.removeChangeListener = function (callback) {
+    let index = this.listeners_.indexOf(callback);
+    if (index !== -1) {
+        this.listeners_.splice(index, 1);
+    }
+};
+
 BlockMirror.prototype.addChangeListener = function (callback) {
     this.listeners_.push(callback);
 };
@@ -183,9 +197,18 @@ BlockMirror.prototype.setReadOnly = function (isReadOnly) {
     this.configuration.container.toggleClass("block-mirror-read-only", isReadOnly);
 };
 
+BlockMirror.prototype.refresh = function() {
+    this.blockEditor.resized();
+    this.textEditor.codeMirror.refresh();
+};
+
+BlockMirror.prototype.forceBlockRefresh = function() {
+    this.blockEditor.setCode(this.code_, true);
+};
+
 BlockMirror.prototype.VISIBLE_MODES = {
     'block': ['block', 'split'],
     'text': ['text', 'split']
 };
 
-exports = BlockMirror;
\ No newline at end of file
+BlockMirror.prototype.BREAK_WIDTH = 675;
\ No newline at end of file
diff --git a/src/text_editor.js b/src/text_editor.js
index 8a4774f..f81d0eb 100644
--- a/src/text_editor.js
+++ b/src/text_editor.js
@@ -60,6 +60,8 @@ function BlockMirrorTextEditor(blockMirror) {
     this.textSidebar.style.float = 'left';
     this.textSidebar.style.backgroundColor = '#ddd';
 
+    window.addEventListener('resize', this.resizeResponsively.bind(this), false);
+
     // TODO: Finish implementing code completion
     /*this.codeMirror.on('inputRead', function onChange(editor, input) {
         if (input.text[0] === ';' || input.text[0] === ' ' || input.text[0] === ":") {
@@ -105,6 +107,25 @@ BlockMirrorTextEditor.prototype.VIEW_CONFIGURATIONS = {
     }
 };
 
+BlockMirrorTextEditor.prototype.resizeResponsively = function () {
+    let mode = this.blockMirror.mode_;
+    let configuration = this.VIEW_CONFIGURATIONS[mode];
+    let width = configuration.width;
+    let height = this.blockMirror.configuration.height;
+    if (mode === 'split') {
+        if (window.innerWidth >= this.blockMirror.BREAK_WIDTH) {
+            this.textContainer.style.width = width;
+            this.textContainer.style.height = height+"px";
+        } else {
+            this.textContainer.style.width = '100%';
+            this.textContainer.style.height = (height/2)+"px";
+        }
+    } else {
+        this.textContainer.style.width = width;
+        this.textContainer.style.height = height+"px";
+    }
+};
+
 BlockMirrorTextEditor.prototype.setMode = function (mode) {
     mode = mode.toLowerCase();
     let configuration = this.VIEW_CONFIGURATIONS[mode];
@@ -113,9 +134,8 @@ BlockMirrorTextEditor.prototype.setMode = function (mode) {
         this.setCode(this.outOfDate_, true);
     }
     // Show/hide editor
-    this.textContainer.style.width = configuration.width;
+    this.resizeResponsively();
     if (configuration.visible) {
-        this.textContainer.style.height = this.blockMirror.configuration.height;
         this.textContainer.style.display = 'block';
         this.codeMirror.getWrapperElement().style.display = 'block';
         this.codeMirror.refresh();
@@ -136,7 +156,7 @@ BlockMirrorTextEditor.prototype.setMode = function (mode) {
         this.textSidebar.style.display = 'none';
         this.textSidebar.style.width = '0px';
     }
-}
+};
 
 BlockMirrorTextEditor.prototype.setCode = function (code, quietly) {
     this.silentEvents_ = quietly;
@@ -161,7 +181,7 @@ BlockMirrorTextEditor.prototype.changed = function (codeMirror, event) {
         let handleChange = () => {
             let newCode = this.getCode();
             this.blockMirror.blockEditor.setCode(newCode, true);
-            this.blockMirror.code_ = newCode;
+            this.blockMirror.setCode(newCode, true);
         };
         if (this.blockMirror.configuration.blockDelay === false) {
             handleChange();
diff --git a/src/text_to_blocks.js b/src/text_to_blocks.js
index 50995e3..d151dd8 100644
--- a/src/text_to_blocks.js
+++ b/src/text_to_blocks.js
@@ -48,6 +48,7 @@ BlockMirrorTextToBlocks.prototype.convertSource = function (filename, python_sou
                 this.source = this.source.slice(0, previousLine);
                 python_source = this.source.join("\n");
             } else {
+                console.error(e);
                 xml.appendChild(BlockMirrorTextToBlocks.raw_block(originalSource));
                 return {"xml": BlockMirrorTextToBlocks.xmlToString(xml), "error": error};
             }
@@ -184,8 +185,9 @@ BlockMirrorTextToBlocks.prototype.convertBody = function (node, parent) {
         skipped_line,
         commentCount,
         previousHeight = null,
-        previousWasStatement = false;
-    visitedFirstLine = false;
+        previousWasStatement = false,
+        visitedFirstLine = false,
+        wasFirstLine = false;
 
     // Iterate through each node
     for (var i = 0; i < node.length; i++) {
@@ -203,11 +205,11 @@ BlockMirrorTextToBlocks.prototype.convertBody = function (node, parent) {
         commentCount = 0;
         for (var commentLineInProgram in this.comments) {
             if (commentLineInProgram < lineNumberInProgram) {
-                commentChild = this.ast_Comment(this.comments[commentLineInProgram], commentLineInProgram);
+                let commentChild = this.ast_Comment(this.comments[commentLineInProgram], commentLineInProgram);
                 if (previousLineInProgram == null) {
                     nestChild(commentChild);
                 } else {
-                    skipped_previous_line = Math.abs(previousLineInProgram - commentLineInProgram) > 1;
+                    let skipped_previous_line = Math.abs(previousLineInProgram - commentLineInProgram) > 1;
                     if (is_top_level && skipped_previous_line) {
                         addPeer(commentChild);
                     } else {
@@ -240,7 +242,7 @@ BlockMirrorTextToBlocks.prototype.convertBody = function (node, parent) {
         previousHeight = height;
 
         // Handle top-level expression blocks
-        if (is_top_level && newChild.constructor == Array) {
+        if (is_top_level && newChild.constructor === Array) {
             addPeer(newChild[0]);
             // Handle skipped line
         } else if (is_top_level && skipped_line && visitedFirstLine) {
@@ -261,7 +263,7 @@ BlockMirrorTextToBlocks.prototype.convertBody = function (node, parent) {
     // Handle comments that are on the very last line
     var lastLineNumber = lineNumberInProgram + 1;
     if (lastLineNumber in this.comments) {
-        commentChild = this.ast_Comment(this.comments[lastLineNumber], lastLineNumber);
+        let commentChild = this.ast_Comment(this.comments[lastLineNumber], lastLineNumber);
         nestChild(commentChild);
         delete this.comments[lastLineNumber];
     }
@@ -269,7 +271,7 @@ BlockMirrorTextToBlocks.prototype.convertBody = function (node, parent) {
     // Handle any extra comments that stuck around
     if (is_top_level) {
         for (var commentLineInProgram in this.comments) {
-            commentChild = this.ast_Comment(this.comments[commentLineInProgram], commentLineInProgram);
+            let commentChild = this.ast_Comment(this.comments[commentLineInProgram], commentLineInProgram);
             distance = commentLineInProgram - previousLineInProgram;
             if (previousLineInProgram == null) {
                 addPeer(commentChild);
@@ -323,15 +325,15 @@ BlockMirrorTextToBlocks.prototype.convertStatement = function (node, full_source
     try {
         return this.convert(node, parent);
     } catch (e) {
-        heights = this.getChunkHeights(node);
-        extractedSource = this.getSourceCode(arrayMin(heights), arrayMax(heights));
+        let heights = this.getChunkHeights(node);
+        let extractedSource = this.getSourceCode(arrayMin(heights), arrayMax(heights));
         console.error(e);
         return BlockMirrorTextToBlocks.raw_block(extractedSource);
     }
 }
 
 BlockMirrorTextToBlocks.prototype.getChunkHeights = function (node) {
-    var lineNumbers = [];
+    let lineNumbers = [];
     if (node.hasOwnProperty("lineno")) {
         lineNumbers.push(node.lineno);
     }
diff --git a/src/toolbars.js b/src/toolbars.js
new file mode 100644
index 0000000..6583777
--- /dev/null
+++ b/src/toolbars.js
@@ -0,0 +1,100 @@
+let ZERO_BLOCK = BlockMirrorTextToBlocks.create_block('ast_Num', null, {'NUM': 0});
+
+BlockMirrorBlockEditor.EXTRA_TOOLS = {};
+
+BlockMirrorBlockEditor.getDefaultBlocks = function () {
+    return `<category name="Variables" custom="VARIABLE" colour="${BlockMirrorTextToBlocks.COLOR.VARIABLES}"></category>
+        <category name="Decisions" colour="${BlockMirrorTextToBlocks.COLOR.LOGIC}">
+            <block type="ast_If"></block>
+            <block type="ast_If"><mutation orelse="true"></mutation></block>
+            <block type="ast_Compare"></block>
+            <block type="ast_BoolOp"></block>
+            <block type="ast_UnaryOpNot"></block>
+        </category>
+        <category name="Iteration" colour="${BlockMirrorTextToBlocks.COLOR.CONTROL}">
+            <block type="ast_For"></block>        
+        </category>
+        <sep></sep>
+        <category name="Calculation" colour="${BlockMirrorTextToBlocks.COLOR.MATH}">
+            <block type="ast_BinOp"></block>
+            ${BlockMirrorTextToBlocks.getFunctionBlock("round")}
+        </category>
+        <category name="Output" colour="${BlockMirrorTextToBlocks.COLOR.PLOTTING}">
+            ${BlockMirrorTextToBlocks.getFunctionBlock("print")}
+            ${BlockMirrorTextToBlocks.getFunctionBlock("plot", {}, "plt")}
+            ${BlockMirrorTextToBlocks.getFunctionBlock("scatter", {}, "plt")}
+            ${BlockMirrorTextToBlocks.getFunctionBlock("hist", {}, "plt")}
+            ${BlockMirrorTextToBlocks.getFunctionBlock("show", {}, "plt")}
+            ${BlockMirrorTextToBlocks.getFunctionBlock("title", {}, "plt")}
+            ${BlockMirrorTextToBlocks.getFunctionBlock("xlabel", {}, "plt")}
+            ${BlockMirrorTextToBlocks.getFunctionBlock("ylabel", {}, "plt")}
+        </category>
+        <category name="Input" colour="${BlockMirrorTextToBlocks.COLOR.TEXT}">
+            ${BlockMirrorTextToBlocks.getFunctionBlock("input")}
+        </category>
+        <sep></sep>
+        <category name="Values" colour="${BlockMirrorTextToBlocks.COLOR.TEXT}">
+            <block type="ast_Str"></block>
+            <block type="ast_Num"></block>
+            <block type="ast_NameConstantBoolean"></block>
+        </category>
+        <category name="Conversion" colour="${BlockMirrorTextToBlocks.COLOR.TEXT}">
+            ${BlockMirrorTextToBlocks.getFunctionBlock("int")}
+            ${BlockMirrorTextToBlocks.getFunctionBlock("float")}
+            ${BlockMirrorTextToBlocks.getFunctionBlock("str")}
+            ${BlockMirrorTextToBlocks.getFunctionBlock("bool")}
+        </category>
+        <category name="Lists" colour="${BlockMirrorTextToBlocks.COLOR.LIST}">
+            <block type="ast_List"><mutation items="3"></mutation>
+                <value name="ADD0"><block type="ast_Num"><field name="NUM">0</field></block></value>
+                <value name="ADD1"><block type="ast_Num"><field name="NUM">0</field></block></value>
+                <value name="ADD2"><block type="ast_Num"><field name="NUM">0</field></block></value>
+            </block>
+            <block type="ast_List"><mutation items="3"></mutation>
+                <value name="ADD0"></value>
+                <value name="ADD1"></value>
+                <value name="ADD2"></value>
+            </block>
+            <block type="ast_List"><mutation items="0"></mutation></block>
+            ${BlockMirrorTextToBlocks.getFunctionBlock(".append")}
+            ${BlockMirrorTextToBlocks.getFunctionBlock("range", {'ARG0': ZERO_BLOCK})}
+        </category>
+        <category name="Dictionaries" colour="${BlockMirrorTextToBlocks.COLOR.DICTIONARY}">
+            <block type="ast_Dict">
+                <mutation items="3"></mutation>
+                <value name="ADD0"><block type="ast_DictItem" deletable="false" movable="false">
+                    <value name="KEY"><block type="ast_Str"><field name="TEXT">1st key</field></block></value>
+                </block></value>
+                <value name="ADD1"><block type="ast_DictItem" deletable="false" movable="false">
+                    <value name="KEY"><block type="ast_Str"><field name="TEXT">2nd key</field></block></value>
+                </block></value>
+                <value name="ADD2"><block type="ast_DictItem" deletable="false" movable="false">
+                    <value name="KEY"><block type="ast_Str"><field name="TEXT">3rd key</field></block></value>
+                </block></value>
+            </block>
+            <block type="ast_Subscript">
+                <mutation><arg name="I"></arg></mutation>
+                <value name="INDEX0"><block type="ast_Str"><field name="TEXT">key</field></block></value>
+            </block>
+        </category>
+        <sep></sep>`;
+}
+
+BlockMirrorBlockEditor.prototype.TOOLBOXES = {
+    'normal': BlockMirrorBlockEditor.getDefaultBlocks(),
+};
+
+// TODO: fix these to be more interesting
+BlockMirrorBlockEditor.prototype.TOOLBOXES['minimal'] = BlockMirrorBlockEditor.prototype.TOOLBOXES['normal'];
+BlockMirrorBlockEditor.prototype.TOOLBOXES['full'] = BlockMirrorBlockEditor.prototype.TOOLBOXES['normal'];
+
+/*
+xml += '<category name="Iteration" colour="300">' +
+
+    '<block type="ast_ForElse"></block>' +
+    '</category>';
+xml += '<category name="Values" colour="300">' +
+    '<block type="ast_Num"></block>' +
+    '</category>';
+//xml += '<category name="Values" colour="300"><button value="From Code">From Code</button></category>';
+xml += '</xml>';*/
\ No newline at end of file
diff --git a/test/simple_dev.html b/test/simple_dev.html
index d721bb4..b0b6a8d 100644
--- a/test/simple_dev.html
+++ b/test/simple_dev.html
@@ -38,6 +38,7 @@
     <script src="../src/block_editor.js" type="text/javascript"></script>
     <script src="../src/text_to_blocks.js" type="text/javascript"></script>
     <script src="../src/ast/ast_functions.js" type="text/javascript"></script>
+    <script src="../src/toolbars.js" type="text/javascript"></script>
 
     <script src="../src/ast/ast_For.js" type="text/javascript"></script>
     <script src="../src/ast/ast_If.js" type="text/javascript"></script>
diff --git a/webpack.config.js b/webpack.config.js
index 962d03c..7ddd300 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,6 +1,7 @@
 const path = require('path');
 const MergeIntoSingleFilePlugin = require('webpack-merge-and-include-globally');
 const Uglify = require("uglify-js");
+const babel = require("@babel/core");
 
 // Blockly
 const JS_BLOCKLY_FILES = [
@@ -32,8 +33,9 @@ const JS_BLOCKMIRROR_FILES = [
     path.resolve(__dirname, 'src/text_editor.js'),
     path.resolve(__dirname, 'src/block_editor.js'),
     path.resolve(__dirname, 'src/text_to_blocks.js'),
-    // AST Handlers
     path.resolve(__dirname, 'src/ast/ast_functions.js'),
+    path.resolve(__dirname, 'src/toolbars.js'),
+    // AST Handlers
     path.resolve(__dirname, 'src/ast/ast_For.js'),
     path.resolve(__dirname, 'src/ast/ast_If.js'),
     path.resolve(__dirname, 'src/ast/ast_While.js'),
@@ -42,6 +44,7 @@ const JS_BLOCKMIRROR_FILES = [
     path.resolve(__dirname, 'src/ast/ast_Name.js'),
     path.resolve(__dirname, 'src/ast/ast_Assign.js'),
     path.resolve(__dirname, 'src/ast/ast_AnnAssign.js'),
+    path.resolve(__dirname, 'src/ast/ast_AugAssign.js'),
     path.resolve(__dirname, 'src/ast/ast_Str.js'),
     path.resolve(__dirname, 'src/ast/ast_Expr.js'),
     path.resolve(__dirname, 'src/ast/ast_UnaryOp.js'),
@@ -92,14 +95,11 @@ const config = {
     },
     module: {
         rules: [
-            /*{
-                loader: 'babel-loader',
-                test: /\.js$/,
-                exclude: /node_modules/,
-                query: {
-                    presets: ['es2015']
-                }
-            }*/
+            {
+                test: /(\.jsx|\.js)$/,
+                loader: "babel-loader",
+                exclude: /(node_modules|bower_components)/
+            },
         ]
     },
     resolve: {
@@ -110,11 +110,17 @@ const config = {
             files: {
                 "block_mirror.js": JS_BLOCKMIRROR_FILES,
                 "block_mirror.css": [
-                    path.resolve(__dirname, 'lib/codemirror/codemirror.css'),
+                    /*path.resolve(__dirname, 'lib/codemirror/codemirror.css'),
                     path.resolve(__dirname, 'lib/codemirror/fullscreen.css'),
-                    path.resolve(__dirname, 'lib/codemirror/show-hint.css'),
+                    path.resolve(__dirname, 'lib/codemirror/show-hint.css'),*/
                     path.resolve(__dirname, 'src/block_mirror.css'),
                 ]
+            },
+            transform: {
+                "block_mirror.js": code =>
+                    babel.transform(code, {
+                        presets: ["@babel/preset-env"]
+                    }).code
             }
         })
     ]