diff --git a/.idea/dictionaries/acbart.xml b/.idea/dictionaries/acbart.xml
index 90ff7bc..fc28677 100644
--- a/.idea/dictionaries/acbart.xml
+++ b/.idea/dictionaries/acbart.xml
@@ -3,8 +3,11 @@
     <words>
       <w>binops</w>
       <w>blockly</w>
+      <w>blockmirror</w>
       <w>finalbody</w>
+      <w>multilinetext</w>
       <w>orelse</w>
+      <w>premessage</w>
     </words>
   </dictionary>
 </component>
\ No newline at end of file
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
index aad6bf1..90bb547 100644
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="JavaScriptLibraryMappings">
     <file url="PROJECT" libraries="{blockly}" />
+    <includedPredefinedLibrary name="Node.js Core" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2732632..01572cb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,133 +2,76 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="fe00182d-05fa-4529-8d2b-92bd952d65d2" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/ast/ast_Break.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/ast/ast_ClassDef.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/ast/ast_Continue.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/ast/ast_Global.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/ast/ast_If.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/ast/ast_Import.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/ast/ast_Nonlocal.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/ast/ast_Return.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/ast/ast_Try.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/ast/ast_While.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/ast/ast_With.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/ast/ast_Yield.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/ast/ast_YieldFrom.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/color_categories.md" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/dist/block_mirror.css" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/dist/block_mirror.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/docs/images/awful.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/ast/ast_Comment.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/ast/ast_Raw.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/ast/ast_functions.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/dictionaries/acbart.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dictionaries/acbart.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/jsLibraryMappings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jsLibraryMappings.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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_AnnAssign.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_AnnAssign.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Assert.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Assert.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Assign.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Assign.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Attribute.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Attribute.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_AugAssign.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_AugAssign.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_BinOp.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_BinOp.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_BoolOp.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_BoolOp.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Break.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Break.js" 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_ClassDef.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_ClassDef.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_Compare.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Compare.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Continue.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Continue.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Delete.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Delete.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Dict.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Dict.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Expr.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Expr.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_For.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_For.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_Global.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Global.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_If.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_If.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_IfExp.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_IfExp.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Import.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Import.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/ast/ast_Lambda.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Lambda.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_List.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_List.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Name.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Name.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_NameConstant.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_NameConstant.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Nonlocal.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Nonlocal.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Num.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Num.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Raise.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Raise.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Return.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Return.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Set.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Set.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Starred.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Starred.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Str.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Str.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Subscript.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Subscript.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Try.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Try.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Tuple.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Tuple.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_UnaryOp.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_UnaryOp.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_While.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_While.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_With.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_With.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_Yield.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Yield.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ast/ast_YieldFrom.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_YieldFrom.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/ast/todo.md" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/todo.md" 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/blockly_shims.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/blockly_shims.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$/src/text_to_blocks.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/text_to_blocks.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/simple.html" beforeDir="false" afterPath="$PROJECT_DIR$/test/simple.html" 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>
-    <ignored path="$PROJECT_DIR$/.tmp/" />
-    <ignored path="$PROJECT_DIR$/temp/" />
-    <ignored path="$PROJECT_DIR$/tmp/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/ast/ast_ClassDef.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="291">
-              <caret line="149" column="13" selection-start-line="149" selection-start-column="13" selection-end-line="149" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/ast/ast_Import.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="20" column="8" selection-start-line="20" selection-start-column="8" selection-end-line="59" selection-end-column="9" />
-              <folding>
-                <element signature="n#!!doc" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/test/simple_dev.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="442">
-              <caret line="209" column="81" selection-start-line="209" selection-start-column="81" selection-end-line="209" selection-end-column="81" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/text_to_blocks.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="263">
-              <caret line="350" column="20" lean-forward="true" selection-start-line="350" selection-start-column="20" selection-end-line="350" selection-end-column="20" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/ast/ast_Delete.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="34">
-              <caret line="30" column="4" lean-forward="true" selection-start-line="30" selection-start-column="4" selection-end-line="48" selection-end-column="6" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/ast/ast_FunctionDef.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="136">
-              <caret line="165" column="45" selection-end-line="422" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/ast/ast_With.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="21" lean-forward="true" selection-start-column="21" selection-end-column="21" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/ast/ast_Dict.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="578">
-              <caret line="247" lean-forward="true" selection-start-line="247" selection-end-line="247" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/ast/ast_Nonlocal.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="87">
-              <caret line="61" column="4" selection-start-line="61" selection-start-column="4" selection-end-line="66" selection-end-column="52" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/ast/ast_Try.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1700">
-              <caret line="105" column="13" lean-forward="true" selection-start-line="105" selection-start-column="13" selection-end-line="105" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -136,169 +79,33 @@
       </list>
     </option>
   </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>updateShape</find>
-      <find>setMov</find>
-      <find>movable_</find>
-      <find>consle</find>
-      <find>itemCount</find>
-      <find>hasReturn_</find>
-      <find>hasReturnV</find>
-      <find>hasReturns</find>
-      <find>setReturn</find>
-      <find>setReturnAnnotation</find>
-      <find>setVisible</find>
-      <find>hasReturnValue</find>
-      <find>hasReturnValue_</find>
-      <find>ast_Assert</find>
-      <find>ast_Return</find>
-      <find>ast_Yield</find>
-      <find>ast_Delete</find>
-      <find>Sk.ffi</find>
-      <find>hasReturns_</find>
-      <find>ast_Global</find>
-      <find>GLOBAL</find>
-      <find>ast_Break</find>
-      <find>consol</find>
-      <find>console</find>
-      <find>appendStatementInput</find>
-      <find>console.log</find>
-      <find>ast_If</find>
-      <find>asname</find>
-      <find>getInput</find>
-      <find>ast_WithDef</find>
-    </findStrings>
-    <replaceStrings>
-      <replace>UN</replace>
-      <replace>UNARY</replace>
-      <replace>BOOLOPS</replace>
-      <replace>boolop</replace>
-      <replace>Tuple</replace>
-      <replace>Set</replace>
-      <replace>Dict</replace>
-      <replace>ast_IfExpr</replace>
-      <replace>ast_Raise</replace>
-      <replace>ast_Yield</replace>
-      <replace>ast_YieldFrom</replace>
-      <replace>ast_Global</replace>
-      <replace>ast_IfExp</replace>
-      <replace>ast_Nonlocal</replace>
-      <replace>NONLOCAL</replace>
-      <replace>ast_Continue</replace>
-      <replace>ast_While</replace>
-      <replace>ast_With</replace>
-    </replaceStrings>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/ast/ast_Num.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_UnaryOp.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_BoolOp.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Compare.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Assert.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Str.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_NameConstant.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_List.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Tuple.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Set.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Starred.js" />
-        <option value="$PROJECT_DIR$/src/block_mirror.css" />
-        <option value="$PROJECT_DIR$/src/block_mirror.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Expr.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Attribute.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_For.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_IfExp.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Raise.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Delete.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Subscript.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Dict.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_ListComp.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Name.js" />
-        <option value="$PROJECT_DIR$/src/text_to_blocks.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_AnnAssign.js" />
-        <option value="$PROJECT_DIR$/src/blockly_shims.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Assign.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_BinOp.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_AugAssign.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Comp.js" />
-        <option value="$PROJECT_DIR$/src/block_editor.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Lambda.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Return.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Yield.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_YieldFrom.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Global.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_FunctionDef.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Nonlocal.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Break.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Continue.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Call.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Class.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Try.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_ClassDef.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_If.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_While.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_Import.js" />
-        <option value="$PROJECT_DIR$/src/ast/ast_With.js" />
-        <option value="$PROJECT_DIR$/test/simple_dev.html" />
-      </list>
-    </option>
-  </component>
   <component name="JsFlowSettings">
     <service-enabled>true</service-enabled>
     <exe-path />
     <other-services-enabled>true</other-services-enabled>
     <auto-save>true</auto-save>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="20" />
-    <option name="y" value="40" />
-    <option name="width" value="2520" />
-    <option name="height" value="1280" />
+  <component name="JsbtTreeLayoutManager">
+    <layout place="tools.popupnpm">
+      <scroll-view-position x="0" y="0" />
+      <selected-paths>
+        <path>
+          <id value="$PROJECT_DIR$/package.json" />
+          <id value="build" />
+        </path>
+      </selected-paths>
+    </layout>
   </component>
+  <component name="ProjectId" id="1OR0VFaxkOvFIyHle2nZjV999OR" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="BlockMirror" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BlockMirror" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BlockMirror" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BlockMirror" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BlockMirror" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BlockMirror" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="ast" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BlockMirror" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BlockMirror" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
-  </component>
   <component name="PropertiesComponent">
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="full.screen.before.presentation.mode" value="false" />
+    <property name="javascript.nodejs.core.library.configured.version" value="10.16.0" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/src/ast" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
@@ -307,9 +114,12 @@
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
     <property name="nodejs_package_manager_path" value="npm" />
-    <property name="settings.editor.selected.configurable" value="JavaScript.Libraries" />
+    <property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" />
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\acbart\Projects\blockpy-edu\BlockMirror\src\ast" />
+    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\acbart\Projects\blockpy-edu\BlockMirror\src\ast" />
     </key>
@@ -326,6 +136,31 @@
       </list>
     </option>
   </component>
+  <component name="RunManager" selected="npm.build">
+    <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>
+    <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
+      <package-json value="$PROJECT_DIR$/package.json" />
+      <command value="run" />
+      <scripts>
+        <script value="build" />
+      </scripts>
+      <node-interpreter value="project" />
+      <envs />
+      <method v="2" />
+    </configuration>
+    <list>
+      <item itemvalue="Node.js.webpack.config.js" />
+      <item itemvalue="npm.build" />
+    </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="npm.build" />
+        <item itemvalue="Node.js.webpack.config.js" />
+      </list>
+    </recent_temporary>
+  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -336,399 +171,26 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1563207713970</updated>
-      <workItem from="1563207719048" duration="127817000" />
+      <workItem from="1563207719048" duration="156052000" />
+      <workItem from="1563924743919" duration="259000" />
+      <workItem from="1563925130756" duration="17000" />
+      <workItem from="1563926206114" duration="36391000" />
     </task>
     <servers />
   </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="127817000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-6" y="-6" width="1293" height="693" extended-state="6" />
-    <editor active="true" />
-    <layout>
-      <window_info id="npm" side_tool="true" />
-      <window_info id="Favorites" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24343675" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" weight="0.3285968" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.3285968" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-    </layout>
-  </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../blockly/core/generator.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="321" lean-forward="true" selection-start-line="321" selection-end-line="321" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_IfExp.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="19" column="32" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../blockly/core/block_svg.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="1330" selection-start-line="1330" selection-end-line="1330" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Subscript.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/text_editor.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="63" column="14" selection-start-line="63" selection-start-column="14" selection-end-line="63" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Str.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" column="36" lean-forward="true" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Num.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="331">
-          <caret line="30" column="10" lean-forward="true" selection-start-line="30" selection-start-column="10" selection-end-line="30" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../blockly/core/variables.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-485">
-          <caret line="471" column="26" selection-start-line="471" selection-start-column="26" selection-end-line="471" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/blockly_shims.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="108" column="30" lean-forward="true" selection-start-line="108" selection-start-column="30" selection-end-line="108" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_UnaryOp.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="121">
-          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_BinOp.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="42" column="56" selection-start-line="42" selection-start-column="28" selection-end-line="42" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Name.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="37" lean-forward="true" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../blockly/core/input.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="204" selection-start-line="204" selection-end-line="204" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_AnnAssign.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="118" column="59" lean-forward="true" selection-start-line="117" selection-start-column="17" selection-end-line="118" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/codemirror/codemirror.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="7900" column="26" lean-forward="true" selection-start-line="7900" selection-start-column="26" selection-end-line="7900" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../blockly/core/workspace.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="410">
-          <caret line="755" lean-forward="true" selection-start-line="755" selection-end-line="755" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../blockly/core/options.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1301">
-          <caret line="39" selection-start-line="39" selection-end-line="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../blockly/core/inject.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="59" column="31" lean-forward="true" selection-start-line="59" selection-start-column="31" selection-end-line="59" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/block_editor.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
-          <folding>
-            <element signature="n#style#0;n#xml#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Expr.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="382">
-          <caret line="30" column="23" lean-forward="true" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/todo.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor />
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Break.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" column="66" selection-end-line="17" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Continue.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="25" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_List.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="87">
-          <caret line="168" column="4" lean-forward="true" selection-start-line="168" selection-start-column="4" selection-end-line="172" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_If.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
-          <caret line="126" column="31" selection-start-line="126" selection-start-column="31" selection-end-line="126" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_While.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="121">
-          <caret line="64" lean-forward="true" selection-start-line="64" selection-end-line="82" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Global.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="291">
-          <caret line="77" column="25" selection-start-line="77" selection-start-column="25" selection-end-line="77" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Assert.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="104">
-          <caret line="24" column="17" lean-forward="true" selection-end-line="53" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Assign.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1273">
-          <caret line="11" column="22" lean-forward="true" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_AugAssign.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1749" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Attribute.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-678">
-          <caret column="36" lean-forward="true" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Comp.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1831">
-          <caret line="231" column="10" lean-forward="true" selection-start-line="148" selection-start-column="8" selection-end-line="231" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Lambda.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-185">
-          <caret line="22" column="81" selection-start-line="22" selection-start-column="81" selection-end-line="22" selection-end-column="81" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Raise.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-66">
-          <caret line="60" column="92" selection-start-line="60" selection-start-column="92" selection-end-line="60" selection-end-column="92" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Return.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="348">
-          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Yield.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="21" column="3" lean-forward="true" selection-end-line="42" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_YieldFrom.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="21" column="62" lean-forward="true" selection-start-line="21" selection-start-column="62" selection-end-line="21" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Call.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2654">
-          <caret line="384" column="41" lean-forward="true" selection-start-line="383" selection-start-column="19" selection-end-line="384" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_For.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="501">
-          <caret line="38" column="21" lean-forward="true" selection-start-line="38" selection-start-column="21" selection-end-line="38" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_ClassDef.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="291">
-          <caret line="149" column="13" selection-start-line="149" selection-start-column="13" selection-end-line="149" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Nonlocal.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="87">
-          <caret line="61" column="4" selection-start-line="61" selection-start-column="4" selection-end-line="66" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../blockly/core/field.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="518" selection-start-line="518" selection-end-line="518" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../blockly/core/block.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="229">
-          <caret line="1069" column="20" selection-start-line="1069" selection-start-column="20" selection-end-line="1069" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Try.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1700">
-          <caret line="105" column="13" lean-forward="true" selection-start-line="105" selection-start-column="13" selection-end-line="105" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Delete.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="30" column="4" lean-forward="true" selection-start-line="30" selection-start-column="4" selection-end-line="48" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Dict.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="578">
-          <caret line="247" lean-forward="true" selection-start-line="247" selection-end-line="247" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_Import.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="20" column="8" selection-start-line="20" selection-start-column="8" selection-end-line="59" selection-end-column="9" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_FunctionDef.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="165" column="45" selection-end-line="422" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/text_to_blocks.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="263">
-          <caret line="350" column="20" lean-forward="true" selection-start-line="350" selection-start-column="20" selection-end-line="350" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ast/ast_With.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="21" lean-forward="true" selection-start-column="21" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/simple_dev.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="442">
-          <caret line="209" column="81" selection-start-line="209" selection-start-column="81" selection-end-line="209" selection-end-column="81" />
-        </state>
-      </provider>
-    </entry>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/color_categories.md b/color_categories.md
new file mode 100644
index 0000000..0d54868
--- /dev/null
+++ b/color_categories.md
@@ -0,0 +1,82 @@
+Variables=Blue, 225
+    AnnAssign
+    Assign
+    AugAssign
+    Delete
+    Name
+    
+    Global
+    Nonlocal
+
+Functions=CyanBlue, 210
+    Call
+    FunctionDef
+    Lambda
+    Return
+    Starred
+    Yield
+    YieldFrom
+
+Object Oriented Programming=DarkerBlue, 240
+    Attribute
+    Generic Methods
+    ClassDef
+
+Control Flow=Purple, 270
+    For
+    While
+    With
+    Break
+    Continue
+
+Math=BlueGreen, 150
+    BinOp
+    UnaryOp
+    Num
+    int call
+    float call
+
+
+Text=Green, 120
+    Str
+    
+    Printing
+    Input
+    String methods
+    str call
+
+Plotting=YellowGreen, 135
+
+Logic=Maroon, 345
+    BoolOp
+    Compare
+    If
+    IfExp
+    NameConstant
+    Assert
+    
+    bool call
+
+Python Core=Yellow, 60
+    Comment
+    Expr
+    Raw
+    Import
+
+Sequences=Brown, 15 (0-30)
+    Comp
+    List
+        List
+    Dictionary
+        Dict
+    Set
+        Set
+    Tuple
+        Tuple
+    Subscript
+    
+Exceptions=DarkPurple, 300
+    Raise
+    Try
+
+
diff --git a/dist/block_mirror.css b/dist/block_mirror.css
new file mode 100644
index 0000000..a4cce5d
--- /dev/null
+++ b/dist/block_mirror.css
@@ -0,0 +1,12 @@
+.CodeMirror-gutters {
+    background-color: #ddd;
+    /*border-left: 1px solid #bbb;*/
+}
+
+.CodeMirror-code div pre {
+    border-bottom: 1px dashed rgba(1,1,1,.1);
+}
+
+.block-mirror-read-only .CodeMirror-scroll {
+    background-color: #E5E5E5;
+}
diff --git a/dist/block_mirror.js b/dist/block_mirror.js
new file mode 100644
index 0000000..c5da63d
--- /dev/null
+++ b/dist/block_mirror.js
@@ -0,0 +1,307 @@
+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;
+    
+    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': this.defocus.bind(this)
+        }
+    };
+    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';
+
+}
+
+BlockMirrorTextEditor.prototype.defocus = function() {
+    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;*/
+}
+
+BlockMirrorTextEditor.prototype.setReadOnly = function(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
+    }
+}
+
+BlockMirrorTextEditor.prototype.setMode = function(mode) {
+    mode = mode.toLowerCase();
+    let configuration = this.VIEW_CONFIGURATIONS[mode];
+    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';
+    } else {
+        this.textSidebar.style.display = 'none';
+        this.textSidebar.style.width = '0px';
+    }
+}
+
+BlockMirrorTextEditor.prototype.setCode = function(code, quietly) {
+    this.silentEvents_ = quietly;
+    if (code === undefined || code.trim() === "") {
+        this.codeMirror.setValue("\n");
+    } else {
+        this.codeMirror.setValue(code);
+    }
+};
+
+BlockMirrorTextEditor.prototype.getCode = function() {
+    return this.codeMirror.getValue();
+};
+
+BlockMirrorTextEditor.prototype.changed = function(codeMirror, event) {
+    if (!this.silentEvents_) {
+        let newCode = this.getCode();
+        this.blockMirror.blockEditor.setCode(newCode, true);
+        this.blockMirror.model_ = newCode;
+    }
+    this.silentEvents_ = false;
+    //console.log("Changed text");
+};
+
+
+/**
+
+ External visible stuff
+
+ Changing mode/code/filename can fail on the block side
+
+ setMode(mode) -> bool
+ setFilename(filename) -> bool
+ setCode(filename, code) -> bool
+ setHighlight(line) -> bool
+ setReadOnly(isReadOnly)
+ setToolbox(string)
+ 'basic'
+ 'advanced'
+ 'complete'
+ list[list[string]]
+ onChange(event) ->
+ onModeChange
+ onFilenameChange
+ onCodeChange
+
+ getCode(filename) -> string
+ getCode() -> string
+ getFilename() -> string
+ getMode() -> string
+ getImage(callback)
+
+ lastBlockConversionFailure: {} or null
+
+
+ */
+
+/**
+ *
+ */
+function BlockMirror(configuration) {
+    this.validateConfiguration(configuration);
+    this.initializeVariables();
+    this.textEditor = new BlockMirrorTextEditor(this);
+    this.blockEditor = new BlockMirrorBlockEditor(this);
+    this.textToBlocks = new BlockMirrorTextToBlocks(this);
+
+    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];
+        }
+    });
+
+    this.setMode(this.configuration.viewMode);
+}
+
+BlockMirror.prototype.validateConfiguration = function (configuration) {
+    this.configuration = {};
+
+    // Container
+    if ('container' in configuration) {
+        this.configuration.container = configuration.container;
+    } else {
+        throw new Error('Invalid configuration: Missing "container" property.')
+    }
+
+    // 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!');
+        };
+    }
+
+    // readOnly
+    this.configuration['readOnly'] = configuration['readOnly'] || false;
+
+    // height
+    this.configuration.height = configuration.height || '500px';
+
+    // viewMode
+    this.configuration.viewMode = configuration.viewMode || 'split';
+}
+
+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.files = [];
+    this.model_ = "";
+
+    // 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.addChangeListener = function (callback) {
+    this.listeners_.push(callback);
+}
+
+BlockMirror.prototype.fireChangeListener = function (event) {
+    for (var i = 0, func; func = this.listeners_[i]; i++) {
+        func(event);
+    }
+};
+
+BlockMirror.prototype.setCode = function (code, quietly) {
+    this.model_ = 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.model_;
+};
+
+BlockMirror.prototype.setMode = function (mode) {
+    this.blockEditor.setMode(mode);
+    this.textEditor.setMode(mode);
+};
+
+BlockMirror.prototype.setFilename = function (filename) {
+};
+
+BlockMirror.prototype.setReadOnly = function (isReadOnly) {
+    this.textEditor.setReadOnly(isReadOnly);
+    this.blockEditor.setReadOnly(isReadOnly);
+    this.configuration.container.toggleClass("block-mirror-read-only", isReadOnly);
+};
+
+
+var exports = BlockMirror;
\ No newline at end of file
diff --git a/docs/images/awful.png b/docs/images/awful.png
new file mode 100644
index 0000000..761d16b
Binary files /dev/null and b/docs/images/awful.png differ
diff --git a/package-lock.json b/package-lock.json
index 86a6bc3..e847d1a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,10 +4,5379 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "codemirror": {
-      "version": "5.48.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.48.0.tgz",
-      "integrity": "sha512-3Ter+tYtRlTNtxtYdYNPxGxBL/b3cMcvPdPm70gvmcOO2Rauv/fUEewWa0tT596Hosv6ea2mtpx28OXBy1mQCg=="
+    "@babel/code-frame": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.0.0"
+      }
+    },
+    "@babel/core": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
+      "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.5.5",
+        "@babel/helpers": "^7.5.5",
+        "@babel/parser": "^7.5.5",
+        "@babel/template": "^7.4.4",
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5",
+        "convert-source-map": "^1.1.0",
+        "debug": "^4.1.0",
+        "json5": "^2.1.0",
+        "lodash": "^4.17.13",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
+        "source-map": "^0.5.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"
+          }
+        },
+        "json5": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
+          "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "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/generator": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz",
+      "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.5.5",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0",
+        "trim-right": "^1.0.1"
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
+      "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
+      "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+      "dev": true,
+      "requires": {
+        "@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",
+      "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/helpers": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz",
+      "integrity": "sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.4.4",
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
+      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@babel/parser": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz",
+      "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==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.4.4",
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@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": {
+        "@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": {
+        "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
+        }
+      }
+    },
+    "@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": {
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.13",
+        "to-fast-properties": "^2.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==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5"
+      }
+    },
+    "@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
+    },
+    "@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
+    },
+    "@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": {
+        "@webassemblyjs/wast-printer": "1.8.5"
+      }
+    },
+    "@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
+    },
+    "@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": {
+        "@webassemblyjs/ast": "1.8.5",
+        "mamacro": "^0.0.3"
+      }
+    },
+    "@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
+    },
+    "@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": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5"
+      }
+    },
+    "@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": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "@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": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@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": {
+        "@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"
+      }
+    },
+    "@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": {
+        "@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"
+      }
+    },
+    "@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": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5"
+      }
+    },
+    "@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": {
+        "@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"
+      }
+    },
+    "@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": {
+        "@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"
+      }
+    },
+    "@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": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@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
+    },
+    "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": {
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "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-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": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "requires": {
+        "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"
+          }
+        }
+      }
+    },
+    "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-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": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "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": {
+        "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"
+          }
+        }
+      }
+    },
+    "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
+    },
+    "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-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=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      },
+      "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=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "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=",
+      "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"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "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=",
+      "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"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "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=",
+      "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"
+      }
+    },
+    "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==",
+      "dev": true,
+      "requires": {
+        "find-cache-dir": "^2.0.0",
+        "loader-utils": "^1.0.2",
+        "mkdirp": "^0.5.1",
+        "pify": "^4.0.1"
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.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==",
+      "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-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=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.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==",
+      "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==",
+      "dev": true,
+      "requires": {
+        "babel-helper-evaluate-path": "^0.5.0"
+      }
+    },
+    "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"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-helper-is-void-0": "^0.4.3"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-helper-flip-expressions": "^0.4.3"
+      }
+    },
+    "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=",
+      "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"
+      }
+    },
+    "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=",
+      "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==",
+      "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==",
+      "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"
+      }
+    },
+    "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"
+      }
+    },
+    "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"
+      }
+    },
+    "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"
+      }
+    },
+    "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=",
+      "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"
+      }
+    },
+    "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"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "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"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.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=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "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==",
+      "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"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "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=",
+      "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"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.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=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.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=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.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=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "regexpu-core": "^2.0.0"
+      }
+    },
+    "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=",
+      "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=",
+      "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=",
+      "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=",
+      "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=",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "^0.10.0"
+      }
+    },
+    "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==",
+      "dev": true,
+      "requires": {
+        "babel-helper-evaluate-path": "^0.5.0"
+      }
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "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=",
+      "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-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==",
+      "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
+        }
+      }
+    },
+    "babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "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
+        }
+      }
+    },
+    "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",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "base64-js": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
+      "dev": true
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true
+    },
+    "bluebird": {
+      "version": "3.5.5",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+      "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+      "dev": true
+    },
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "cacache": {
+      "version": "11.3.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz",
+      "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "chokidar": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
+      "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
+      "dev": true,
+      "requires": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      }
+    },
+    "chownr": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
+      "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==",
+      "dev": true
+    },
+    "chrome-trace-event": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "dev": true,
+      "requires": {
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      }
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "commander": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+      "dev": true
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "dev": true,
+      "requires": {
+        "date-now": "^0.1.4"
+      }
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "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==",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "requires": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "cyclist": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
+      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+      "dev": true
+    },
+    "date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+      "dev": true
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "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
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true
+    },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "elliptic": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz",
+      "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
+      "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.4.0",
+        "tapable": "^1.0.0"
+      }
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "dev": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
+      "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "^1.2.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "is-callable": "^1.1.4",
+        "is-regex": "^1.0.4",
+        "object-keys": "^1.0.12"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "es6-promisify": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.0.1.tgz",
+      "integrity": "sha512-J3ZkwbEnnO+fGAKrjVpeUAnZshAdfZvbhQpqfIH9kSAspReRC4nJnu8ewm55b4y9ElyeuhCTzJD0XiH8Tsbhlw==",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "eslint-scope": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "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
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      }
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "fast-deep-equal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
+    "figgy-pudding": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
+      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+      "dev": true
+    },
+    "fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "find-cache-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+      "dev": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      }
+    },
+    "find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^3.0.0"
+      }
+    },
+    "findup-sync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+      "dev": true,
+      "requires": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      }
+    },
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "fs-readdir-recursive": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
+      "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
+      "dev": true
+    },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.12.0"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "deep-extend": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "^3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minipass": {
+          "version": "2.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "^4.1.0",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.1",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.2.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "^0.6.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.7.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "^1.0.2 || 2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "requires": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
+      }
+    },
+    "global-modules": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+      "dev": true,
+      "requires": {
+        "global-prefix": "^3.0.0"
+      },
+      "dependencies": {
+        "global-prefix": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+          "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+          "dev": true,
+          "requires": {
+            "ini": "^1.3.5",
+            "kind-of": "^6.0.2",
+            "which": "^1.3.1"
+          }
+        }
+      }
+    },
+    "global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "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
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "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",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+      "dev": true
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "requires": {
+        "parse-passwd": "^1.0.0"
+      }
+    },
+    "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
+    },
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "dev": true
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
+    "import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "interpret": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
+      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
+      "dev": true
+    },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "invert-kv": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+      "dev": true
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "dev": true
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-symbol": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.0"
+      }
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.0"
+      }
+    },
+    "kind-of": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "dev": true
+    },
+    "lcid": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+      "dev": true,
+      "requires": {
+        "invert-kv": "^2.0.0"
+      }
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "dev": true,
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^2.0.0",
+        "json5": "^1.0.1"
+      }
+    },
+    "locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "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=",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "requires": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "requires": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      }
+    },
+    "mamacro": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
+      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
+      "dev": true
+    },
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+      "dev": true,
+      "requires": {
+        "p-defer": "^1.0.0"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "mem": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+      "dev": true,
+      "requires": {
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
+      }
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      }
+    },
+    "mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "dev": true
+    },
+    "mississippi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "dev": true,
+      "requires": {
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
+      }
+    },
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        }
+      }
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+      "dev": true,
+      "optional": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
+    },
+    "neo-async": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
+      "dev": true
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "dev": true,
+      "requires": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.5.1"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "os-locale": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+      "dev": true,
+      "requires": {
+        "execa": "^1.0.0",
+        "lcid": "^2.0.0",
+        "mem": "^4.0.0"
+      }
+    },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+      "dev": true
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+      "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+      "dev": true,
+      "requires": {
+        "p-try": "^2.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "requires": {
+        "p-limit": "^2.0.0"
+      }
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true
+    },
+    "pako": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
+      "dev": true
+    },
+    "parallel-transform": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
+      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+      "dev": true,
+      "requires": {
+        "cyclist": "~0.2.2",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+      "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
+      "dev": true,
+      "requires": {
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.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
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "pbkdf2": {
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+      "dev": true,
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true
+    },
+    "pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "dev": true,
+      "requires": {
+        "find-up": "^3.0.0"
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
+    },
+    "private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "dev": true
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "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==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.18.0",
+        "babel-types": "^6.19.0",
+        "private": "^0.1.6"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "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=",
+      "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",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
+      "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
+      "dev": true,
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      },
+      "dependencies": {
+        "global-modules": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+          "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+          "dev": true,
+          "requires": {
+            "global-prefix": "^1.0.1",
+            "is-windows": "^1.0.1",
+            "resolve-dir": "^1.0.0"
+          }
+        }
+      }
+    },
+    "resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
+    "rev-hash": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/rev-hash/-/rev-hash-2.0.0.tgz",
+      "integrity": "sha1-dyCiNu0MJY3z5kvsA+wEiwW5JMQ=",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "schema-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      }
+    },
+    "semver": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+      "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+      "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
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true
+    },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "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"
+      }
+    },
+    "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
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "dev": true,
+      "requires": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^4.1.0"
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "dev": true
+    },
+    "terser": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.1.2.tgz",
+      "integrity": "sha512-jvNoEQSPXJdssFwqPSgWjsOrb+ELoE+ILpHPKXC83tIxOlh2U75F1KuB2luLD/3a6/7K3Vw5pDn+hvu0C4AzSw==",
+      "dev": true,
+      "requires": {
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
+      },
+      "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
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz",
+      "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==",
+      "dev": true,
+      "requires": {
+        "cacache": "^11.3.2",
+        "find-cache-dir": "^2.0.0",
+        "is-wsl": "^1.1.0",
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.7.0",
+        "source-map": "^0.6.1",
+        "terser": "^4.0.0",
+        "webpack-sources": "^1.3.0",
+        "worker-farm": "^1.7.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
+        }
+      }
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "timers-browserify": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
+      "dev": true,
+      "requires": {
+        "setimmediate": "^1.0.4"
+      }
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true
+    },
+    "tslib": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
+      "dev": true
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz",
+      "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==",
+      "dev": true,
+      "requires": {
+        "commander": "~2.20.0",
+        "source-map": "~0.6.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
+        }
+      }
+    },
+    "union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      }
+    },
+    "unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        }
+      }
+    },
+    "upath": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+      "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
+      "dev": true
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "util.promisify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
+    "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
+    },
+    "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
+    },
+    "watchpack": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
+      }
+    },
+    "webpack": {
+      "version": "4.37.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.37.0.tgz",
+      "integrity": "sha512-iJPPvL7XpbcbwOthbzpa2BSPlmGp8lGDokAj/LdWtK80rsPoPOdANSbDBf2GAVLKZD3GhCuQ/gGkgN9HWs0Keg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/wasm-edit": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "acorn": "^6.2.0",
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0",
+        "chrome-trace-event": "^1.0.0",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.0",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.3.0",
+        "loader-utils": "^1.1.0",
+        "memory-fs": "~0.4.1",
+        "micromatch": "^3.1.8",
+        "mkdirp": "~0.5.0",
+        "neo-async": "^2.5.0",
+        "node-libs-browser": "^2.0.0",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.0",
+        "terser-webpack-plugin": "^1.1.0",
+        "watchpack": "^1.5.0",
+        "webpack-sources": "^1.3.0"
+      }
+    },
+    "webpack-cli": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.6.tgz",
+      "integrity": "sha512-0vEa83M7kJtxK/jUhlpZ27WHIOndz5mghWL2O53kiDoA9DIxSKnfqB92LoqEn77cT4f3H2cZm1BMEat/6AZz3A==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.4.2",
+        "cross-spawn": "6.0.5",
+        "enhanced-resolve": "4.1.0",
+        "findup-sync": "3.0.0",
+        "global-modules": "2.0.0",
+        "import-local": "2.0.0",
+        "interpret": "1.2.0",
+        "loader-utils": "1.2.3",
+        "supports-color": "6.1.0",
+        "v8-compile-cache": "2.0.3",
+        "yargs": "13.2.4"
+      }
+    },
+    "webpack-merge-and-include-globally": {
+      "version": "2.1.16",
+      "resolved": "https://registry.npmjs.org/webpack-merge-and-include-globally/-/webpack-merge-and-include-globally-2.1.16.tgz",
+      "integrity": "sha512-ZhPgMbQFB5bK1ZvtDJm75Lu2BHEm9I5iDbSa3WM4y/VHa0SlLMiBs4FiJzLeJWa9dXL5sVhws/0ebRSlPfqsvA==",
+      "dev": true,
+      "requires": {
+        "es6-promisify": "^6.0.0",
+        "glob": "^7.1.2",
+        "rev-hash": "^2.0.0"
+      }
+    },
+    "webpack-sources": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz",
+      "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
+      "dev": true,
+      "requires": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.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
+        }
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "worker-farm": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+      "dev": true,
+      "requires": {
+        "errno": "~0.1.7"
+      }
+    },
+    "wrap-ansi": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true
+    },
+    "y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+      "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+      "dev": true
+    },
+    "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"
+      }
+    },
+    "yargs-parser": {
+      "version": "13.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+      "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 4b213ae..0af6297 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,9 @@
     "example": "example"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "build": "webpack --mode production",
+    "devbuild": "webpack --mode development",
+    "watch": "webpack --watch --mode development"
   },
   "repository": {
     "type": "git",
@@ -19,7 +21,13 @@
     "url": "https://github.com/blockpy-edu/BlockMirror/issues"
   },
   "homepage": "https://github.com/blockpy-edu/BlockMirror#readme",
-  "dependencies": {
-    "codemirror": "^5.48.0"
+  "devDependencies": {
+    "babel-loader": "^8.0.6",
+    "babel-minify": "^0.5.0",
+    "babel-preset-es2015": "^6.24.1",
+    "uglify-js": "^3.6.0",
+    "webpack": "^4.35.2",
+    "webpack-cli": "^3.3.5",
+    "webpack-merge-and-include-globally": "^2.1.16"
   }
 }
diff --git a/src/ast/ast_AnnAssign.js b/src/ast/ast_AnnAssign.js
index 896cdd1..1ffe710 100644
--- a/src/ast/ast_AnnAssign.js
+++ b/src/ast/ast_AnnAssign.js
@@ -9,9 +9,7 @@ Blockly.Blocks['ast_AnnAssignFull'] = {
         this.setInputsInline(true);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setStyle("variable_blocks");
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
         this.initialized_ = true;
         this.updateShape_();
     },
@@ -73,9 +71,7 @@ Blockly.Blocks['ast_AnnAssign'] = {
         this.setInputsInline(true);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setStyle("variable_blocks");
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
         this.strAnnotations_ = false;
         this.initialized_ = true;
     },
@@ -154,7 +150,7 @@ BlockMirrorTextToBlocks.prototype.getBuiltinAnnotation = function (annotation) {
 
     // Potentially filter out unknown annotations
     if (result !== false && this.strictAnnotations) {
-        if (this.strictAnnotations.indexOf(result) !== null) {
+        if (this.strictAnnotations.indexOf(result) !== -1) {
             return result;
         } else {
             return false;
@@ -164,7 +160,7 @@ BlockMirrorTextToBlocks.prototype.getBuiltinAnnotation = function (annotation) {
     }
 }
 
-BlockMirrorTextToBlocks.prototype['ast_AnnAssign'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_AnnAssign'] = function (node, parent) {
     let target = node.target;
     let annotation = node.annotation;
     let value = node.value;
@@ -172,7 +168,7 @@ BlockMirrorTextToBlocks.prototype['ast_AnnAssign'] = function (node) {
     let values = {};
     let mutations = {'@initialized': false};
     if (value !== null) {
-        values['VALUE'] = this.convert(value);
+        values['VALUE'] = this.convert(value, node);
         mutations['@initialized'] = true;
     }
 
@@ -192,8 +188,8 @@ BlockMirrorTextToBlocks.prototype['ast_AnnAssign'] = function (node) {
                 "inline": "true",
             }, mutations);
     } else {
-        values['TARGET'] = this.convert(target);
-        values['ANNOTATION'] = this.convert(annotation);
+        values['TARGET'] = this.convert(target, node);
+        values['ANNOTATION'] = this.convert(annotation, node);
         return BlockMirrorTextToBlocks.create_block("ast_AnnAssignFull", node.lineno, {},
             values,
             {
diff --git a/src/ast/ast_Assert.js b/src/ast/ast_Assert.js
index 92f111f..9d3c418 100644
--- a/src/ast/ast_Assert.js
+++ b/src/ast/ast_Assert.js
@@ -8,9 +8,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     "inputsInline": true,
     "previousStatement": null,
     "nextStatement": null,
-    "colour": 60,
-    "tooltip": "",
-    "helpUrl": ""
+    "colour": BlockMirrorTextToBlocks.COLOR.LOGIC,
 });
 
 BlockMirrorTextToBlocks.BLOCKS.push({
@@ -22,9 +20,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     "inputsInline": true,
     "previousStatement": null,
     "nextStatement": null,
-    "colour": 60,
-    "tooltip": "",
-    "helpUrl": ""
+    "colour": BlockMirrorTextToBlocks.COLOR.LOGIC,
 });
 
 Blockly.Python['ast_Assert'] = function (block) {
@@ -38,17 +34,17 @@ Blockly.Python['ast_AssertFull'] = function (block) {
     return "assert " + test + ", "+msg+"\n";
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Assert'] = function (node) {
+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)
+            "TEST": this.convert(test, node)
         });
     } else {
         return BlockMirrorTextToBlocks.create_block("ast_AssertFull", node.lineno, {}, {
-            "TEST": this.convert(test),
-            "MSG": this.convert(msg)
+            "TEST": this.convert(test, node),
+            "MSG": this.convert(msg, node)
         });
     }
 };
\ No newline at end of file
diff --git a/src/ast/ast_Assign.js b/src/ast/ast_Assign.js
index 9fe83da..3dcde45 100644
--- a/src/ast/ast_Assign.js
+++ b/src/ast/ast_Assign.js
@@ -3,28 +3,29 @@ Blockly.Blocks['ast_Assign'] = {
         this.setInputsInline(true);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setStyle('variable_blocks');
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
         this.targetCount_ = 1;
         this.simpleTarget_ = true;
-
-        this.appendDummyInput()
-            .appendField("set");
-        this.appendValueInput('VALUE')
-            .appendField('=');
         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)) {
@@ -85,7 +86,7 @@ Blockly.Python['ast_Assign'] = function (block) {
     return targets.join(' = ') + " = " + value + "\n";
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Assign'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Assign'] = function (node, parent) {
     let targets = node.targets;
     let value = node.value;
 
@@ -96,9 +97,9 @@ BlockMirrorTextToBlocks.prototype['ast_Assign'] = function (node) {
         values = {};
         fields['VAR'] = Sk.ffi.remapToJs(targets[0].id);
     } else {
-        values = this.convertElements("TARGET", targets);
+        values = this.convertElements("TARGET", targets, node);
     }
-    values['VALUE'] = this.convert(value);
+    values['VALUE'] = this.convert(value, node);
 
     return BlockMirrorTextToBlocks.create_block("ast_Assign", node.lineno, fields,
         values,
diff --git a/src/ast/ast_Attribute.js b/src/ast/ast_Attribute.js
index 91a5dfc..8af82c7 100644
--- a/src/ast/ast_Attribute.js
+++ b/src/ast/ast_Attribute.js
@@ -8,9 +8,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     ],
     "inputsInline": true,
     "output": null,
-    "colour": 230,
-    "tooltip": "",
-    "helpUrl": ""
+    "colour": BlockMirrorTextToBlocks.COLOR.OO,
 });
 
 BlockMirrorTextToBlocks.BLOCKS.push({
@@ -22,9 +20,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     ],
     "inputsInline": true,
     "output": null,
-    "colour": 230,
-    "tooltip": "",
-    "helpUrl": ""
+    "colour": BlockMirrorTextToBlocks.COLOR.OO,
 });
 
 Blockly.Python['ast_Attribute'] = function (block) {
@@ -44,7 +40,7 @@ Blockly.Python['ast_AttributeFull'] = function (block) {
     return [code, Blockly.Python.ORDER_MEMBER];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Attribute'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Attribute'] = function (node, parent) {
     let value = node.value;
     let attr = node.attr;
 
@@ -58,7 +54,7 @@ BlockMirrorTextToBlocks.prototype['ast_Attribute'] = function (node) {
         return BlockMirrorTextToBlocks.create_block("ast_AttributeFull", node.lineno, {
             "ATTR": Sk.ffi.remapToJs(attr)
         }, {
-            "VALUE": this.convert(value)
+            "VALUE": this.convert(value, node)
         });
     }
 }
diff --git a/src/ast/ast_AugAssign.js b/src/ast/ast_AugAssign.js
index 3ff73a0..23d3535 100644
--- a/src/ast/ast_AugAssign.js
+++ b/src/ast/ast_AugAssign.js
@@ -21,9 +21,7 @@ Blockly.Blocks['ast_AugAssign'] = {
         this.setInputsInline(true);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setStyle("variable_blocks");
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
         this.updateShape_();
         this.updatePreposition_(this.initialPreposition_);
     },
@@ -98,18 +96,18 @@ Blockly.Python['ast_AugAssign'] = function (block) {
 };
 
 
-BlockMirrorTextToBlocks.prototype['ast_AugAssign'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_AugAssign'] = function (node, parent) {
     let target = node.target;
     let op = node.op.name;
     let value = node.value;
 
-    let values = {'VALUE': this.convert(value)};
+    let values = {'VALUE': this.convert(value, node)};
     let fields = {'OP_NAME': op};
     let simpleTarget = target._astname === 'Name';
     if (simpleTarget) {
         fields['VAR'] = Sk.ffi.remapToJs(target.id);
     } else {
-        values['TARGET'] = this.convert(value);
+        values['TARGET'] = this.convert(value, node);
     }
 
     let preposition = op;
diff --git a/src/ast/ast_BinOp.js b/src/ast/ast_BinOp.js
index 57f2692..d9d8632 100644
--- a/src/ast/ast_BinOp.js
+++ b/src/ast/ast_BinOp.js
@@ -41,7 +41,7 @@ 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];
+    //Blockly.Constants.Math.TOOLTIPS_BY_OP[binop[1]] = binop[3];
 });
 
 BlockMirrorTextToBlocks.BLOCKS.push({
@@ -54,8 +54,8 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     ],
     "inputsInline": true,
     "output": null,
-    "style": "math_blocks",
-    "extensions": ["math_op_tooltip"]
+    "colour": BlockMirrorTextToBlocks.COLOR.MATH
+    //"extensions": ["math_op_tooltip"]
 });
 
 BlockMirrorTextToBlocks.BLOCKS.push({
@@ -68,8 +68,8 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     ],
     "inputsInline": true,
     "output": null,
-    "style": "math_blocks",
-    "extensions": ["math_op_tooltip"]
+    "colour": BlockMirrorTextToBlocks.COLOR.MATH
+    //"extensions": ["math_op_tooltip"]
 });
 
 Blockly.Python['ast_BinOp'] = function (block) {
@@ -83,7 +83,7 @@ Blockly.Python['ast_BinOp'] = function (block) {
     return [code, order];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_BinOp'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_BinOp'] = function (node, parent) {
     let left = node.left;
     let op = node.op.name;
     let right = node.right;
@@ -93,8 +93,8 @@ BlockMirrorTextToBlocks.prototype['ast_BinOp'] = function (node) {
     return BlockMirrorTextToBlocks.create_block(blockName, node.lineno, {
         "OP": op
     }, {
-        "A": this.convert(left),
-        "B": this.convert(right)
+        "A": this.convert(left, node),
+        "B": this.convert(right, node)
     }, {
         "inline": true
     });
diff --git a/src/ast/ast_BoolOp.js b/src/ast/ast_BoolOp.js
index ea86508..bac3c07 100644
--- a/src/ast/ast_BoolOp.js
+++ b/src/ast/ast_BoolOp.js
@@ -20,13 +20,13 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     ],
     "inputsInline": true,
     "output": null,
-    "style": "logic_blocks"
+    "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 :
+    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;
@@ -34,16 +34,16 @@ Blockly.Python['ast_BoolOp'] = function (block) {
     return [code, order];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_BoolOp'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_BoolOp'] = function (node, parent) {
     var op = node.op;
     var values = node.values;
-    var result_block = this.convert(values[0]);
+    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])
+            "B": this.convert(values[i], node)
         }, {
             "inline": "true"
         });
diff --git a/src/ast/ast_Break.js b/src/ast/ast_Break.js
index f5737e4..0e5e73a 100644
--- a/src/ast/ast_Break.js
+++ b/src/ast/ast_Break.js
@@ -4,15 +4,13 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     "inputsInline": false,
     "previousStatement": null,
     "nextStatement": null,
-    "colour": 60,
-    "tooltip": "",
-    "helpUrl": ""
+    "colour": BlockMirrorTextToBlocks.COLOR.CONTROL,
 });
 
 Blockly.Python['ast_Break'] = function (block) {
     return "break\n";
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Break'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Break'] = function (node, parent) {
     return BlockMirrorTextToBlocks.create_block("ast_Break", node.lineno);
 };
\ No newline at end of file
diff --git a/src/ast/ast_Call.js b/src/ast/ast_Call.js
index 153f4fd..c7e9fc3 100644
--- a/src/ast/ast_Call.js
+++ b/src/ast/ast_Call.js
@@ -1,13 +1,14 @@
+// TODO: Support stuff like "append" where the message is after the value input
+// TODO: Handle updating function/method definition -> update call
+
 Blockly.Blocks['ast_Call'] = {
     /**
      * Block for calling a procedure with no return value.
      * @this Blockly.Block
      */
     init: function () {
-        this.setStyle('procedure_blocks');
+        this.givenColour_ = BlockMirrorTextToBlocks.COLOR.FUNCTIONS
         this.setInputsInline(true);
-        // acbart: added simpleName to handle complex function calls (e.g., chained)
-        this.simpleName_ = "function";
         // Regular ('NAME') or Keyword (either '**' or '*NAME')
         this.arguments_ = [];
         this.argumentVarModels_ = [];
@@ -19,6 +20,11 @@ Blockly.Blocks['ast_Call'] = {
         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_();
     },
 
@@ -28,24 +34,21 @@ Blockly.Blocks['ast_Call'] = {
      * @this Blockly.Block
      */
     getProcedureCall: function () {
-        if (this.simpleName_) {
-            return /** @type {string} */ (this.getFieldValue('FUNC_NAME_VALUE'));
-        } else {
-            return null;
-        }
+        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.getProcedureCall() === null ||
-            Blockly.Names.equals(oldName, this.getProcedureCall())) {
-            this.setFieldValue(newName, 'FUNC_NAME_VALUE');
-            this.simpleName_ = newName;
+        if (this.name_ === null ||
+            Blockly.Names.equals(oldName, this.name_)) {
+            this.name_ = newName;
+            this.updateShape_();
         }
     },
     /**
@@ -77,14 +80,14 @@ Blockly.Blocks['ast_Call'] = {
         }
         if (!paramIds) {
             // Reset the quarks (a mutator is about to open).
-            return;
+            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;
+            return false;
         }
         if (paramIds.length !== paramNames.length) {
             throw RangeError('paramNames and paramIds must be the same length.');
@@ -132,7 +135,7 @@ Blockly.Blocks['ast_Call'] = {
         this.quarkIds_ = paramIds;
         // Reconnect any child blocks.
         if (this.quarkIds_) {
-            for (var i = 0; i < this.arguments_.length; i++) {
+            for (let i = 0; i < this.arguments_.length; i++) {
                 var quarkId = this.quarkIds_[i];
                 if (quarkId in this.quarkConnections_) {
                     let connection = this.quarkConnections_[quarkId];
@@ -148,6 +151,7 @@ Blockly.Blocks['ast_Call'] = {
         if (this.rendered) {
             this.render();
         }
+        return true;
     },
     /**
      * Modify this block to have the correct number of arguments.
@@ -155,37 +159,40 @@ Blockly.Blocks['ast_Call'] = {
      * @this Blockly.Block
      */
     updateShape_: function () {
-        // Open Parentheses
-        if (!this.getInput('OPEN_PAREN')) {
-            this.appendDummyInput('OPEN_PAREN')
-                .setAlign(Blockly.ALIGN_RIGHT)
-                .appendField(new Blockly.FieldLabel("("));
+        // 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');
         }
 
-        // Update function call name
-        if (this.simpleName_) {
-            if (this.getInput('FUNC')) {
-                this.removeInput('FUNC');
-            }
-            if (!this.getInput('FUNC_NAME')) {
-                this.appendDummyInput('FUNC_NAME')
-                    .appendField(new Blockly.FieldTextInput("function"), "FUNC_NAME_VALUE");
-            }
-            this.moveInputBefore('FUNC_NAME', 'OPEN_PAREN');
-        } else {
-            if (!this.getInput('FUNC')) {
-                this.appendValueInput('FUNC');
-            }
-            if (this.getInput('FUNC_NAME')) {
-                this.removeInput('FUNC_NAME');
+        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);
             }
-            this.moveInputBefore('FUNC', 'OPEN_PAREN');
+            message.appendField(new Blockly.FieldLabel(this.message_ + "\ ("), 'MESSAGE');
+            // One argument, no MESSAGE_AREA
+        } else if (message) {
+            this.removeInput('MESSAGE_AREA');
         }
-
         // Process arguments
-        for (var i = 0; i < Math.min(this.argumentCount_, this.arguments_.length); i++) {
+        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.
@@ -219,6 +226,17 @@ Blockly.Blocks['ast_Call'] = {
                 .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 (let j = 0; j < i; j++) {
             this.moveInputBefore('ARG' + j, 'CLOSE_PAREN')
         }
@@ -230,6 +248,8 @@ Blockly.Blocks['ast_Call'] = {
             this.removeInput('ARG' + i);
             i++;
         }
+
+        this.setColour(this.givenColour_);
     }
     ,
     /**
@@ -243,7 +263,11 @@ Blockly.Blocks['ast_Call'] = {
         container.setAttribute('name', name === null ? '*' : name);
         container.setAttribute('arguments', this.argumentCount_);
         container.setAttribute('returns', this.returns_);
-        container.setAttribute('names', this.showParameterNames_);
+        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]);
@@ -257,11 +281,16 @@ Blockly.Blocks['ast_Call'] = {
      * @this Blockly.Block
      */
     domToMutation: function (xmlElement) {
-        this.simpleName_ = xmlElement.getAttribute('name');
-        this.simpleName_ = this.simpleName_ === '*' ? null : this.simpleName_;
+        this.name_ = xmlElement.getAttribute('name');
+        this.name_ = this.name_ === '*' ? null : this.name_;
         this.argumentCount_ = parseInt(xmlElement.getAttribute('arguments'), 10);
-        this.showParameterNames_ = "true" === xmlElement.getAttribute('names');
+        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++) {
@@ -270,9 +299,12 @@ Blockly.Blocks['ast_Call'] = {
                 paramIds.push(childNode.getAttribute('paramId'));
             }
         }
-        this.setProcedureParameters_(args, paramIds);
-        if (this.simpleName_ !== null) {
-            this.renameProcedure(this.getProcedureCall(), this.simpleName_);
+        let result = this.setProcedureParameters_(args, paramIds);
+        if (!result) {
+            this.updateShape_();
+        }
+        if (this.name_ !== null) {
+            this.renameProcedure(this.getProcedureCall(), this.name_);
         }
     },
     /**
@@ -321,7 +353,7 @@ Blockly.Blocks['ast_Call'] = {
                 block.updateShape_();
                 block.render();
             }
-        })
+        });
 
         // Change Return Type
         options.push({
@@ -371,19 +403,21 @@ Blockly.Blocks['ast_Call'] = {
             }
         }
         return "";
+    },
+    getDrawnArgumentCount_: function () {
+        return Math.min(this.argumentCount_, this.arguments_.length);
     }
 };
 
 Blockly.Python['ast_Call'] = function (block) {
-    // Call a procedure with a return value.
-    let funcName;
-    if (block.simpleName_ === null) {
+    // Get the caller
+    let funcName = "";
+    if (block.isMethod_) {
         funcName = Blockly.Python.valueToCode(block, 'FUNC', Blockly.Python.ORDER_FUNCTION_CALL) ||
             Blockly.Python.blank;
-    } else {
-        funcName = Blockly.Python.variableDB_.getName(block.getFieldValue('FUNC_NAME_VALUE'),
-            Blockly.Variables.NAME_TYPE);
     }
+    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,
@@ -397,7 +431,8 @@ Blockly.Python['ast_Call'] = function (block) {
             args[i] = value;
         }
     }
-    var code = funcName + '(' + args.join(', ') + ')';
+    // Return the result
+    let code = funcName + '(' + args.join(', ') + ')';
     if (block.returns_) {
         return [code, Blockly.Python.ORDER_FUNCTION_CALL];
     } else {
@@ -405,23 +440,103 @@ Blockly.Python['ast_Call'] = function (block) {
     }
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Call'] = function (node, is_top_level) {
+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;
+    }
+}
+
+//                              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;
+        }
+    } else {
+        isMethod = true;
+        message = "";
+        name = "";
+        caller = func;
+        // (lambda x: x)()
+    }
+    let returns = true;
+
+    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;
+        }
+    }
+
+    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": !is_top_level,
-        "@names": true
+        "@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]);
+            argumentsNormal["ARG" + overallI] = this.convert(args[i], node);
             argumentsMutation["UNKNOWN_ARG:" + overallI] = null;
         }
     }
@@ -431,25 +546,28 @@ BlockMirrorTextToBlocks.prototype['ast_Call'] = function (node, is_top_level) {
             let arg = keyword.arg;
             let value = keyword.value;
             if (arg === null) {
-                argumentsNormal["ARG" + overallI] = this.convert(value);
+                argumentsNormal["ARG" + overallI] = this.convert(value, node);
                 argumentsMutation["KWARGS:" + overallI] = null;
             } else {
-                argumentsNormal["ARG" + overallI] = this.convert(value);
+                argumentsNormal["ARG" + overallI] = this.convert(value, node);
                 argumentsMutation["KEYWORD:" + Sk.ffi.remapToJs(arg)] = null;
             }
         }
     }
-
-    if (func._astname === "Name") {
-        let name = Sk.ffi.remapToJs(func.id);
-        argumentsMutation['@name'] = name;
-        return BlockMirrorTextToBlocks.create_block("ast_Call", node.lineno, {
-            "FUNC_NAME_VALUE": name,
-        }, argumentsNormal, {inline: true}, argumentsMutation);
+    // 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 {
-        argumentsMutation['@name'] = '*';
-        argumentsNormal['FUNC'] = this.convert(func);
-        return BlockMirrorTextToBlocks.create_block("ast_Call", node.lineno, {},
+        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];
+    }
 };
\ No newline at end of file
diff --git a/src/ast/ast_ClassDef.js b/src/ast/ast_ClassDef.js
index a59fecb..fca80b0 100644
--- a/src/ast/ast_ClassDef.js
+++ b/src/ast/ast_ClassDef.js
@@ -11,9 +11,7 @@ Blockly.Blocks['ast_ClassDef'] = {
         this.setInputsInline(false);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setColour(230);
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.OO);
         this.updateShape_();
     },
     // TODO: Not mutable currently
@@ -108,7 +106,7 @@ Blockly.Python['ast_ClassDef'] = function (block) {
 }
 ;
 
-BlockMirrorTextToBlocks.prototype['ast_ClassDef'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_ClassDef'] = function (node, parent) {
     let name = node.name;
     let bases = node.bases;
     let keywords = node.keywords;
@@ -120,19 +118,19 @@ BlockMirrorTextToBlocks.prototype['ast_ClassDef'] = function (node) {
 
     if (decorator_list !== null) {
         for (let i = 0; i < decorator_list.length; i++) {
-            values['DECORATOR' + i] = this.convert(decorator_list[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]);
+            values['BASE' + i] = this.convert(bases[i], node);
         }
     }
 
     if (keywords !== null) {
         for (let i = 0; i < keywords.length; i++) {
-            values['KEYWORDVALUE' + i] = this.convert(keywords[i].value);
+            values['KEYWORDVALUE' + i] = this.convert(keywords[i].value, node);
             let arg = keywords[i].arg;
             if (arg === null) {
                 fields['KEYWORDNAME' + i] = "**";
@@ -151,6 +149,6 @@ BlockMirrorTextToBlocks.prototype['ast_ClassDef'] = function (node) {
             "@bases": (bases === null ? 0 : bases.length),
             "@keywords": (keywords === null ? 0 : keywords.length),
         }, {
-            'BODY': this.convertBody(body)
+            'BODY': this.convertBody(body, node)
         });
 };
diff --git a/src/ast/ast_Comment.js b/src/ast/ast_Comment.js
new file mode 100644
index 0000000..b3f9fe9
--- /dev/null
+++ b/src/ast/ast_Comment.js
@@ -0,0 +1,24 @@
+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,
+});
+
+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
+    })
+};
\ No newline at end of file
diff --git a/src/ast/ast_Comp.js b/src/ast/ast_Comp.js
index fbff6f3..b769876 100644
--- a/src/ast/ast_Comp.js
+++ b/src/ast/ast_Comp.js
@@ -7,9 +7,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     ],
     "inputsInline": true,
     "output": "ComprehensionFor",
-    "style": 'loop_blocks',
-    "tooltip": "",
-    "helpUrl": ""
+    "colour": BlockMirrorTextToBlocks.COLOR.SEQUENCES
 });
 
 BlockMirrorTextToBlocks.BLOCKS.push({
@@ -20,9 +18,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     ],
     "inputsInline": true,
     "output": "ComprehensionIf",
-    "style": 'loop_blocks',
-    "tooltip": "",
-    "helpUrl": ""
+    "colour": BlockMirrorTextToBlocks.COLOR.SEQUENCES
 });
 
 Blockly.Blocks['ast_Comp_create_with_container'] = {
@@ -31,7 +27,7 @@ Blockly.Blocks['ast_Comp_create_with_container'] = {
      * @this Blockly.Block
      */
     init: function () {
-        this.setStyle('loop_blocks');
+        this.setColour(BlockMirrorTextToBlocks.COLOR.SEQUENCES);
         this.appendDummyInput()
             .appendField('Add new comprehensions below');
         this.appendDummyInput()
@@ -47,7 +43,7 @@ Blockly.Blocks['ast_Comp_create_with_for'] = {
      * @this Blockly.Block
      */
     init: function () {
-        this.setStyle('loop_blocks');
+        this.setColour(BlockMirrorTextToBlocks.COLOR.SEQUENCES);
         this.appendDummyInput()
             .appendField('For clause');
         this.setPreviousStatement(true);
@@ -62,7 +58,7 @@ Blockly.Blocks['ast_Comp_create_with_if'] = {
      * @this Blockly.Block
      */
     init: function () {
-        this.setStyle('loop_blocks');
+        this.setColour(BlockMirrorTextToBlocks.COLOR.SEQUENCES);
         this.appendDummyInput()
             .appendField('If clause');
         this.setPreviousStatement(true);
@@ -71,11 +67,11 @@ Blockly.Blocks['ast_Comp_create_with_if'] = {
     }
 };
 
-BlockMirrorTextToBlocks.BRACE_STYLE = {
-    'ListComp': {start: '[', end: ']'},
-    'SetComp': {start: '{', end: '}'},
-    'GeneratorExp': {start: '(', end: ')'},
-    'DictComp': {start: '{', end: '}'},
+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) {
@@ -86,14 +82,15 @@ BlockMirrorTextToBlocks.BRACE_STYLE = {
          */
         init: function () {
             this.setStyle('loop_blocks');
+            this.setColour(BlockMirrorTextToBlocks.COMP_SETTINGS[kind].color);
             this.itemCount_ = 3;
             let input = this.appendValueInput("ELT")
-                .appendField(BlockMirrorTextToBlocks.BRACE_STYLE[kind].start);
+                .appendField(BlockMirrorTextToBlocks.COMP_SETTINGS[kind].start);
             if (kind === 'DictComp') {
                 input.setCheck('DictPair');
             }
             this.appendDummyInput("END_BRACKET")
-                .appendField(BlockMirrorTextToBlocks.BRACE_STYLE[kind].end);
+                .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']));
@@ -259,9 +256,9 @@ BlockMirrorTextToBlocks.BRACE_STYLE = {
     Blockly.Python['ast_' + kind] = function (block) {
         // elt
         let elt;
-        if (kind == 'DictComp') {
+        if (kind === 'DictComp') {
             let child = block.getInputTargetBlock('ELT');
-            if (child === null || child.type != 'ast_DictItem') {
+            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) ||
@@ -296,13 +293,13 @@ BlockMirrorTextToBlocks.BRACE_STYLE = {
             }
         }
         // Put it all together
-        let code = BlockMirrorTextToBlocks.BRACE_STYLE[kind].start
+        let code = BlockMirrorTextToBlocks.COMP_SETTINGS[kind].start
             + elt + " " + elements.join(' ') +
-            BlockMirrorTextToBlocks.BRACE_STYLE[kind].end;
+            BlockMirrorTextToBlocks.COMP_SETTINGS[kind].end;
         return [code, Blockly.Python.ORDER_ATOMIC];
     };
 
-    BlockMirrorTextToBlocks.prototype['ast_' + kind] = function (node) {
+    BlockMirrorTextToBlocks.prototype['ast_' + kind] = function (node, parent) {
         let generators = node.generators;
 
         let elements = {};
@@ -311,8 +308,8 @@ BlockMirrorTextToBlocks.BRACE_STYLE = {
             let value = node.value;
             elements["ELT"] = BlockMirrorTextToBlocks.create_block("ast_DictItem", node.lineno, {},
                 {
-                    "KEY": this.convert(key),
-                    "VALUE": this.convert(value)
+                    "KEY": this.convert(key, node),
+                    "VALUE": this.convert(value, node)
                 },
                 {
                     "inline": "true",
@@ -321,7 +318,7 @@ BlockMirrorTextToBlocks.BRACE_STYLE = {
                 });
         } else {
             let elt = node.elt;
-            elements["ELT"] = this.convert(elt);
+            elements["ELT"] = this.convert(elt, node);
         }
         let DEFAULT_SETTINGS = {
             "inline": "true",
@@ -336,15 +333,15 @@ BlockMirrorTextToBlocks.BRACE_STYLE = {
             let is_async = generators[i].is_async;
             elements["GENERATOR" + g] = BlockMirrorTextToBlocks.create_block("ast_comprehensionFor", node.lineno, {},
                 {
-                    "ITER": this.convert(iter),
-                    "TARGET": this.convert(target)
+                    "ITER": this.convert(iter, node),
+                    "TARGET": this.convert(target, node)
                 },
                 DEFAULT_SETTINGS);
             g += 1;
             for (let j = 0; j < ifs.length; j++) {
                 elements["GENERATOR" + g] = BlockMirrorTextToBlocks.create_block("ast_comprehensionIf", node.lineno, {},
                     {
-                        "TEST": this.convert(ifs[j])
+                        "TEST": this.convert(ifs[j], node)
                     },
                     DEFAULT_SETTINGS);
                 g += 1;
diff --git a/src/ast/ast_Compare.js b/src/ast/ast_Compare.js
index 722c5e1..790b73a 100644
--- a/src/ast/ast_Compare.js
+++ b/src/ast/ast_Compare.js
@@ -29,7 +29,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     ],
     "inputsInline": true,
     "output": null,
-    "style": "logic_blocks"
+    "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
 });
 
 Blockly.Python['ast_Compare'] = function (block) {
@@ -43,17 +43,17 @@ Blockly.Python['ast_Compare'] = function (block) {
     return [code, order];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Compare'] = function (node) {
+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);
+    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])
+            "B": this.convert(values[i], node)
         }, {
             "inline": "true"
         });
diff --git a/src/ast/ast_Continue.js b/src/ast/ast_Continue.js
index c159b88..07f9142 100644
--- a/src/ast/ast_Continue.js
+++ b/src/ast/ast_Continue.js
@@ -4,15 +4,13 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     "inputsInline": false,
     "previousStatement": null,
     "nextStatement": null,
-    "colour": 60,
-    "tooltip": "",
-    "helpUrl": ""
+    "colour": BlockMirrorTextToBlocks.COLOR.CONTROL,
 });
 
 Blockly.Python['ast_Continue'] = function (block) {
     return "continue\n";
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Continue'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Continue'] = function (node, parent) {
     return BlockMirrorTextToBlocks.create_block("ast_Continue", node.lineno);
 };
\ No newline at end of file
diff --git a/src/ast/ast_Delete.js b/src/ast/ast_Delete.js
index b732e19..ee7c425 100644
--- a/src/ast/ast_Delete.js
+++ b/src/ast/ast_Delete.js
@@ -3,9 +3,7 @@ Blockly.Blocks['ast_Delete'] = {
         this.setInputsInline(true);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setColour(60);
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
         this.targetCount_ = 1;
 
         this.appendDummyInput()
@@ -60,11 +58,11 @@ Blockly.Python['ast_Delete'] = function (block) {
     return code;
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Delete'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Delete'] = function (node, parent) {
     let targets = node.targets;
 
     return BlockMirrorTextToBlocks.create_block("ast_Delete", node.lineno, {},
-        this.convertElements("TARGET", targets),
+        this.convertElements("TARGET", targets, node),
         {
             "inline": "true",
         }, {
diff --git a/src/ast/ast_Dict.js b/src/ast/ast_Dict.js
index 72e1615..21c0227 100644
--- a/src/ast/ast_Dict.js
+++ b/src/ast/ast_Dict.js
@@ -7,9 +7,7 @@ Blockly.Blocks['ast_DictItem'] = {
             .appendField(":");
         this.setInputsInline(true);
         this.setOutput(true, "DictPair");
-        this.setColour(70);
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.DICTIONARY);
     }
 };
 
@@ -19,7 +17,7 @@ Blockly.Blocks['ast_Dict'] = {
      * @this Blockly.Block
      */
     init: function () {
-        this.setColour(70);
+        this.setColour(BlockMirrorTextToBlocks.COLOR.DICTIONARY);
         this.itemCount_ = 3;
         this.updateShape_();
         this.setOutput(true, 'Dict');
@@ -170,7 +168,7 @@ Blockly.Blocks['ast_Dict_create_with_container'] = {
      * @this Blockly.Block
      */
     init: function () {
-        this.setColour(60);
+        this.setColour(BlockMirrorTextToBlocks.COLOR.DICTIONARY);
         this.appendDummyInput()
             .appendField('Add new dict elements below');
         this.appendStatementInput('STACK');
@@ -184,7 +182,7 @@ Blockly.Blocks['ast_Dict_create_with_item'] = {
      * @this Blockly.Block
      */
     init: function () {
-        this.setColour(60);
+        this.setColour(BlockMirrorTextToBlocks.COLOR.DICTIONARY);
         this.appendDummyInput()
             .appendField('Element');
         this.setPreviousStatement(true);
@@ -212,7 +210,7 @@ Blockly.Python['ast_Dict'] = function (block) {
     return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Dict'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Dict'] = function (node, parent) {
     let keys = node.keys;
     let values = node.values;
 
@@ -227,14 +225,10 @@ BlockMirrorTextToBlocks.prototype['ast_Dict'] = function (node) {
         let value = values[i];
         elements["ADD" + i] = BlockMirrorTextToBlocks.create_block("ast_DictItem", node.lineno, {},
             {
-                "KEY": this.convert(key),
-                "VALUE": this.convert(value)
+                "KEY": this.convert(key, node),
+                "VALUE": this.convert(value, node)
             },
-            {
-                "inline": "true",
-                'deletable': "false",
-                "movable": "false"
-            });
+            this.LOCKED_BLOCK);
     }
 
     return BlockMirrorTextToBlocks.create_block("ast_Dict", node.lineno, {},
diff --git a/src/ast/ast_Expr.js b/src/ast/ast_Expr.js
index aa5bff3..193665a 100644
--- a/src/ast/ast_Expr.js
+++ b/src/ast/ast_Expr.js
@@ -7,10 +7,8 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     "inputsInline": false,
     "previousStatement": null,
     "nextStatement": null,
-    "colour": 230,
-    "tooltip": "",
-    "helpUrl": ""
-})
+    "colour": BlockMirrorTextToBlocks.COLOR.PYTHON,
+});
 
 Blockly.Python['ast_Expr'] = function (block) {
     // Numeric value.
@@ -19,17 +17,18 @@ Blockly.Python['ast_Expr'] = function (block) {
     return value+"\n";
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Expr'] = function (node, is_top_level) {
+BlockMirrorTextToBlocks.prototype['ast_Expr'] = function (node, parent) {
     var value = node.value;
 
-    var converted = this.convert(value);
-    if (converted.constructor == Array) {
+    var converted = this.convert(value, node);
+
+    if (converted.constructor === Array) {
         return converted[0];
-    } else if (is_top_level === true) {
-        return [this.convert(value)];
+    } else if (this.isTopLevel(parent)) {
+        return [this.convert(value, node)];
     } else {
         return BlockMirrorTextToBlocks.create_block("ast_Expr", node.lineno, {}, {
-            "VALUE": this.convert(value)
+            "VALUE": this.convert(value, node)
         });
     }
-}
+};
diff --git a/src/ast/ast_For.js b/src/ast/ast_For.js
index efb67e4..6f2c568 100644
--- a/src/ast/ast_For.js
+++ b/src/ast/ast_For.js
@@ -10,9 +10,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
   "inputsInline": true,
   "previousStatement": null,
   "nextStatement": null,
-  "colour": 120,
-  "tooltip": "",
-  "helpUrl": ""
+  "colour": BlockMirrorTextToBlocks.COLOR.CONTROL,
 })
 
 BlockMirrorTextToBlocks.BLOCKS.push({
@@ -29,9 +27,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
   "inputsInline": true,
   "previousStatement": null,
   "nextStatement": null,
-  "colour": 120,
-  "tooltip": "",
-  "helpUrl": ""
+  "colour": BlockMirrorTextToBlocks.COLOR.CONTROL,
 })
 
 Blockly.Python['ast_For'] = function(block) {
@@ -49,24 +45,24 @@ Blockly.Python['ast_For'] = function(block) {
   return code;
 };
 
-BlockMirrorTextToBlocks.prototype['ast_For'] = function(node) {
+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)};
+    var bodies = {'BODY': this.convertBody(body, node)};
     
     if (orelse.length > 0) {
         blockName = "ast_ForElse";
-        bodies['ELSE'] = this.convertBody(orelse);
+        bodies['ELSE'] = this.convertBody(orelse, node);
     }
 
     return BlockMirrorTextToBlocks.create_block(blockName, node.lineno, {
     }, {
-        "ITER": this.convert(iter),
-        "TARGET": this.convert(target)
+        "ITER": this.convert(iter, node),
+        "TARGET": this.convert(target, node)
     }, {}, {}, bodies);
 }
 
diff --git a/src/ast/ast_FunctionDef.js b/src/ast/ast_FunctionDef.js
index d304e18..ba71cce 100644
--- a/src/ast/ast_FunctionDef.js
+++ b/src/ast/ast_FunctionDef.js
@@ -9,7 +9,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
         {"type": "input_statement", "name": "STACK", "align": "RIGHT"},
         {"type": "field_checkbox", "name": "RETURNS", "checked": true, "align": "RIGHT"}
     ],
-    "style": "procedure_blocks",
+    "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
     "enableContextMenu": false
 });
 
@@ -34,7 +34,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
         "message0": parameterDescription,
         "previousStatement": null,
         "nextStatement": null,
-        "style": "procedure_blocks",
+        "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
         "enableContextMenu": false
     });
     let realParameterBlock = {
@@ -42,7 +42,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
         "output": "Parameter",
         "message0": parameterPrefix + (parameterPrefix ? ' ' : '') + "%1",
         "args0": [{"type": "field_variable", "name": "NAME", "variable": "param"}],
-        "style": "procedure_blocks",
+        "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
         "enableContextMenu": false,
         "inputsInline": (parameterTyped && parameterDefault),
     };
@@ -89,9 +89,7 @@ Blockly.Blocks['ast_FunctionDef'] = {
         this.setInputsInline(false);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setStyle("procedure_blocks");
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.FUNCTIONS);
         this.updateShape_();
         this.setMutator(new Blockly.Mutator(['ast_FunctionMutantParameter',
             'ast_FunctionMutantParameterType']));
@@ -119,7 +117,7 @@ Blockly.Blocks['ast_FunctionDef'] = {
         this.hasReturn_ = "true" === xmlElement.getAttribute('returns');
         this.updateShape_();
     },
-    setReturnAnnotation_: function(status) {
+    setReturnAnnotation_: function (status) {
         let currentReturn = this.getInput('RETURNS');
         if (status) {
             if (!currentReturn) {
@@ -315,7 +313,7 @@ Blockly.Python['ast_FunctionDef'] = function (block) {
     return decorators.join('') + "def " + name + "(" + parameters.join(', ') + ")" + returns + ":\n" + body;
 };
 
-BlockMirrorTextToBlocks.prototype.parseArg = function (arg, type, lineno, values) {
+BlockMirrorTextToBlocks.prototype.parseArg = function (arg, type, lineno, values, node) {
     let settings = {
         "movable": false,
         "deletable": false
@@ -324,13 +322,13 @@ BlockMirrorTextToBlocks.prototype.parseArg = function (arg, type, lineno, values
         return BlockMirrorTextToBlocks.create_block(type,
             lineno, {'NAME': Sk.ffi.remapToJs(arg.arg)}, values, settings);
     } else {
-        values['TYPE'] = this.convert(arg.annotation);
+        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) {
+BlockMirrorTextToBlocks.prototype.parseArgs = function (args, values, lineno, node) {
     let positional = args.args,
         vararg = args.vararg,
         kwonlyargs = args.kwonlyargs,
@@ -341,21 +339,21 @@ BlockMirrorTextToBlocks.prototype.parseArgs = function (args, values, lineno) {
     // args (positional)
     if (positional !== null) {
         // "If there are fewer defaults, they correspond to the last n arguments."
-        let defaultOffset = defaults !== null ? defaults.length - positional.length : 0;
+        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]);
+                childValues['DEFAULT'] = this.convert(defaults[defaultOffset + i], node);
                 type += "Default";
             }
-            values['PARAMETER' + totalArgs] = this.parseArg(positional[i], type, lineno, childValues);
+            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, {});
+        values['PARAMETER' + totalArgs] = this.parseArg(vararg, 'ast_FunctionParameterVararg', lineno, {}, node);
         totalArgs += 1;
     }
     // keyword arguments that must be referenced by name
@@ -364,23 +362,23 @@ BlockMirrorTextToBlocks.prototype.parseArgs = function (args, values, lineno) {
             let childValues = {};
             let type = 'ast_FunctionParameter';
             if (kw_defaults[i]) {
-                childValues['DEFAULT'] = this.convert(kw_defaults[i]);
+                childValues['DEFAULT'] = this.convert(kw_defaults[i], node);
                 type += "Default";
             }
-            values['PARAMETER' + totalArgs] = this.parseArg(kwonlyargs[i], type, lineno, childValues);
+            values['PARAMETER' + totalArgs] = this.parseArg(kwonlyargs[i], type, lineno, childValues, node);
             totalArgs += 1;
         }
     }
     // **kwarg
-    if (kwarg !== null) {
-        values['PARAMETER' + totalArgs] = this.parseArg(kwarg, 'ast_FunctionParameterKwarg', lineno, {});
+    if (kwarg) {
+        values['PARAMETER' + totalArgs] = this.parseArg(kwarg, 'ast_FunctionParameterKwarg', lineno, {}, node);
         totalArgs += 1;
     }
 
     return totalArgs;
 };
 
-BlockMirrorTextToBlocks.prototype['ast_FunctionDef'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_FunctionDef'] = function (node, parent) {
     let name = node.name;
     let args = node.args;
     let body = node.body;
@@ -391,7 +389,7 @@ BlockMirrorTextToBlocks.prototype['ast_FunctionDef'] = function (node) {
 
     if (decorator_list !== null) {
         for (let i = 0; i < decorator_list.length; i++) {
-            values['DECORATOR' + i] = this.convert(decorator_list[i]);
+            values['DECORATOR' + i] = this.convert(decorator_list[i], node);
         }
     }
 
@@ -403,7 +401,7 @@ BlockMirrorTextToBlocks.prototype['ast_FunctionDef'] = function (node) {
     let hasReturn = (returns !== null &&
         (returns._astname !== 'NameConstant' || returns.value !== Sk.builtin.none.none$));
     if (hasReturn) {
-        values['RETURNS'] = this.convert(returns);
+        values['RETURNS'] = this.convert(returns, node);
     }
 
     return BlockMirrorTextToBlocks.create_block("ast_FunctionDef", node.lineno, {
@@ -417,6 +415,6 @@ BlockMirrorTextToBlocks.prototype['ast_FunctionDef'] = function (node) {
             "@parameters": parsedArgs,
             "@returns": hasReturn,
         }, {
-            'BODY': this.convertBody(body)
+            'BODY': this.convertBody(body, node)
         });
 };
diff --git a/src/ast/ast_Global.js b/src/ast/ast_Global.js
index 1253fe0..561ff2b 100644
--- a/src/ast/ast_Global.js
+++ b/src/ast/ast_Global.js
@@ -3,9 +3,7 @@ Blockly.Blocks['ast_Global'] = {
         this.setInputsInline(true);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setColour(60);
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
         this.nameCount_ = 1;
         this.appendDummyInput('GLOBAL')
             .appendField("make global", "START_GLOBALS");
@@ -67,7 +65,7 @@ Blockly.Python['ast_Global'] = function (block) {
     return 'global ' + elements.join(', ') + "\n";
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Global'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Global'] = function (node, parent) {
     let names = node.names;
 
     let fields = {};
diff --git a/src/ast/ast_If.js b/src/ast/ast_If.js
index 6bba90e..148afd5 100644
--- a/src/ast/ast_If.js
+++ b/src/ast/ast_If.js
@@ -10,15 +10,13 @@ Blockly.Blocks['ast_If'] = {
         this.setInputsInline(false);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setStyle("logic_blocks");
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.LOGIC);
         this.updateShape_();
     },
     // TODO: Not mutable currently
     updateShape_: function () {
         let latestInput = "BODY";
-        for (let i = 0; i < this.elifs_; i++) {
+        for (var i = 0; i < this.elifs_; i++) {
             if (!this.getInput('ELIF' + i)) {
                 this.appendValueInput('ELIFTEST' + i)
                     .appendField('elif');
@@ -43,7 +41,7 @@ Blockly.Blocks['ast_If'] = {
             block.removeInput('ORELSEBODY');
         }
 
-        for (let i = 0; i < this.elifs_; i++) {
+        for (i = 0; i < this.elifs_; i++) {
             if (this.orelse_) {
                 this.moveInputBefore('ELIFTEST' + i, 'ORELSETEST');
                 this.moveInputBefore('ELIFBODY' + i, 'ORELSETEST');
@@ -99,7 +97,7 @@ Blockly.Python['ast_If'] = function (block) {
     return test + body + elifs.join("") + orelse;
 };
 
-BlockMirrorTextToBlocks.prototype['ast_If'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_If'] = function (node, parent) {
     let test = node.test;
     let body = node.body;
     let orelse = node.orelse;
@@ -107,24 +105,24 @@ BlockMirrorTextToBlocks.prototype['ast_If'] = function (node) {
     let hasOrelse = false;
     let elifCount = 0;
 
-    let values = {"TEST": this.convert(test)};
-    let statements = {"BODY": this.convertBody(body)};
+    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);
-                statements['ELIFBODY' + elifCount] = this.convertBody(orelse[0].body);
+                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, false);
+                statements['ORELSEBODY'] = this.convertBody(orelse, node);
             }
         } else {
             hasOrelse = true;
-            statements['ORELSEBODY'] = this.convertBody(orelse, false);
+            statements['ORELSEBODY'] = this.convertBody(orelse, node);
         }
         orelse = orelse[0].orelse;
     }
diff --git a/src/ast/ast_IfExp.js b/src/ast/ast_IfExp.js
index 151866b..db72c62 100644
--- a/src/ast/ast_IfExp.js
+++ b/src/ast/ast_IfExp.js
@@ -8,26 +8,24 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     ],
     "inputsInline": true,
     "output": null,
-    "style": "logic_blocks",
-    "tooltip": "",
-    "helpUrl": ""
+    "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
 });
 
 Blockly.Python['ast_IfExp'] = function (block) {
-    var test = Blockly.Python.valueToCode(block, 'TEST', Blockly.Python.ORDER_ATOMIC) || Blockly.Python.blank;
-    var body = Blockly.Python.valueToCode(block, 'BODY', Blockly.Python.ORDER_ATOMIC) || Blockly.Python.blank;
-    var orelse = Blockly.Python.valueToCode(block, 'ORELSE', Blockly.Python.ORDER_ATOMIC) || Blockly.Python.blank;
-    return body + " if " + test + " else " + orelse + "\n";
+    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) {
+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),
-        "BODY": this.convert(body),
-        "ORELSE": this.convert(orelse)
+        "TEST": this.convert(test, node),
+        "BODY": this.convert(body, node),
+        "ORELSE": this.convert(orelse, node)
     });
 };
\ No newline at end of file
diff --git a/src/ast/ast_Import.js b/src/ast/ast_Import.js
index 65eb5bc..96a623a 100644
--- a/src/ast/ast_Import.js
+++ b/src/ast/ast_Import.js
@@ -11,9 +11,7 @@ Blockly.Blocks['ast_Import'] = {
         this.setInputsInline(false);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setColour(230);
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.PYTHON);
         this.updateShape_();
     },
     // TODO: Not mutable currently
@@ -28,7 +26,7 @@ Blockly.Blocks['ast_Import'] = {
             this.removeInput('FROM');
         }
         // Import clauses
-        for (let i = 0; i < this.nameCount_; i++) {
+        for (var i = 0; i < this.nameCount_; i++) {
             let input = this.getInput('CLAUSE' + i);
             if (!input) {
                 input = this.appendDummyInput('CLAUSE' + i)
@@ -55,7 +53,7 @@ Blockly.Blocks['ast_Import'] = {
         if (this.from_ && this.nameCount_ > 0) {
             this.moveInputBefore('FROM', 'CLAUSE0');
         }
-        for (let i = 0; i + 1 < this.nameCount_; i++) {
+        for (i = 0; i + 1 < this.nameCount_; i++) {
             this.moveInputBefore('CLAUSE' + i, 'CLAUSE' + (i + 1));
         }
     },
@@ -110,7 +108,7 @@ Blockly.Python['ast_Import'] = function (block) {
     return from + 'import ' + elements.join(', ') + "\n";
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Import'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Import'] = function (node, parent) {
     let names = node.names;
 
     let fields = {};
diff --git a/src/ast/ast_Lambda.js b/src/ast/ast_Lambda.js
index 02bdeb0..9e7a384 100644
--- a/src/ast/ast_Lambda.js
+++ b/src/ast/ast_Lambda.js
@@ -12,9 +12,7 @@ Blockly.Blocks['ast_Lambda'] = {
             .setCheck(null);
         this.setInputsInline(false);
         this.setOutput(true);
-        this.setStyle("procedure_blocks");
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.FUNCTIONS);
         this.updateShape_();
     },
     mutationToDom: Blockly.Blocks['ast_FunctionDef'].mutationToDom,
@@ -35,11 +33,11 @@ Blockly.Python['ast_Lambda'] = function (block) {
     return ["lambda " + parameters.join(', ') + ": " + body, Blockly.Python.ORDER_LAMBDA];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Lambda'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Lambda'] = function (node, parent) {
     let args = node.args;
     let body = node.body;
 
-    let values = {'BODY': this.convert(body)};
+    let values = {'BODY': this.convert(body, node)};
 
     let parsedArgs = 0;
     if (args !== null) {
diff --git a/src/ast/ast_List.js b/src/ast/ast_List.js
index e755361..c0ca561 100644
--- a/src/ast/ast_List.js
+++ b/src/ast/ast_List.js
@@ -5,12 +5,11 @@ Blockly.Blocks['ast_List'] = {
      */
     init: function () {
         this.setHelpUrl(Blockly.Msg['LISTS_CREATE_WITH_HELPURL']);
-        this.setStyle('list_blocks');
+        this.setColour(BlockMirrorTextToBlocks.COLOR.LIST);
         this.itemCount_ = 3;
         this.updateShape_();
         this.setOutput(true, 'List');
         this.setMutator(new Blockly.Mutator(['ast_List_create_with_item']));
-        this.setTooltip(Blockly.Msg['LISTS_CREATE_WITH_TOOLTIP']);
     },
     /**
      * Create XML to represent list inputs.
@@ -139,11 +138,10 @@ Blockly.Blocks['ast_List_create_with_container'] = {
      * @this Blockly.Block
      */
     init: function () {
-        this.setStyle('list_blocks');
+        this.setColour(BlockMirrorTextToBlocks.COLOR.LIST);
         this.appendDummyInput()
             .appendField('Add new list elements below');
         this.appendStatementInput('STACK');
-        this.setTooltip(Blockly.Msg['LISTS_CREATE_WITH_CONTAINER_TOOLTIP']);
         this.contextMenu = false;
     }
 };
@@ -154,12 +152,11 @@ Blockly.Blocks['ast_List_create_with_item'] = {
      * @this Blockly.Block
      */
     init: function () {
-        this.setStyle('list_blocks');
+        this.setColour(BlockMirrorTextToBlocks.COLOR.LIST);
         this.appendDummyInput()
             .appendField('Element');
         this.setPreviousStatement(true);
         this.setNextStatement(true);
-        this.setTooltip(Blockly.Msg['LISTS_CREATE_WITH_ITEM_TOOLTIP']);
         this.contextMenu = false;
     }
 };
@@ -175,12 +172,12 @@ Blockly.Python['ast_List'] = function (block) {
     return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_List'] = function (node) {
+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),
+        this.convertElements("ADD", elts, node),
         {
             "inline": elts.length > 3 ? "false" : "true",
         }, {
diff --git a/src/ast/ast_Name.js b/src/ast/ast_Name.js
index e86f269..9578a2f 100644
--- a/src/ast/ast_Name.js
+++ b/src/ast/ast_Name.js
@@ -5,9 +5,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
         {"type": "field_variable", "name": "VAR", "variable": "%{BKY_VARIABLES_DEFAULT_NAME}"}
     ],
     "output": null,
-    "style": "variable_blocks",
-    "helpUrl": "%{BKY_VARIABLES_GET_HELPURL}",
-    "tooltip": "%{BKY_VARIABLES_GET_TOOLTIP}",
+    "colour": BlockMirrorTextToBlocks.COLOR.VARIABLES,
     "extensions": ["contextMenu_variableSetterGetter_forBlockMirror"]
 })
 
@@ -81,7 +79,7 @@ Blockly.Python['ast_Name'] = function (block) {
     return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Name'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Name'] = function (node, parent) {
     var id = node.id;
     var ctx = node.ctx;
     if (id.v == Blockly.Python.blank) {
diff --git a/src/ast/ast_NameConstant.js b/src/ast/ast_NameConstant.js
index beb5a3e..2fc0642 100644
--- a/src/ast/ast_NameConstant.js
+++ b/src/ast/ast_NameConstant.js
@@ -3,9 +3,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     "message0": "None",
     "args0": [],
     "output": "None",
-    "style": "logic_blocks",
-    "tooltip": "%{BKY_LOGIC_NULL_TOOLTIP}",
-    "helpUrl": "%{BKY_LOGIC_NULL_HELPURL}"
+    "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
 });
 
 BlockMirrorTextToBlocks.BLOCKS.push({
@@ -20,9 +18,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
         }
     ],
     "output": "Boolean",
-    "style": "logic_blocks",
-    "tooltip": "%{BKY_LOGIC_BOOLEAN_TOOLTIP}",
-    "helpUrl": "%{BKY_LOGIC_BOOLEAN_HELPURL}"
+    "colour": BlockMirrorTextToBlocks.COLOR.LOGIC
 });
 
 Blockly.Python['ast_NameConstantBoolean'] = function (block) {
@@ -37,7 +33,7 @@ Blockly.Python['ast_NameConstantNone'] = function (block) {
     return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_NameConstant'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_NameConstant'] = function (node, parent) {
     let value = node.value;
 
     if (value === Sk.builtin.none.none$) {
diff --git a/src/ast/ast_Nonlocal.js b/src/ast/ast_Nonlocal.js
index b72dd4f..df16c6a 100644
--- a/src/ast/ast_Nonlocal.js
+++ b/src/ast/ast_Nonlocal.js
@@ -3,9 +3,7 @@ Blockly.Blocks['ast_Nonlocal'] = {
         this.setInputsInline(true);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setColour(60);
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.VARIABLES);
         this.nameCount_ = 1;
         this.appendDummyInput('NONLOCAL')
             .appendField("make nonlocal", "START_NONLOCALS");
@@ -67,7 +65,7 @@ Blockly.Python['ast_Nonlocal'] = function (block) {
     return 'nonlocal ' + elements.join(', ') + "\n";
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Nonlocal'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Nonlocal'] = function (node, parent) {
     let names = node.names;
 
     let fields = {};
diff --git a/src/ast/ast_Num.js b/src/ast/ast_Num.js
index c546bdf..4592eeb 100644
--- a/src/ast/ast_Num.js
+++ b/src/ast/ast_Num.js
@@ -5,10 +5,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
         { "type": "field_number", "name": "NUM", "value": 0}
     ],
     "output": "Number",
-    "helpUrl": "%{BKY_MATH_NUMBER_HELPURL}",
-    "style": "math_blocks",
-    "tooltip": "%{BKY_MATH_NUMBER_TOOLTIP}",
-    "extensions": ["parent_tooltip_when_inline"]
+    "colour": BlockMirrorTextToBlocks.COLOR.MATH
 })
 
 Blockly.Python['ast_Num'] = function(block) {
@@ -28,7 +25,7 @@ Blockly.Python['ast_Num'] = function(block) {
   return [code, order];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Num'] = function(node) {
+BlockMirrorTextToBlocks.prototype['ast_Num'] = function (node, parent) {
     var n = node.n;
     return BlockMirrorTextToBlocks.create_block("ast_Num", node.lineno, {
         "NUM": Sk.ffi.remapToJs(n)
diff --git a/src/ast/ast_Raise.js b/src/ast/ast_Raise.js
index 84ce895..7b0ed38 100644
--- a/src/ast/ast_Raise.js
+++ b/src/ast/ast_Raise.js
@@ -3,9 +3,7 @@ Blockly.Blocks['ast_Raise'] = {
         this.setInputsInline(true);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setColour(60);
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.EXCEPTIONS);
         this.exc_ = true;
         this.cause_ = false;
 
@@ -69,17 +67,17 @@ Blockly.Python['ast_Raise'] = function (block) {
     }
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Raise'] = function (node) {
+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);
+        values['EXC'] = this.convert(exc, node);
         hasExc = true;
     }
     if (cause !== null) {
-        values['CAUSE'] = this.convert(cause);
+        values['CAUSE'] = this.convert(cause, node);
         hasCause = true;
     }
     return BlockMirrorTextToBlocks.create_block("ast_Raise", node.lineno, {}, values, {}, {
diff --git a/src/ast/ast_Raw.js b/src/ast/ast_Raw.js
new file mode 100644
index 0000000..dacf72d
--- /dev/null
+++ b/src/ast/ast_Raw.js
@@ -0,0 +1,16 @@
+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,
+});
+
+Blockly.Python['ast_Raw'] = function (block) {
+    var code = block.getFieldValue('TEXT') + "\n";
+    return code;
+};
diff --git a/src/ast/ast_Return.js b/src/ast/ast_Return.js
index 7f5686a..24c18e1 100644
--- a/src/ast/ast_Return.js
+++ b/src/ast/ast_Return.js
@@ -7,9 +7,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     "inputsInline": true,
     "previousStatement": null,
     "nextStatement": null,
-    "colour": 60,
-    "tooltip": "",
-    "helpUrl": ""
+    "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
 });
 
 BlockMirrorTextToBlocks.BLOCKS.push({
@@ -18,9 +16,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     "inputsInline": true,
     "previousStatement": null,
     "nextStatement": null,
-    "colour": 60,
-    "tooltip": "",
-    "helpUrl": ""
+    "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
 });
 
 Blockly.Python['ast_Return'] = function (block) {
@@ -32,14 +28,14 @@ Blockly.Python['ast_ReturnFull'] = function (block) {
     return "return " + value + "\n";
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Return'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Return'] = function (node, parent) {
     let 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)
+            "VALUE": this.convert(value, node)
         });
     }
 };
\ No newline at end of file
diff --git a/src/ast/ast_Set.js b/src/ast/ast_Set.js
index 8a302e6..66f5756 100644
--- a/src/ast/ast_Set.js
+++ b/src/ast/ast_Set.js
@@ -4,7 +4,7 @@ Blockly.Blocks['ast_Set'] = {
      * @this Blockly.Block
      */
     init: function () {
-        this.setColour(60);
+        this.setColour(BlockMirrorTextToBlocks.COLOR.SET);
         this.itemCount_ = 3;
         this.updateShape_();
         this.setOutput(true, 'Set');
@@ -136,7 +136,7 @@ Blockly.Blocks['ast_Set_create_with_container'] = {
      * @this Blockly.Block
      */
     init: function () {
-        this.setColour(60);
+        this.setColour(BlockMirrorTextToBlocks.COLOR.SET);
         this.appendDummyInput()
             .appendField('Add new set elements below');
         this.appendStatementInput('STACK');
@@ -150,7 +150,7 @@ Blockly.Blocks['ast_Set_create_with_item'] = {
      * @this Blockly.Block
      */
     init: function () {
-        this.setColour(60);
+        this.setColour(BlockMirrorTextToBlocks.COLOR.SET);
         this.appendDummyInput()
             .appendField('Element');
         this.setPreviousStatement(true);
@@ -173,11 +173,11 @@ Blockly.Python['ast_Set'] = function (block) {
     return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Set'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Set'] = function (node, parent) {
     var elts = node.elts;
 
     return BlockMirrorTextToBlocks.create_block("ast_Set", node.lineno, {},
-        this.convertElements("ADD", elts),
+        this.convertElements("ADD", elts, node),
         {
             "inline": elts.length > 3 ? "false" : "true",
         }, {
diff --git a/src/ast/ast_Starred.js b/src/ast/ast_Starred.js
index b6ba8ff..5dae789 100644
--- a/src/ast/ast_Starred.js
+++ b/src/ast/ast_Starred.js
@@ -6,7 +6,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     ],
     "inputsInline": false,
     "output": null,
-    "colour": 40
+    "colour": BlockMirrorTextToBlocks.COLOR.VARIABLES
 });
 
 Blockly.Python['ast_Starred'] = function (block) {
@@ -17,12 +17,12 @@ Blockly.Python['ast_Starred'] = function (block) {
     return [code, order];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Starred'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Starred'] = function (node, parent) {
     let value = node.value;
     let ctx = node.ctx;
 
     return BlockMirrorTextToBlocks.create_block('ast_Starred', node.lineno, {}, {
-        "VALUE": this.convert(value)
+        "VALUE": this.convert(value, node)
     }, {
         "inline": true
     });
diff --git a/src/ast/ast_Str.js b/src/ast/ast_Str.js
index 1ce968b..267b243 100644
--- a/src/ast/ast_Str.js
+++ b/src/ast/ast_Str.js
@@ -2,24 +2,102 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     "type": "ast_Str",
     "message0": "%1",
     "args0": [
-        { "type": "field_number", "name": "TEXT", "value": ''}
+        {"type": "field_input", "name": "TEXT", "value": ''}
     ],
     "output": "String",
-    "style": "text_blocks",
-    "helpUrl": "%{BKY_TEXT_TEXT_HELPURL}",
-    "tooltip": "%{BKY_TEXT_TEXT_TOOLTIP}",
-    "extensions": [ "text_quotes",  "parent_tooltip_when_inline" ]
-})
+    "colour": BlockMirrorTextToBlocks.COLOR.TEXT,
+    "extensions": ["text_quotes"]
+});
 
-Blockly.Python['ast_Str'] = function(block) {
+BlockMirrorTextToBlocks.BLOCKS.push({
+    "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
+});
+
+Blockly.Python['ast_Str'] = function (block) {
+    // Text value.
+    let code = Blockly.Python.quote_(block.getFieldValue('TEXT'));
+    return [code, Blockly.Python.ORDER_ATOMIC];
+};
+
+Blockly.Python['ast_StrMultiline'] = function (block) {
     // Text value.
-    var code = Blockly.Python.quote_(block.getFieldValue('TEXT'));
+    let code = Blockly.Python.multiline_quote_(block.getFieldValue('TEXT'));
     return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Str'] = function(node) {
-    var s = node.s;
-    return BlockMirrorTextToBlocks.create_block("ast_Str", node.lineno, {
-        "TEXT": Sk.ffi.remapToJs(s)
-    });
-}
+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);
+};
+
+BlockMirrorTextToBlocks.prototype.isDocString = function (node, 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;
+        }
+    }
+    return recombined.join("\n");
+};
+
+// 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});
+    }
+};
diff --git a/src/ast/ast_Subscript.js b/src/ast/ast_Subscript.js
index 9063b25..8ad4365 100644
--- a/src/ast/ast_Subscript.js
+++ b/src/ast/ast_Subscript.js
@@ -2,9 +2,7 @@ Blockly.Blocks['ast_Subscript'] = {
     init: function () {
         this.setInputsInline(true);
         this.setOutput(true);
-        this.setColour(60);
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.SEQUENCES);
         this.sliceKinds_ = ["I"];
 
         this.appendValueInput("VALUE")
@@ -159,45 +157,45 @@ var isWeirdSliceCase = function(slice) {
         slice.step.value === Sk.builtin.none.none$);
 }
 
-BlockMirrorTextToBlocks.prototype.addSliceDim = function (slice, i, values, mutations) {
+BlockMirrorTextToBlocks.prototype.addSliceDim = function (slice, i, values, mutations, node) {
     let sliceKind = slice._astname;
     if (sliceKind === "Index") {
-        values['INDEX' + i] = this.convert(slice.value);
+        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);
+            values['SLICELOWER' + i] = this.convert(slice.lower, node);
             L = "1";
         }
         if (slice.upper !== null) {
-            values['SLICEUPPER' + i] = this.convert(slice.upper);
+            values['SLICEUPPER' + i] = this.convert(slice.upper, node);
             U = "1";
         }
         if (slice.step !== null && !isWeirdSliceCase(slice)) {
-            values['SLICESTEP' + i] = this.convert(slice.step);
+            values['SLICESTEP' + i] = this.convert(slice.step, node);
             S = "1";
         }
         mutations.push("S" + L + U + S);
     }
 }
 
-BlockMirrorTextToBlocks.prototype['ast_Subscript'] = function (node) {
+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)};
+    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);
+            this.addSliceDim(dim, i, values, mutations, node);
         }
     } else {
-        this.addSliceDim(slice, 0, values, mutations);
+        this.addSliceDim(slice, 0, values, mutations, node);
     }
     return BlockMirrorTextToBlocks.create_block("ast_Subscript", node.lineno, {},
         values, {"inline": "true"}, {"arg": mutations});
diff --git a/src/ast/ast_Try.js b/src/ast/ast_Try.js
index 88c03ec..ad0cfe8 100644
--- a/src/ast/ast_Try.js
+++ b/src/ast/ast_Try.js
@@ -16,9 +16,7 @@ Blockly.Blocks['ast_Try'] = {
         this.setInputsInline(true);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setColour(230);
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.EXCEPTIONS);
         this.updateShape_();
     },
     // TODO: Not mutable currently
@@ -121,7 +119,7 @@ Blockly.Python['ast_Try'] = function (block) {
     return "try:\n" + body + handlers.join("") + orelse + finalbody;
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Try'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Try'] = function (node, parent) {
     let body = node.body;
     let handlers = node.handlers;
     let orelse = node.orelse;
@@ -135,22 +133,22 @@ BlockMirrorTextToBlocks.prototype['ast_Try'] = function (node) {
         "@HANDLERS": handlers.length
     };
 
-    let statements = {"BODY": this.convertBody(body)};
+    let statements = {"BODY": this.convertBody(body, node)};
     if (orelse !== null) {
-        statements['ORELSE'] = this.convertBody(orelse);
+        statements['ORELSE'] = this.convertBody(orelse, node);
     }
     if (finalbody !== null && finalbody.length) {
-        statements['FINALBODY'] = this.convertBody(finalbody);
+        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);
+        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);
+            values["TYPE" + i] = this.convert(handler.type, node);
             if (handler.name === null) {
                 handledLevels.push(BlockMirrorTextToBlocks.HANDLERS_NO_AS);
             } else {
diff --git a/src/ast/ast_Tuple.js b/src/ast/ast_Tuple.js
index 565bb90..bf88835 100644
--- a/src/ast/ast_Tuple.js
+++ b/src/ast/ast_Tuple.js
@@ -4,7 +4,7 @@ Blockly.Blocks['ast_Tuple'] = {
      * @this Blockly.Block
      */
     init: function () {
-        this.setColour(60);
+        this.setColour(BlockMirrorTextToBlocks.COLOR.TUPLE);
         this.itemCount_ = 3;
         this.updateShape_();
         this.setOutput(true, 'Tuple');
@@ -141,7 +141,7 @@ Blockly.Blocks['ast_Tuple_create_with_container'] = {
      * @this Blockly.Block
      */
     init: function () {
-        this.setColour(60);
+        this.setColour(BlockMirrorTextToBlocks.COLOR.TUPLE);
         this.appendDummyInput()
             .appendField('Add new tuple elements below');
         this.appendStatementInput('STACK');
@@ -155,7 +155,7 @@ Blockly.Blocks['ast_Tuple_create_with_item'] = {
      * @this Blockly.Block
      */
     init: function () {
-        this.setColour(60);
+        this.setColour(BlockMirrorTextToBlocks.COLOR.TUPLE);
         this.appendDummyInput()
             .appendField('Element');
         this.setPreviousStatement(true);
@@ -179,12 +179,12 @@ Blockly.Python['ast_Tuple'] = function (block) {
     return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Tuple'] = function (node) {
+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),
+        this.convertElements("ADD", elts, node),
         {
             "inline": elts.length > 4 ? "false" : "true",
         }, {
diff --git a/src/ast/ast_UnaryOp.js b/src/ast/ast_UnaryOp.js
index 6dc5b22..1ad04f2 100644
--- a/src/ast/ast_UnaryOp.js
+++ b/src/ast/ast_UnaryOp.js
@@ -6,7 +6,7 @@ BlockMirrorTextToBlocks.UNARYOPS = [
 ];
 
 BlockMirrorTextToBlocks.UNARYOPS.forEach(function (unaryop) {
-    Blockly.Constants.Math.TOOLTIPS_BY_OP[unaryop[1]] = unaryop[2];
+    //Blockly.Constants.Math.TOOLTIPS_BY_OP[unaryop[1]] = unaryop[2];
 
     let fullName = "ast_UnaryOp" + unaryop[1];
 
@@ -18,7 +18,9 @@ BlockMirrorTextToBlocks.UNARYOPS.forEach(function (unaryop) {
         ],
         "inputsInline": false,
         "output": null,
-        "style": (unaryop[1] == 'Not' ? "logic_blocks" : "math_blocks")
+        "colour": (unaryop[1] == 'Not' ?
+            BlockMirrorTextToBlocks.COLOR.LOGIC :
+            BlockMirrorTextToBlocks.COLOR.MATH)
     });
 
     Blockly.Python[fullName] = function (block) {
@@ -30,12 +32,12 @@ BlockMirrorTextToBlocks.UNARYOPS.forEach(function (unaryop) {
     };
 });
 
-BlockMirrorTextToBlocks.prototype['ast_UnaryOp'] = function (node) {
+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)
+        "VALUE": this.convert(operand, node)
     }, {
         "inline": false
     });
diff --git a/src/ast/ast_While.js b/src/ast/ast_While.js
index ee636f7..82392da 100644
--- a/src/ast/ast_While.js
+++ b/src/ast/ast_While.js
@@ -9,9 +9,7 @@ Blockly.Blocks['ast_While'] = {
         this.setInputsInline(false);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setStyle("loop_blocks");
-        this.setTooltip("");
-        this.setHelpUrl("");
+        this.setColour(BlockMirrorTextToBlocks.COLOR.CONTROL);
         this.updateShape_();
     },
     // TODO: Not mutable currently
@@ -62,17 +60,17 @@ Blockly.Python['ast_While'] = function (block) {
     return test + body + orelse;
 };
 
-BlockMirrorTextToBlocks.prototype['ast_While'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_While'] = function (node, parent) {
     let test = node.test;
     let body = node.body;
     let orelse = node.orelse;
 
-    let values = {"TEST": this.convert(test)};
-    let statements = {"BODY": this.convertBody(body)};
+    let values = {"TEST": this.convert(test, node)};
+    let statements = {"BODY": this.convertBody(body, node)};
 
     let hasOrelse = false;
     if (orelse !== null && orelse.length > 0) {
-        statements['ORELSEBODY'] = this.convertBody(orelse, false);
+        statements['ORELSEBODY'] = this.convertBody(orelse, node);
         hasOrelse = true;
     }
 
diff --git a/src/ast/ast_With.js b/src/ast/ast_With.js
index 9d9fd47..3f4e8f7 100644
--- a/src/ast/ast_With.js
+++ b/src/ast/ast_With.js
@@ -4,7 +4,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     "message0": "context %1",
     "args0": [{"type": "input_value", "name": "CONTEXT"}],
     "enableContextMenu": false,
-    "colour": 60,
+    "colour": BlockMirrorTextToBlocks.COLOR.CONTROL,
     "inputsInline": false,
 });
 Blockly.Python["ast_WithItem"] = function (block) {
@@ -19,7 +19,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     "args0": [{"type": "input_value", "name": "CONTEXT"},
         {"type": "input_value", "name": "AS"}],
     "enableContextMenu": false,
-    "colour": 60,
+    "colour": BlockMirrorTextToBlocks.COLOR.CONTROL,
     "inputsInline": true,
 });
 Blockly.Python["ast_WithItemAs"] = function (block) {
@@ -41,9 +41,7 @@ Blockly.Blocks['ast_With'] = {
         this.setInputsInline(false);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setTooltip("");
-        this.setHelpUrl("");
-        this.setColour(60);
+        this.setColour(BlockMirrorTextToBlocks.COLOR.CONTROL);
         this.updateShape_();
     },
     /**
@@ -78,7 +76,7 @@ Blockly.Blocks['ast_With'] = {
     },
     updateShape_: function () {
         // With clauses
-        for (let i = 1; i < this.itemCount_; i++) {
+        for (var i = 1; i < this.itemCount_; i++) {
             let input = this.getInput('ITEM' + i);
             if (!input) {
                 input = this.appendValueInput('ITEM' + i);
@@ -90,7 +88,7 @@ Blockly.Blocks['ast_With'] = {
             i++;
         }
         // Reposition everything
-        for (let i = 0; i < this.itemCount_; i++) {
+        for (i = 0; i < this.itemCount_; i++) {
             this.moveInputBefore('ITEM' + i, 'BODY');
         }
     },
@@ -108,7 +106,7 @@ Blockly.Python['ast_With'] = function (block) {
     return "with " + items.join(', ') + ":\n" + body;
 };
 
-BlockMirrorTextToBlocks.prototype['ast_With'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_With'] = function (node, parent) {
     let items = node.items;
     let body = node.body;
 
@@ -119,14 +117,14 @@ BlockMirrorTextToBlocks.prototype['ast_With'] = function (node) {
     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)};
+        let innerValues = {'CONTEXT':this.convert(items[i].context_expr, node)};
         if (hasRename) {
-            innerValues['AS'] = this.convert(items[i].optional_vars);
+            innerValues['AS'] = this.convert(items[i].optional_vars, node);
             values['ITEM'+i] = BlockMirrorTextToBlocks.create_block("ast_WithItemAs", node.lineno,
-                {}, innerValues);;
+                {}, innerValues, this.LOCKED_BLOCK);
         } else {
             values['ITEM'+i] = BlockMirrorTextToBlocks.create_block("ast_WithItem", node.lineno,
-                {}, innerValues);;
+                {}, innerValues, this.LOCKED_BLOCK);
         }
     }
     mutations['as'] = renamedItems;
@@ -136,6 +134,6 @@ BlockMirrorTextToBlocks.prototype['ast_With'] = function (node) {
         {
             "inline": "false"
         }, mutations, {
-            'BODY': this.convertBody(body)
+            'BODY': this.convertBody(body, node)
         });
 };
diff --git a/src/ast/ast_Yield.js b/src/ast/ast_Yield.js
index c3d2b2c..bb4d023 100644
--- a/src/ast/ast_Yield.js
+++ b/src/ast/ast_Yield.js
@@ -6,9 +6,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     ],
     "inputsInline": false,
     "output": null,
-    "colour": 60,
-    "tooltip": "",
-    "helpUrl": ""
+    "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
 });
 
 BlockMirrorTextToBlocks.BLOCKS.push({
@@ -16,9 +14,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     "message0": "yield",
     "inputsInline": false,
     "output": null,
-    "colour": 60,
-    "tooltip": "",
-    "helpUrl": ""
+    "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
 });
 
 Blockly.Python['ast_Yield'] = function (block) {
@@ -30,14 +26,14 @@ Blockly.Python['ast_YieldFull'] = function (block) {
     return ["yield " + value, Blockly.Python.ORDER_LAMBDA];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_Yield'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_Yield'] = function (node, parent) {
     let 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)
+            "VALUE": this.convert(value, node)
         });
     }
 };
\ No newline at end of file
diff --git a/src/ast/ast_YieldFrom.js b/src/ast/ast_YieldFrom.js
index d70470b..ec6c4d0 100644
--- a/src/ast/ast_YieldFrom.js
+++ b/src/ast/ast_YieldFrom.js
@@ -6,9 +6,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
     ],
     "inputsInline": false,
     "output": null,
-    "colour": 60,
-    "tooltip": "",
-    "helpUrl": ""
+    "colour": BlockMirrorTextToBlocks.COLOR.FUNCTIONS,
 });
 
 Blockly.Python['ast_YieldFrom'] = function (block) {
@@ -16,10 +14,10 @@ Blockly.Python['ast_YieldFrom'] = function (block) {
     return ["yield from " + value, Blockly.Python.ORDER_LAMBDA];
 };
 
-BlockMirrorTextToBlocks.prototype['ast_YieldFrom'] = function (node) {
+BlockMirrorTextToBlocks.prototype['ast_YieldFrom'] = function (node, parent) {
     let value = node.value;
 
     return BlockMirrorTextToBlocks.create_block("ast_YieldFrom", node.lineno, {}, {
-        "VALUE": this.convert(value)
+        "VALUE": this.convert(value, node)
     });
 };
\ No newline at end of file
diff --git a/src/ast/ast_functions.js b/src/ast/ast_functions.js
new file mode 100644
index 0000000..a49f5f6
--- /dev/null
+++ b/src/ast/ast_functions.js
@@ -0,0 +1,234 @@
+BlockMirrorTextToBlocks.prototype.FUNCTION_SIGNATURES = {
+    '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},
+    '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
+    },
+    '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},
+    '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,
+            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.prototype.MODULE_FUNCTION_SIGNATURES['matplotlib.pyplot'] =
+    BlockMirrorTextToBlocks.prototype.MODULE_FUNCTION_SIGNATURES['plt'];
\ No newline at end of file
diff --git a/src/ast/todo.md b/src/ast/todo.md
index 7029471..6182e28 100644
--- a/src/ast/todo.md
+++ b/src/ast/todo.md
@@ -1,8 +1,3 @@
-[X] If
-[X] Import
-[X] ImportFrom
-[X] While
-[X] With
 [-] AsyncFor
 [-] AsyncFunctionDef
 [-] AsyncWith
@@ -46,7 +41,10 @@
 [X] Global
 [X] Gt
 [X] GtE
+[X] If
 [X] IfExp
+[X] Import
+[X] ImportFrom
 [X] In
 [X] Index
 [X] Interactive
@@ -90,5 +88,7 @@
 [X] UAdd
 [X] USub
 [X] UnaryOp
+[X] While
+[X] With
 [X] Yield
 [X] YieldFrom
\ No newline at end of file
diff --git a/src/block_editor.js b/src/block_editor.js
index 0303121..3bd50e9 100644
--- a/src/block_editor.js
+++ b/src/block_editor.js
@@ -1,13 +1,24 @@
+/**
+ * Worth noting - Blockly uses a setTimeOut of 0 steps to make events
+ * wait. That has some confusing interaction with trying to make things percolate.
+ * @param blockMirror
+ * @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, 
+        media: blockMirror.configuration.blocklyMediaPath,
         // We use special comment blocks
+        zoom: {controls: true},
         comments: false,
         disable: false,
         oneBasedIndex: false,
@@ -16,27 +27,27 @@ function BlockMirrorBlockEditor(blockMirror) {
         toolbox: this.makeToolbox()
     }
     this.workspace = Blockly.inject(blockMirror.tags.blockEditor,
-                                  blocklyOptions);
+        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();
 }
 
-BlockMirrorBlockEditor.prototype.updateWidth = function() {
+BlockMirrorBlockEditor.prototype.updateWidth = function () {
     var newWidth = '0%';
     this.resized();
 }
 
-BlockMirrorBlockEditor.prototype.resized = function(e) {
+BlockMirrorBlockEditor.prototype.resized = function (e) {
     // Compute the absolute coordinates and dimensions of blocklyArea.
     var blockArea = this.blockMirror.tags.blockArea;
     var current = blockArea;
@@ -56,39 +67,33 @@ BlockMirrorBlockEditor.prototype.resized = function(e) {
     Blockly.svgResize(this.workspace);
 }
 
-BlockMirrorBlockEditor.prototype.makeToolbox = function() {
+BlockMirrorBlockEditor.prototype.makeToolbox = function () {
     var xml = '<xml id="toolbox" style="display: none">';
     xml += '<category name="Variables" custom="VARIABLE" colour="240">' +
-           '</category>';
+        '</category>';
     xml += '<category name="Iteration" colour="300">' +
-           '<block type="ast_For"></block>' +
-           '<block type="ast_ForElse"></block>' +
-           '</category>';
+        '<block type="ast_For"></block>' +
+        '<block type="ast_ForElse"></block>' +
+        '</category>';
     xml += '<category name="Values" colour="300">' +
-           '<block type="ast_Num"></block>' +
-           '</category>';
+        '<block type="ast_Num"></block>' +
+        '</category>';
     //xml += '<category name="Values" colour="300"><button value="From Code">From Code</button></category>';
     xml += '</xml>';
     return xml;
 };
 
-BlockMirrorBlockEditor.prototype.remakeToolbox = function() {
+BlockMirrorBlockEditor.prototype.remakeToolbox = function () {
     this.workspace.updateToolbox(this.makeToolbox());
     this.resized();
 };
 
-BlockMirrorBlockEditor.prototype.changed = function() {
-    // todo
-    this.blockMirror.textEditor.setCode('__main__', this.getText());
-    //console.log("Changed block");
-};
-
 /**
  * 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() {
+BlockMirrorBlockEditor.prototype.getToolbarWidth = function () {
     if (this.blockMirror.configuration.readOnly) {
         return 0;
     } else {
@@ -111,12 +116,13 @@ BlockMirrorBlockEditor.prototype.VIEW_CONFIGURATIONS = {
     }
 }
 
-BlockMirrorBlockEditor.prototype.setMode = function(mode) {
+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%';
@@ -124,25 +130,63 @@ BlockMirrorBlockEditor.prototype.setMode = function(mode) {
     } 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);
+    }
+};
 
 /**
- * Attempts to update the model for the current code file from the 
+ * 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.getText = function() {
+BlockMirrorBlockEditor.prototype.getCode = function () {
     return Blockly.Python.workspaceToCode(this.workspace);
-}
+};
 
 /**
- * Attempts to update the model for the current code file from the 
+ * 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.setText = function(code) {
-    var result = this.blockMirror.textToBlocks.convertSource('__main__.py', code);
-    var xml_code = Blockly.Xml.textToDom(result.xml);
-    this.workspace.clear();
-    Blockly.Xml.domToWorkspace(xml_code, this.workspace);
+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;
+    } 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;
+    }
+};
+
+BlockMirrorBlockEditor.prototype.isVisible = function () {
+    return this.blockMirror.VISIBLE_MODES.block.indexOf(this.blockMirror.mode_) !== -1;
+};
\ No newline at end of file
diff --git a/src/block_mirror.js b/src/block_mirror.js
index 075c917..28cd862 100644
--- a/src/block_mirror.js
+++ b/src/block_mirror.js
@@ -1,34 +1,30 @@
 /**
 
-External visible stuff
-
-Changing mode/code/filename can fail on the block side
-
-setMode(mode) -> bool
-setFilename(filename) -> bool
-setCode(filename, code) -> bool
-setHighlight(line) -> bool
-setReadOnly(isReadOnly)
-setToolbox(string)
-    'basic'
-    'advanced'
-    'complete'
-    list[list[string]]
-onChange(event) ->
-    onModeChange
-    onFilenameChange
-    onCodeChange
-    
-getCode(filename) -> string
-getCode() -> string
-getFilename() -> string
-getMode() -> string
-getImage(callback)
-
-lastBlockConversionFailure: {} or null
-
-
-*/
+ External visible stuff
+
+ Changing mode/code can fail on the block side
+
+ setMode(mode) -> bool
+ setCode(filename, code) -> bool
+ setHighlight(line) -> bool
+ setReadOnly(isReadOnly)
+ setToolbox(string)
+ 'basic'
+ 'advanced'
+ 'complete'
+ list[list[string]]
+ onChange(event) ->
+ onModeChange
+ onCodeChange
+
+ getCode() -> string
+ getMode() -> string
+ getImage(callback)
+
+ lastBlockConversionFailure: {} or null
+
+
+ */
 
 /**
  *
@@ -39,47 +35,54 @@ function BlockMirror(configuration) {
     this.textEditor = new BlockMirrorTextEditor(this);
     this.blockEditor = new BlockMirrorBlockEditor(this);
     this.textToBlocks = new BlockMirrorTextToBlocks(this);
-    
-    Sk.configure({});
-    
+
+    if (!this.configuration.skipSkulpt) {
+        this.loadSkulpt();
+    }
+
     this.setMode(this.configuration.viewMode);
-}
+};
 
-BlockMirror.prototype.validateConfiguration = function(configuration) {
+BlockMirror.prototype.validateConfiguration = function (configuration) {
     this.configuration = {};
-    
+
     // Container
     if ('container' in configuration) {
         this.configuration.container = configuration.container;
     } else {
         throw new Error('Invalid configuration: Missing "container" property.')
     }
-    
+
     // 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!');};
+        this.configuration.run = function () {
+            console.log('Ran!');
+        };
     }
-    
+
     // readOnly
     this.configuration['readOnly'] = configuration['readOnly'] || false;
-    
+
     // height
     this.configuration.height = configuration.height || '500px';
-    
+
     // viewMode
     this.configuration.viewMode = configuration.viewMode || 'split';
+
+    // Need to load skulpt?
+    this.configuration.skipSkulpt = configuration.skipSkulpt || false;
 }
 
-BlockMirror.prototype.initializeVariables = function() {
+BlockMirror.prototype.initializeVariables = function () {
     this.tags = {
         'toolbar': document.createElement('div'),
         'blockContainer': document.createElement('div'),
@@ -99,14 +102,15 @@ BlockMirror.prototype.initializeVariables = function() {
     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.files = [];
-    
+    this.code_ = "";
+    this.mode_ = null;
+
     // Update Flags
     this.silenceBlock = false;
     this.silenceBlockTimer = null;
@@ -116,39 +120,69 @@ BlockMirror.prototype.initializeVariables = function() {
     this.blocksFailedTimeout = null;
     this.triggerOnChange = null;
     this.firstEdit = true;
-    
+
     // Toolbox width
     this.blocklyToolboxWidth = 0;
-    
+
     // Listeners
     this.listeners_ = [];
 }
 
-BlockMirror.prototype.addChangeListener = function(callback) {
+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];
+        }
+    });
+};
+
+BlockMirror.prototype.addChangeListener = function (callback) {
     this.listeners_.push(callback);
-}
+};
 
-BlockMirror.prototype.fireChangeListener = function(event) {
-    for (var i = 0, func; func = this.listeners_[i]; i++) {
+BlockMirror.prototype.fireChangeListener = function (event) {
+    for (let i = 0, func; func = this.listeners_[i]; i++) {
         func(event);
     }
 };
 
-BlockMirror.prototype.setCode = function(filename, code, event) {
-    this.fireChangeListener(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});
 };
 
-BlockMirror.prototype.setMode = function(mode) {
-    this.blockEditor.setMode(mode);
-    this.textEditor.setMode(mode);
+BlockMirror.prototype.getCode = function () {
+    return this.code_;
 };
 
-BlockMirror.prototype.setFilename = function(filename) {
+BlockMirror.prototype.getMode = function () {
+    return this.mode_;
 };
 
-BlockMirror.prototype.setReadOnly = function(isReadOnly) {
+BlockMirror.prototype.setMode = function (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);
 };
 
+BlockMirror.prototype.VISIBLE_MODES = {
+    'block': ['block', 'split'],
+    'text': ['text', 'split']
+};
+
+
diff --git a/src/blockly_shims.js b/src/blockly_shims.js
index 77461e3..18d2ec8 100644
--- a/src/blockly_shims.js
+++ b/src/blockly_shims.js
@@ -100,8 +100,7 @@ Blockly.Variables.flyoutCategoryBlocks = function (workspace) {
     if (variableModelList.length > 0) {
         // New variables are added to the end of the variableModelList.
         var mostRecentVariableFieldXmlString =
-            Blockly.Variables.generateVariableFieldXmlString(
-                variableModelList[variableModelList.length - 1]);
+                variableModelList[variableModelList.length - 1];
         if (Blockly.Blocks['ast_Assign']) {
             var gap = Blockly.Blocks['ast_AugAssign'] ? 8 : 24;
             var blockText = '<xml>' +
@@ -122,7 +121,7 @@ Blockly.Variables.flyoutCategoryBlocks = function (workspace) {
                 '<field name="NUM">1</field>' +
                 '</shadow>' +
                 '</value>' +
-                '<mutation allOptions="false" simpleTarget="true"></mutation>' +
+                '<mutation options="false" simple="true"></mutation>' +
                 '</block>' +
                 '</xml>';
             var block = Blockly.Xml.textToDom(blockText).firstChild;
@@ -132,12 +131,10 @@ Blockly.Variables.flyoutCategoryBlocks = function (workspace) {
         if (Blockly.Blocks['ast_Name']) {
             variableModelList.sort(Blockly.VariableModel.compareByName);
             for (var i = 0, variable; variable = variableModelList[i]; i++) {
-                var blockText = '<xml>' +
-                    '<block type="ast_Name" gap="8">' +
-                    Blockly.Variables.generateVariableFieldXmlString(variable) +
-                    '</block>' +
-                    '</xml>';
-                var block = Blockly.Xml.textToDom(blockText).firstChild;
+                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);
             }
         }
diff --git a/src/main.js b/src/main.js
new file mode 100644
index 0000000..67186fa
--- /dev/null
+++ b/src/main.js
@@ -0,0 +1,95 @@
+// CSS
+// <link rel="stylesheet" href="../lib/codemirror/codemirror.css">
+
+// TODO: check skulpt files to see how they do these imports
+
+//BlockMirrorTextEditor = require('./text_editor.js');
+
+//BlockMirror = require('./block_mirror.js');
+
+//module.exports = BlockMirror.BlockMirror;
+
+/*
+
+// Blockly
+require('../../blockly/blockly_compressed.js');
+require('../../blockly/blocks_compressed.js');
+require('../../blockly/msg/js/en.js');
+require('../../blockly/python_compressed.js');
+
+// CodeMirror
+require('../lib/codemirror/codemirror.js');
+
+
+
+require('./text_editor.js');
+require('./block_editor.js');
+require('./blockly_shims.js');
+require('./text_to_blocks.js');
+
+require('./block_mirror.js');
+
+require('./text_to_blocks.js');
+
+    <!-- CodeMirror -->
+
+    <script src="" type="text/javascript"></script>
+    <script src="../lib/codemirror/python.js" type="text/javascript"></script>
+
+    <!-- Skulpt -->
+    <script src="../../skulpt/dist/skulpt.js" type="text/javascript"></script>
+    <script src="../../skulpt/dist/skulpt-stdlib.js" type="text/javascript"></script>
+
+    <!-- BlockMirror -->
+    <link rel="stylesheet" href="../src/block_mirror.css">
+    <script src="../src/blockly_shims.js" type="text/javascript"></script>
+    <script src="../src/block_mirror.js" type="text/javascript"></script>
+    <script src="../src/text_editor.js" type="text/javascript"></script>
+    <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/ast/ast_For.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_If.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_While.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Num.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_BinOp.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Name.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Assign.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_AnnAssign.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_AugAssign.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Str.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Expr.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_UnaryOp.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_BoolOp.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Compare.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Assert.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_NameConstant.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_List.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Tuple.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Set.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Dict.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Starred.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_IfExp.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Attribute.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Call.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Raise.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Delete.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Subscript.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Comp.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_FunctionDef.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Lambda.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Return.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Yield.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_YieldFrom.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Global.js" type="text/javascript"></script>
+    <!--<script src="../src/ast/ast_Nonlocal.js" type="text/javascript"></script>-->
+    <script src="../src/ast/ast_Break.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Continue.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Try.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_ClassDef.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Import.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_With.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Comment.js" type="text/javascript"></script>
+
+ */
\ No newline at end of file
diff --git a/src/text_editor.js b/src/text_editor.js
index 081109c..33cbcb1 100644
--- a/src/text_editor.js
+++ b/src/text_editor.js
@@ -3,6 +3,12 @@ function BlockMirrorTextEditor(blockMirror) {
     this.textContainer = blockMirror.tags.textContainer;
     this.textArea = blockMirror.tags.textArea;
     this.textSidebar = blockMirror.tags.textSidebar;
+
+    // notification
+    this.silentEvents_ = false;
+
+    // Do we need to force an update?
+    this.outOfDate_ = null;
     
     let codeMirrorOptions = {
         mode: {
@@ -36,17 +42,13 @@ function BlockMirrorTextEditor(blockMirror) {
     this.textSidebar.style.height = '100%';
     this.textSidebar.style.float = 'left';
     this.textSidebar.style.backgroundColor = '#ddd';
+
 }
 
 BlockMirrorTextEditor.prototype.defocus = function() {
     this.codeMirror.display.input.blur();
 }
 
-BlockMirrorTextEditor.prototype.changed = function() {
-    // TODO
-    //console.log("Changed text");
-}
-
 BlockMirrorTextEditor.prototype.updateWidth = function() {
     var newWidth = '0%';
     /*if (this.blockMirror.views.includes('text')) {
@@ -57,7 +59,7 @@ BlockMirrorTextEditor.prototype.updateWidth = function() {
 
 BlockMirrorTextEditor.prototype.setReadOnly = function(isReadOnly) {
     this.codeMirror.setOption('readOnly', isReadOnly);
-}
+};
 
 BlockMirrorTextEditor.prototype.VIEW_CONFIGURATIONS = {
     'split': {
@@ -75,11 +77,16 @@ BlockMirrorTextEditor.prototype.VIEW_CONFIGURATIONS = {
         '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;
@@ -105,14 +112,34 @@ BlockMirrorTextEditor.prototype.setMode = function(mode) {
     }
 }
 
-BlockMirrorTextEditor.prototype.setCode = function(filename, code) {
-    if (code == undefined || code.trim() == "") {
-        this.codeMirror.setValue("\n");
-    } else {
+BlockMirrorTextEditor.prototype.setCode = function(code, quietly) {
+    this.silentEvents_ = quietly;
+
+    // Defaults to a single blank line
+    code = (code === undefined || code.trim() === "") ? "\n": code;
+
+    if (this.isVisible()) {
         this.codeMirror.setValue(code);
+        this.outOfDate_ = null;
+    } else {
+        this.outOfDate_ = code;
     }
 };
 
 BlockMirrorTextEditor.prototype.getCode = function() {
     return this.codeMirror.getValue();
-}
\ No newline at end of file
+};
+
+BlockMirrorTextEditor.prototype.changed = function(codeMirror, event) {
+    if (!this.silentEvents_) {
+        let newCode = this.getCode();
+        this.blockMirror.blockEditor.setCode(newCode, true);
+        this.blockMirror.code_ = newCode;
+    }
+    this.silentEvents_ = false;
+    //console.log("Changed text");
+};
+
+BlockMirrorTextEditor.prototype.isVisible = function() {
+    return this.blockMirror.VISIBLE_MODES.text.indexOf(this.blockMirror.mode_) !== -1;
+};
\ No newline at end of file
diff --git a/src/text_to_blocks.js b/src/text_to_blocks.js
index 301a37b..50995e3 100644
--- a/src/text_to_blocks.js
+++ b/src/text_to_blocks.js
@@ -1,6 +1,6 @@
 function BlockMirrorTextToBlocks(blockMirror) {
     this.blockMirror = blockMirror;
-    this.strictAnnotations = false;
+    this.strictAnnotations = ['int', 'float', 'str', 'bool'];
     Blockly.defineBlocksWithJsonArray(BlockMirrorTextToBlocks.BLOCKS);
 }
 
@@ -26,20 +26,32 @@ BlockMirrorTextToBlocks.prototype.convertSourceToCodeBlock = function (python_so
  */
 BlockMirrorTextToBlocks.prototype.convertSource = function (filename, python_source) {
     var xml = document.createElement("xml");
-    if (python_source.trim() === "") {
-        return {"xml": BlockMirrorTextToBlocks.xmlToString(xml), "error": null};
-    }
-    this.source = python_source.split("\n");
     // Attempt parsing - might fail!
-    var parse, ast, symbol_table, error;
-    try {
-        parse = Sk.parse(filename, python_source);
-        ast = Sk.astFromParse(parse.cst, filename, parse.flags);
-    } catch (e) {
-        error = e;
-        console.error(error);
-        xml.appendChild(BlockMirrorTextToBlocks.raw_block(python_source))
-        return {"xml": BlockMirrorTextToBlocks.xmlToString(xml), "error": error};
+    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};
+            }
+        }
     }
     this.comments = {};
     for (var commentLocation in parse.comments) {
@@ -57,6 +69,9 @@ BlockMirrorTextToBlocks.prototype.convertSource = function (filename, python_sou
             xml.appendChild(converted[block]);
         }
     }
+    if (badChunks.length) {
+        xml.appendChild(BlockMirrorTextToBlocks.raw_block(badChunks.join("\n")));
+    }
     return {
         "xml": BlockMirrorTextToBlocks.xmlToString(xml), "error": null,
         "lineMap": this.lineMap, 'comments': this.comments
@@ -118,12 +133,13 @@ BlockMirrorTextToBlocks.prototype.getSourceCode = function (frm, to) {
     return lines.join("\n");
 }
 
-BlockMirrorTextToBlocks.prototype.convertBody = function (node, is_top_level) {
+BlockMirrorTextToBlocks.prototype.convertBody = function (node, parent) {
     this.levelIndex += 1;
+    let is_top_level = this.isTopLevel(parent);
     // Empty body, return nothing
-    if (node.length == 0) {
+    /*if (node.length === 0) {
         return null;
-    }
+    }*/
 
     // Final result list
     var children = [], // The complete set of peers
@@ -187,7 +203,7 @@ BlockMirrorTextToBlocks.prototype.convertBody = function (node, is_top_level) {
         commentCount = 0;
         for (var commentLineInProgram in this.comments) {
             if (commentLineInProgram < lineNumberInProgram) {
-                commentChild = this.Comment(this.comments[commentLineInProgram], commentLineInProgram);
+                commentChild = this.ast_Comment(this.comments[commentLineInProgram], commentLineInProgram);
                 if (previousLineInProgram == null) {
                     nestChild(commentChild);
                 } else {
@@ -212,7 +228,7 @@ BlockMirrorTextToBlocks.prototype.convertBody = function (node, is_top_level) {
         // Now convert the actual node
         var height = this.heights.shift();
         var originalSourceCode = this.getSourceCode(lineNumberInProgram, height);
-        var newChild = this.convertStatement(node[i], originalSourceCode, is_top_level);
+        var newChild = this.convertStatement(node[i], originalSourceCode, parent);
 
         // Skip null blocks (e.g., imports)
         if (newChild == null) {
@@ -243,9 +259,9 @@ BlockMirrorTextToBlocks.prototype.convertBody = function (node, is_top_level) {
 
 
     // Handle comments that are on the very last line
-    var lastLineNumber = lineNumberInProgram + 1
+    var lastLineNumber = lineNumberInProgram + 1;
     if (lastLineNumber in this.comments) {
-        commentChild = this.Comment(this.comments[lastLineNumber], lastLineNumber);
+        commentChild = this.ast_Comment(this.comments[lastLineNumber], lastLineNumber);
         nestChild(commentChild);
         delete this.comments[lastLineNumber];
     }
@@ -253,7 +269,7 @@ BlockMirrorTextToBlocks.prototype.convertBody = function (node, is_top_level) {
     // Handle any extra comments that stuck around
     if (is_top_level) {
         for (var commentLineInProgram in this.comments) {
-            commentChild = this.Comment(this.comments[commentLineInProgram], commentLineInProgram);
+            commentChild = this.ast_Comment(this.comments[commentLineInProgram], commentLineInProgram);
             distance = commentLineInProgram - previousLineInProgram;
             if (previousLineInProgram == null) {
                 addPeer(commentChild);
@@ -273,15 +289,23 @@ BlockMirrorTextToBlocks.prototype.convertBody = function (node, is_top_level) {
     this.levelIndex -= 1;
 
     return children;
-}
+};
 
-BlockMirrorTextToBlocks.prototype.convert = function (node, is_top_level) {
+BlockMirrorTextToBlocks.prototype.TOP_LEVEL_NODES = ['Module', 'Expression', 'Interactive', 'Suite'];
+
+BlockMirrorTextToBlocks.prototype.isTopLevel = function (parent) {
+
+    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);
+        throw new Error("Could not find function: " + functionName);
     }
-    return this[functionName](node, is_top_level);
-}
+    node._parent = parent;
+    return this[functionName](node, parent);
+};
 
 function arrayMax(array) {
     return array.reduce(function (a, b) {
@@ -295,9 +319,9 @@ function arrayMin(array) {
     });
 }
 
-BlockMirrorTextToBlocks.prototype.convertStatement = function (node, full_source, is_top_level) {
+BlockMirrorTextToBlocks.prototype.convertStatement = function (node, full_source, parent) {
     try {
-        return this.convert(node, is_top_level);
+        return this.convert(node, parent);
     } catch (e) {
         heights = this.getChunkHeights(node);
         extractedSource = this.getSourceCode(arrayMin(heights), arrayMax(heights));
@@ -405,17 +429,17 @@ BlockMirrorTextToBlocks.create_block = function (type, lineNumber, fields, value
 
 BlockMirrorTextToBlocks.raw_block = function (txt) {
     // TODO: lineno as second parameter!
-    return BlockMirrorTextToBlocks.create_block("raw_block", 0, {"TEXT": txt});
-}
+    return BlockMirrorTextToBlocks.create_block("ast_Raw", 0, {"TEXT": txt});
+};
 
 BlockMirrorTextToBlocks.BLOCKS = [];
 
 BlockMirrorTextToBlocks.prototype['ast_Module'] = function (node) {
-    return this.convertBody(node.body, true);
+    return this.convertBody(node.body, node);
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Interactive'] = function (node) {
-    return this.convertBody(node.body);
+    return this.convertBody(node.body, node);
 };
 
 BlockMirrorTextToBlocks.prototype['ast_Expression'] = BlockMirrorTextToBlocks.prototype['ast_Interactive'];
@@ -426,40 +450,37 @@ BlockMirrorTextToBlocks.prototype['ast_Pass'] = function () {
 };
 
 
-BlockMirrorTextToBlocks.prototype.convertElements = function (key, values) {
+BlockMirrorTextToBlocks.prototype.convertElements = function (key, values, parent) {
     var output = {};
     for (var i = 0; i < values.length; i++) {
-        output[key + i] = this.convert(values[i]);
+        output[key + i] = this.convert(values[i], parent);
     }
     return output;
 };
 
-BlockMirrorTextToBlocks.prototype.FUNCTION_SIGNATURES = {
-    'abs': {
-        'returns': true,
-        'full': ['x']
-    },
-    'setattr': {
-        'returns': false,
-        'full': ['object', 'name', 'value']
-    },
-    'sorted': {
-        'full': ['iterable', '*', '**key', '**reverse'],
-        'simple': ['iterable'],
-        'returns': true,
-    }
-};
+Blockly.Python['blank'] = '___';
 
-BlockMirrorTextToBlocks.prototype.METHOD_SIGNATURES = {
-    'append': {
-        'returns': false,
-        'full': ['x']
-    },
-    'replace': {
-        'returns': true,
-        'full': ['old', 'new', 'count'],
-        'simple': ['old', 'new']
-    }
+BlockMirrorTextToBlocks.prototype.LOCKED_BLOCK = {
+    "inline": "true",
+    'deletable': "false",
+    "movable": "false"
 };
 
-Blockly.Python['blank'] = '___';
+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
+}
\ No newline at end of file
diff --git a/test/simple.html b/test/simple.html
index 06d117e..2ef7626 100644
--- a/test/simple.html
+++ b/test/simple.html
@@ -1,19 +1,185 @@
 <!DOCTYPE html>
 <html>
-  <head>
+<head>
     <meta charset="utf-8">
     <title>Simple BlockMirror Example</title>
-    <script src="../dist/blockmirror.js" type="text/javascript"></script>
-  </head>
-  <body>
-    <div id="blockmirror-editor">
+    <script src="../dist/block_mirror.js" type="text/javascript"></script>
+</head>
+<body>
+<div id="blockmirror-editor">
 
-    </div>
     <script type="text/javascript">
         var editor = new BlockMirror({
             'container': document.getElementById('blockmirror-editor'),
-            
+            //'height': '2000px'
         });
+        editor.addChangeListener(function (event) {
+            console.log('Change! Better save:', event)
+        });
+        editor.setCode('a = 0\nb=0\nprint(b)');
+
+        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];
+            }
+        });
+
+        $('#go').click(function () {
+            alert('Starting!')
+            var filename = 'main';
+            var code = `import pedal`;
+            //console.time('Run');
+            Sk.importMainWithBody(filename, false, code, true).$d;
+            //console.timeEnd('Run');
+            alert('Done!')
+        });
+
+        var TESTS = [
+            'for ___ in ___:\n    pass',
+            '0',
+            '0\n0\n0\n0\n',
+            'for ___ in ___:\n    0\n    0',
+            'for x in y:\n    pass',
+            '1 + 1',
+            '(1 * 3 + 4) + 6 & 8',
+            '(1 + 2) - (3 * 4) / 5 | 7 & (8 % 9 << 10) >> 11 // 12',
+            'not 4',
+            '+1\n-2\n~4\nnot 5\nnot not not 4',
+            '1 or 2',
+            '1 and 2 and 3 or 4 and 5 or 3 or 4',
+            '1 < 5',
+            '(2 < 3) < 4',
+            '(((4 > 3) < 2) > 2) < 2',
+            '5 is 4',
+            '___ in ___',
+            '3 is not 4',
+            '(1 is 2) is 3',
+            '(((((((1 == 2) != 3) <= 4) >= 5) in 3) not in 3) is 4) is not 5',
+            '1 < 2 and 3 < 4',
+            'assert (1 < 2)',
+            'assert (1 > 4), ___',
+            '"Hello \'world.\'"',
+            "'Hello \"there.\"'",
+            'alpha\nbeta\ngamma',
+            'alpha\nalpha\nalpha',
+            'True\nFalse\nNone',
+            '[]\n[1, 2, 3]\n[1, 2, 4, 5]\n()\n(1, 2, 3)\n(1, 2)\n(1, )\n(1, 2, 3, 4, 5)',
+            '{1, 2, 3}\n{1}\n{4, 5, 6, 7}',
+            "{1: 2, 'Hello': 'World'}\n{}",
+            '{*{}}',
+            "0 if True else False",
+            "dog.growl\nalpha.beta.gamma\n'Test'.save",
+            'alpha\nalpha(1)\nbeta(2)\nbeta',
+            'alpha(beta)\nalpha.beta(gamma)\nhello(1, 2, 3)\nfor a in b:\n    (corgi(run))',
+            'sorted([1, 2, 3], reverse=True)',
+            'complex(1, 2, *first, *second, **big, **dog, third=3, fourth=4)',
+            "raise\nraise Exception()\nraise Exception() from wherever",
+            "del alpha\ndel alpha, beta, gamma",
+            "simple[0]\nranged[1:2]\nranged[:2]\nranged[1:]\nranged[:]",
+            "ranged[::3]\nranged[1::3]\nranged[:2:3]\nranged[1:2:3]",
+            // acbart: This ends up the same as [:], so can't test it.
+            // "r[::]"
+            "df[1:2, 4]\ndf[1, 2, 3, 4]\ndf[6::7, 4:6, 5, 1:]",
+            "[x for a in b if c]\n[x for a in b for c in d if e if g]",
+            "{x for a in b if c}\n{x for a in b for c in d if e if g}",
+            "(x for a in b if c)\n(x for a in b for c in d if e if g)",
+            "{x: y for a in b if c}\n{x: y for a in b for c in d if e if g}",
+            "a = 0\na = b = c = 0",
+            "(a, b) = (1, 2)\n[x, (y, z)] = something",
+            "i: int = 0\ns: str = 'Hello'\nf: float = 4.3\nb: bool = True\nx: Z = 4",
+            "i: 'int' = 0\ns: 'str' = 'Hello'\nf: 'float' = 4.3\nb: 'bool' = True",
+            "n: None = None\na[0]: List[int] = 0\nb: Dict[str, str]",
+            'a += 1\nb *= 4\nc **= 4\nd ^= 10',
+            `def alpha(beta, gamma, delta):\n    pass`,
+            `def alpha(beta: str, gamma=True, delta: int=0):\n    pass`,
+            `@route\n@open('test')\ndef alpha(beta: str, gamma=True, delta: int=0):\n    pass`,
+            `@route\n@open('test')\ndef alpha(beta: str, gamma=True, delta: int=0, *args, k=4, num: int=3, **kwargs):\n    a = 0\n    b = 7`,
+            "def do_something(a: int) -> str:\n    assert (4 == 3)",
+            'lambda x, y=0: x + y',
+            '(lambda : None)()',
+            "def simple(a, b, c) -> int:\n    return 'Hello world!'\n    return",
+            "def simple(a, b, c) -> int:\n    (yield 'Hello world!')\n    (yield)\n    dog = yield b + 4",
+            "def simple(a, b, c) -> int:\n    (yield from 'Hello world!')\n    dog = yield from b + 4",
+            "def simple(a, b, c) -> int:\n    global alpha\ndef another(e, f):\n    global alpha, beta, gamma",
+            //"def simple(a, b, c) -> int:\n    def inner():\n        nonlocal alpha\n        nonlocal alpha, beta, gamma",
+            "for x in y:\n    break\n    continue",
+            ("try:\n    pass\nexcept NameError:\n    pass" +
+                "\nexcept Something() as other:\n    pass\n" +
+                "except None as some:\n    pass\nexcept:\n    " +
+                "pass\nelse:\n    pass\nfinally:\n    pass"),
+            "try:\n    a = 0\nexcept:\n    return",
+            "@whatever\nclass a(b, *d, c=0, **e):\n    a = 0\nclass Dog:\n    age = 1\n    name = 'Ada'",
+            "if x:\n    pass\nif y:\n    pass\nelse:\n    pass",
+            "if a:\n    if j:\n        pass\n    elif k:\n        pass\n    else:\n        pass\nelif b:\n    pass",
+            "while x == 0:\n    pass\nwhile y < z:\n    a = 0\nelse:\n    b = a",
+            "import x as y, b as c, d\nimport os",
+            "from . import x\nfrom .os import y\nfrom ..path import z\nfrom dog.house import a\nfrom cat import b, c as d, e",
+            "import matplotlib.pyplot as plt",
+            "with open('filename') as outfile:\n    pass",
+            "with open('filename') as outfile, open('file2') as infile, other_context:\n    pass",
+            "#hello world!\n# Another comment\n#: int\n\na",
+            "#TODO: We need to work harder on this!",
+            "a = 0\nprint(a)\nfor x in y:\n    print(b)\n    (max(a, b))"
+        ];
+
+        function runTests() {
+            for (var i = 0; i < TESTS.length; i += 1) {
+                var test = TESTS[i];
+                editor.textEditor.setCode(test, true);
+                editor.blockEditor.setCode(editor.textEditor.getCode(), false);
+                editor.blockEditor.workspace.cleanUp();
+                console.assert(test.trim() === editor.textEditor.getCode().trim(),
+                    "\nExpected:\n" + test.trim() + "\n",
+                    "\nActual:\n" + editor.textEditor.getCode().trim() + "\n");
+                if (test.trim() !== editor.textEditor.getCode().trim()) {
+                    break;
+                }
+                editor.blockEditor.setCode(editor.textEditor.getCode(), false);
+                console.assert(test.trim() === editor.textEditor.getCode().trim(),
+                    "\nExpected:\n" + test.trim() + "\n",
+                    "\nActual:\n" + editor.textEditor.getCode().trim() + "\n(second trip)");
+                if (test.trim() !== editor.textEditor.getCode().trim()) {
+                    break;
+                }
+            }
+        }
+
+        function tryGrindleHook() {
+            editor.textEditor.setCode('grindlehook.py', `def calculate_rating(name):
+    '''
+    Returns the customer's credit rating, according to the bank's current
+    status, the customer, and the alignment of the stars. This function
+    is delicate, and will break after being called once.
+
+    Notes:
+        (ghook@1/15/2018): DO NOT TOUCH THIS, I FINALLY GOT IT WORKING.
+
+    Args:
+        name (str): A string representing the user's full name.
+    Returns:
+        int: An integer (0-9) representing the customer's credit rating.
+    '''
+    c=calculate_rating;setattr(c,'r',lambda:setattr(c,'o',True))
+    j={};y=j['CELESTIAL_NAVIGATION_CONSTANT']=10
+    j[True]='CELESTIAL_NAVIGATION_CONSTANT'
+    x=str(''[:].swapcase);y=y+11,y+9,y+-2,y+-2,y+4,y+-5,y+-1,y+11,y+9,\\
+    y+-6,y+-6,y+-1,y+-5,y+3,y+-7,y+7,y+-1,y+-5,y+8,y+-7,y+11,y+1
+    z=lambda x,t,o=0:''.join(map(lambda j:x.__getitem__(j+o), t))
+    if hasattr(c,'o')and not getattr(c, 'o'): return z(x,y)
+    c.o=False;j['CELESTIAL_NAVIGATION_CONSTANT'].bit_length
+    d=(lambda:(lambda:None))()();g=globals()
+    while d:g['X567S-lumos-17-KLAUS']=((d)if(lambda:None)else(j))
+    p=lambda p:sum(map(int, list(str(p))))
+    MGC=p(sum(map(lambda v: v[0]*8+ord(v[1]), enumerate(name))))
+    while MGC>10:MGC=p(MGC)
+    if c:return MGC`);
+        };
+
     </script>
-  </body>
+</body>
 </html>
\ No newline at end of file
diff --git a/test/simple_dev.html b/test/simple_dev.html
index 7fecde0..a475417 100644
--- a/test/simple_dev.html
+++ b/test/simple_dev.html
@@ -4,6 +4,8 @@
     <meta charset="utf-8">
     <title>Simple BlockMirror Example</title>
 
+    <script>module = {}</script>
+
     <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"
             integrity="sha256-pasqAKBDmFT4eHoN2ndd6lN370kFiGUFyTiUHWhU7k8="
             crossorigin="anonymous"></script>
@@ -30,6 +32,7 @@
     <script src="../src/text_editor.js" type="text/javascript"></script>
     <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/ast/ast_For.js" type="text/javascript"></script>
     <script src="../src/ast/ast_If.js" type="text/javascript"></script>
@@ -72,6 +75,8 @@
     <script src="../src/ast/ast_ClassDef.js" type="text/javascript"></script>
     <script src="../src/ast/ast_Import.js" type="text/javascript"></script>
     <script src="../src/ast/ast_With.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Comment.js" type="text/javascript"></script>
+    <script src="../src/ast/ast_Raw.js" type="text/javascript"></script>
 
 </head>
 <body>
@@ -99,11 +104,12 @@
 <script type="text/javascript">
     var editor = new BlockMirror({
         'container': document.getElementById('blockmirror-editor'),
+        //'height': '2000px'
     });
-    editor.setCode('__main__', 'a = 0\nb=0\nprint(b)');
     editor.addChangeListener(function (event) {
         console.log('Change! Better save:', event)
     });
+    editor.setCode('a = 0');
 
     Sk.configure({
         __future__: Sk.python3,
@@ -117,13 +123,14 @@
     });
 
     $('#go').click(function () {
-        alert('Starting!')
+        /*alert('Starting!')
         var filename = 'main';
         var code = `import pedal`;
         //console.time('Run');
         Sk.importMainWithBody(filename, false, code, true).$d;
         //console.timeEnd('Run');
-        alert('Done!')
+        alert('Done!')*/
+        runTests();
     });
 
     var TESTS = [
@@ -178,7 +185,7 @@
         "{x: y for a in b if c}\n{x: y for a in b for c in d if e if g}",
         "a = 0\na = b = c = 0",
         "(a, b) = (1, 2)\n[x, (y, z)] = something",
-        "i: int = 0\ns: str = 'Hello'\nf: float = 4.3\nb: bool = True\nx: X = 4",
+        "i: int = 0\ns: str = 'Hello'\nf: float = 4.3\nb: bool = True\nx: Z = 4",
         "i: 'int' = 0\ns: 'str' = 'Hello'\nf: 'float' = 4.3\nb: 'bool' = True",
         "n: None = None\na[0]: List[int] = 0\nb: Dict[str, str]",
         'a += 1\nb *= 4\nc **= 4\nd ^= 10',
@@ -188,6 +195,7 @@
         `@route\n@open('test')\ndef alpha(beta: str, gamma=True, delta: int=0, *args, k=4, num: int=3, **kwargs):\n    a = 0\n    b = 7`,
         "def do_something(a: int) -> str:\n    assert (4 == 3)",
         'lambda x, y=0: x + y',
+        '(lambda : None)()',
         "def simple(a, b, c) -> int:\n    return 'Hello world!'\n    return",
         "def simple(a, b, c) -> int:\n    (yield 'Hello world!')\n    (yield)\n    dog = yield b + 4",
         "def simple(a, b, c) -> int:\n    (yield from 'Hello world!')\n    dog = yield from b + 4",
@@ -208,30 +216,70 @@
         "import matplotlib.pyplot as plt",
         "with open('filename') as outfile:\n    pass",
         "with open('filename') as outfile, open('file2') as infile, other_context:\n    pass",
+        "#hello world!\n# Another comment\n#: int\n\na",
+        "#TODO: We need to work harder on this!",
+        "a = 0\nprint(a)\nfor x in y:\n    print(b)\n    (max(a, b))",
+        "with x():\n    pass",
+        "(lambda x: x)()",
+        "class Alpha:\n    def beta():\n        '''\n        Hello World!\n        Testing.\n        '''",
+        "'test'.replace(1, 2, 3)"
     ];
 
-    for (var i = 0; i < TESTS.length; i += 1) {
-        var test = TESTS[i];
-        editor.textEditor.setCode('__main__.py', test);
-        editor.blockEditor.setText(editor.textEditor.getCode())
-        editor.blockEditor.changed();
-        editor.blockEditor.workspace.cleanUp();
-        console.assert(test.trim() === editor.textEditor.getCode().trim(),
-            "\nExpected:\n" + test.trim() + "\n",
-            "\nActual:\n" + editor.textEditor.getCode().trim() + "\n");
-        if (test.trim() !== editor.textEditor.getCode().trim()) {
-            break;
-        }
-        editor.blockEditor.setText(editor.textEditor.getCode())
-        editor.blockEditor.changed();
-        editor.blockEditor.workspace.cleanUp();
-        console.assert(test.trim() === editor.textEditor.getCode().trim(),
-            "\nExpected:\n" + test.trim() + "\n",
-            "\nActual:\n" + editor.textEditor.getCode().trim() + "\n(second trip)");
-        if (test.trim() !== editor.textEditor.getCode().trim()) {
-            break;
+    function runTests() {
+        for (let i = 0; i < TESTS.length; i += 1) {
+            let test = TESTS[i];
+            editor.textEditor.setCode(test, true);
+            editor.blockEditor.setCode(editor.textEditor.getCode(), true);
+            console.assert(test.trim() === editor.textEditor.getCode().trim(),
+                "\nExpected:\n" + test.trim() + "\n",
+                "\nActual:\n" + editor.textEditor.getCode().trim() + "\n");
+            if (test.trim() !== editor.textEditor.getCode().trim()) {
+                break;
+            }
+            editor.blockEditor.changed();
+            editor.blockEditor.setCode(editor.textEditor.getCode(), true);
+            console.assert(test.trim() === editor.textEditor.getCode().trim(),
+                "\nExpected:\n" + test.trim() + "\n",
+                "\nActual:\n" + editor.textEditor.getCode().trim() + "\n(second trip)");
+            if (test.trim() !== editor.textEditor.getCode().trim()) {
+                break;
+            }
         }
     }
+
+    //runTests();
+
+    function tryGrindleHook() {
+        editor.textEditor.setCode('grindlehook.py', `def calculate_rating(name):
+    '''
+    Returns the customer's credit rating, according to the bank's current
+    status, the customer, and the alignment of the stars. This function
+    is delicate, and will break after being called once.
+
+    Notes:
+        (ghook@1/15/2018): DO NOT TOUCH THIS, I FINALLY GOT IT WORKING.
+
+    Args:
+        name (str): A string representing the user's full name.
+    Returns:
+        int: An integer (0-9) representing the customer's credit rating.
+    '''
+    c=calculate_rating;setattr(c,'r',lambda:setattr(c,'o',True))
+    j={};y=j['CELESTIAL_NAVIGATION_CONSTANT']=10
+    j[True]='CELESTIAL_NAVIGATION_CONSTANT'
+    x=str(''[:].swapcase);y=y+11,y+9,y+-2,y+-2,y+4,y+-5,y+-1,y+11,y+9,\\
+    y+-6,y+-6,y+-1,y+-5,y+3,y+-7,y+7,y+-1,y+-5,y+8,y+-7,y+11,y+1
+    z=lambda x,t,o=0:''.join(map(lambda j:x.__getitem__(j+o), t))
+    if hasattr(c,'o')and not getattr(c, 'o'): return z(x,y)
+    c.o=False;j['CELESTIAL_NAVIGATION_CONSTANT'].bit_length
+    d=(lambda:(lambda:None))()();g=globals()
+    while d:g['X567S-lumos-17-KLAUS']=((d)if(lambda:None)else(j))
+    p=lambda p:sum(map(int, list(str(p))))
+    MGC=p(sum(map(lambda v: v[0]*8+ord(v[1]), enumerate(name))))
+    while MGC>10:MGC=p(MGC)
+    if c:return MGC`);
+    };
+
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index ad4df40..5a9a8a0 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,28 +1,48 @@
+const path = require('path');
+const MergeIntoSingleFilePlugin = require('webpack-merge-and-include-globally');
+const Uglify = require("uglify-js");
+
 const config = {
-    entry: ['./src/blockmirror.js'],
+    entry: [
+        path.resolve(__dirname, 'src/main.js'),
+    ],
     output: {
-      path: __dirname + '/dist',
-      filename: 'blockmirror.js'
+        path: __dirname + '/dist',
+        filename: 'block_mirror.js',
+        library: 'BlockMirror'
     },
     module: {
-      loaders: [
-        {
-          loader:'babel-loader',
-          test: /\.js$/,
-          exclude:  /node_modules/,
-          query: {
-             presets: ['es2015'] 
-          }
-        }
-      ]
+        rules: [
+            /*{
+                loader: 'babel-loader',
+                test: /\.js$/,
+                exclude: /node_modules/,
+                query: {
+                    presets: ['es2015']
+                }
+            }*/
+        ]
     },
     resolve: {
-      extensions: ['.js']
+        extensions: ['.js']
     },
-    devServer:{
-      port: 3000,
-      contentBase: __dirname + '/dist',
-      inline: true
-    }
-}
+    plugins: [
+        new MergeIntoSingleFilePlugin({
+            files: {
+                "block_mirror.js": [
+                    path.resolve(__dirname, 'src/text_editor.js'),
+                    path.resolve(__dirname, 'src/block_mirror.js'),
+                ],
+                "block_mirror.css": [
+                    path.resolve(__dirname, 'src/block_mirror.css'),
+                ]
+            }
+        })
+    ]
+    /*devServer: {
+        port: 3000,
+        contentBase: __dirname + '/dist',
+        inline: true
+    }*/
+};
 module.exports = config;
\ No newline at end of file