diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6823046..d59dcb8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,12 @@
   <component name="ChangeListManager">
     <list default="true" id="fe00182d-05fa-4529-8d2b-92bd952d65d2" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/skulpt_parser.js" beforeDir="false" afterPath="$PROJECT_DIR$/dist/skulpt_parser.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/block_editor.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/block_editor.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/skulpt/skulpt_shim.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/skulpt/skulpt_shim.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_Import.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Import.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_functions.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_functions.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/block_mirror.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/block_mirror.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/text_editor.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/text_editor.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/test/minimal_skulpt.html" beforeDir="false" afterPath="$PROJECT_DIR$/test/minimal_skulpt.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -209,7 +211,7 @@
       <workItem from="1581787894709" duration="8205000" />
       <workItem from="1582172961284" duration="310000" />
       <workItem from="1590976436519" duration="23237000" />
-      <workItem from="1591121509240" duration="5446000" />
+      <workItem from="1591121509240" duration="19058000" />
     </task>
     <task id="LOCAL-00001" summary="Basics of packaging, bug fixes, better updating">
       <created>1564063805490</created>
@@ -278,31 +280,31 @@
       <screen x="0" y="0" width="2560" height="1360" />
     </state>
     <state x="552" y="0" key="CommitChangelistDialog2/0.0.2560.1360/-3840.0.3840.2400@0.0.2560.1360" timestamp="1591030286558" />
-    <state width="2516" height="202" key="GridCell.Tab.0.bottom" timestamp="1591126071974">
+    <state width="2516" height="202" key="GridCell.Tab.0.bottom" timestamp="1591127762915">
       <screen x="0" y="0" width="2560" height="1360" />
     </state>
     <state width="2516" height="58" key="GridCell.Tab.0.bottom/0.0.2560.1360/-3840.0.3840.2400@0.0.2560.1360" timestamp="1591028320640" />
-    <state width="2516" height="202" key="GridCell.Tab.0.bottom/0.0.2560.1360@0.0.2560.1360" timestamp="1591126071974" />
-    <state width="2516" height="202" key="GridCell.Tab.0.center" timestamp="1591126071974">
+    <state width="2516" height="202" key="GridCell.Tab.0.bottom/0.0.2560.1360@0.0.2560.1360" timestamp="1591127762915" />
+    <state width="2516" height="202" key="GridCell.Tab.0.center" timestamp="1591127762915">
       <screen x="0" y="0" width="2560" height="1360" />
     </state>
     <state width="2516" height="58" key="GridCell.Tab.0.center/0.0.2560.1360/-3840.0.3840.2400@0.0.2560.1360" timestamp="1591028320640" />
-    <state width="2516" height="202" key="GridCell.Tab.0.center/0.0.2560.1360@0.0.2560.1360" timestamp="1591126071974" />
-    <state width="2516" height="202" key="GridCell.Tab.0.left" timestamp="1591126071973">
+    <state width="2516" height="202" key="GridCell.Tab.0.center/0.0.2560.1360@0.0.2560.1360" timestamp="1591127762915" />
+    <state width="2516" height="202" key="GridCell.Tab.0.left" timestamp="1591127762915">
       <screen x="0" y="0" width="2560" height="1360" />
     </state>
     <state width="2516" height="58" key="GridCell.Tab.0.left/0.0.2560.1360/-3840.0.3840.2400@0.0.2560.1360" timestamp="1591028320639" />
-    <state width="2516" height="202" key="GridCell.Tab.0.left/0.0.2560.1360@0.0.2560.1360" timestamp="1591126071973" />
-    <state width="2516" height="202" key="GridCell.Tab.0.right" timestamp="1591126071974">
+    <state width="2516" height="202" key="GridCell.Tab.0.left/0.0.2560.1360@0.0.2560.1360" timestamp="1591127762915" />
+    <state width="2516" height="202" key="GridCell.Tab.0.right" timestamp="1591127762915">
       <screen x="0" y="0" width="2560" height="1360" />
     </state>
     <state width="2516" height="58" key="GridCell.Tab.0.right/0.0.2560.1360/-3840.0.3840.2400@0.0.2560.1360" timestamp="1591028320640" />
-    <state width="2516" height="202" key="GridCell.Tab.0.right/0.0.2560.1360@0.0.2560.1360" timestamp="1591126071974" />
-    <state x="595" y="291" key="run.anything.popup" timestamp="1591121934618">
+    <state width="2516" height="202" key="GridCell.Tab.0.right/0.0.2560.1360@0.0.2560.1360" timestamp="1591127762915" />
+    <state x="595" y="291" width="1344" height="2554" key="run.anything.popup" timestamp="1591147015659">
       <screen x="0" y="0" width="2560" height="1360" />
     </state>
     <state x="595" y="291" key="run.anything.popup/0.0.2560.1360/-3840.0.3840.2400@0.0.2560.1360" timestamp="1591027739379" />
-    <state x="595" y="291" key="run.anything.popup/0.0.2560.1360@0.0.2560.1360" timestamp="1591121934618" />
+    <state x="595" y="291" width="1344" height="2554" key="run.anything.popup/0.0.2560.1360@0.0.2560.1360" timestamp="1591147015659" />
     <state x="606" y="-2" width="1344" height="2556" key="search.everywhere.popup" timestamp="1591033809249">
       <screen x="0" y="0" width="2560" height="1360" />
     </state>
diff --git a/src/ast/ast_Call.js b/src/ast/ast_Call.js
index a874c00..942bd4e 100644
--- a/src/ast/ast_Call.js
+++ b/src/ast/ast_Call.js
@@ -487,6 +487,7 @@ BlockMirrorTextToBlocks.prototype['ast_Call'] = function (node, parent) {
         if (name in this.FUNCTION_SIGNATURES) {
             signature = this.FUNCTION_SIGNATURES[Sk.ffi.remapToJs(func.id)];
         }
+        console.log(signature);
     } else if (func._astname === 'Attribute') {
         isMethod = true;
         caller = func.value;
@@ -516,8 +517,9 @@ BlockMirrorTextToBlocks.prototype['ast_Call'] = function (node, parent) {
     if (signature !== null && signature !== undefined) {
         if (signature.custom) {
             try {
-                return signature.custom(node, parent)
+                return signature.custom(node, parent, this)
             } catch (e) {
+                console.error(e);
                 // We tried to be fancy and failed, better fall back to default behavior!
             }
         }
@@ -590,3 +592,4 @@ BlockMirrorTextToBlocks.prototype['ast_Call'] = function (node, parent) {
         return [newBlock];
     }
 };
+
diff --git a/src/ast/ast_Import.js b/src/ast/ast_Import.js
index 5b55d4f..33cca7c 100644
--- a/src/ast/ast_Import.js
+++ b/src/ast/ast_Import.js
@@ -95,7 +95,9 @@ Blockly.Python['ast_Import'] = function (block) {
     // Optional from part
     let from = "";
     if (this.from_) {
-        from = "from "+block.getFieldValue('MODULE') + " ";
+        let moduleName = block.getFieldValue('MODULE');
+        from = "from "+moduleName + " ";
+        Blockly.Python.imported_["import_" + moduleName] = moduleName;
     }
     // Create a list with any number of elements of any type.
     let elements = new Array(block.nameCount_);
@@ -106,7 +108,9 @@ Blockly.Python['ast_Import'] = function (block) {
             name = Blockly.Python.variableDB_.getName(block.getFieldValue('ASNAME' + i), Blockly.Variables.NAME_TYPE);
             elements[i] += " as " + name;
         }
-        Blockly.Python.imported_["import_"+name] = name;
+        if (!from) {
+            Blockly.Python.imported_["import_" + name] = name;
+        }
     }
     return from + 'import ' + elements.join(', ') + "\n";
 };
@@ -145,8 +149,8 @@ BlockMirrorTextToBlocks.prototype['ast_Import'] = function (node, parent) {
     }
 
     return BlockMirrorTextToBlocks.create_block("ast_Import", node.lineno, fields,
-        {}, {}, mutations);
+        {}, {"inline": true}, mutations);
 };
 
 // Alias ImportFrom because of big overlap
-BlockMirrorTextToBlocks.prototype['ast_ImportFrom'] = BlockMirrorTextToBlocks.prototype['ast_Import'];
\ No newline at end of file
+BlockMirrorTextToBlocks.prototype['ast_ImportFrom'] = BlockMirrorTextToBlocks.prototype['ast_Import'];
diff --git a/src/ast/ast_Str.js b/src/ast/ast_Str.js
index d37d700..6ba6b8d 100644
--- a/src/ast/ast_Str.js
+++ b/src/ast/ast_Str.js
@@ -46,7 +46,7 @@ BlockMirrorTextToBlocks.BLOCKS.push({
 });
 
 
-Blockly.Blocks['ast_StrImage'] = {
+Blockly.Blocks['ast_Image'] = {
     init: function () {
         this.setColour(BlockMirrorTextToBlocks.COLOR.TEXT);
         this.src_ = "loading.png";
@@ -66,7 +66,7 @@ Blockly.Blocks['ast_StrImage'] = {
         let image = this.getInput('IMAGE');
         if (!image) {
             image = this.appendDummyInput("IMAGE");
-            image.appendField(new Blockly.FieldImage(this.src_, 20, 20, { alt: this.src_, flipRtl: "FALSE" }));
+            image.appendField(new Blockly.FieldImage(this.src_, 40, 40, { alt: this.src_, flipRtl: "FALSE" }));
         }
         let imageField = image.fieldRow[0];
         imageField.setValue(this.src_);
@@ -103,10 +103,11 @@ Blockly.Python['ast_StrChar'] = function (block) {
     }
 };
 
-Blockly.Python['ast_StrImage'] = function (block) {
+Blockly.Python['ast_Image'] = function (block) {
     // Text value
-    let code = Blockly.Python.quote_(block.src_);
-    return [code, Blockly.Python.ORDER_ATOMIC];
+    Blockly.Python.definitions_["import_image"] = "from image import Image";
+    let code = "Image("+Blockly.Python.quote_(block.src_)+")";
+    return [code, Blockly.Python.ORDER_FUNCTION_CALL];
 };
 
 Blockly.Python['ast_StrMultiline'] = function (block) {
@@ -177,10 +178,10 @@ BlockMirrorTextToBlocks.prototype.dedent = function (text, levels, isDocString)
 BlockMirrorTextToBlocks.prototype['ast_Str'] = function (node, parent) {
     let s = node.s;
     let text = Sk.ffi.remapToJs(s);
-    if (text.startsWith("http") && text.endsWith(".png")) {
-        return BlockMirrorTextToBlocks.create_block("ast_StrImage", node.lineno, {}, {}, {},
+    /*if (text.startsWith("http") && text.endsWith(".png")) {
+        return BlockMirrorTextToBlocks.create_block("ast_Image", node.lineno, {}, {}, {},
             {"@src": text});
-    } else if (this.isSingleChar(text)) {
+    } else*/ if (this.isSingleChar(text)) {
         return BlockMirrorTextToBlocks.create_block("ast_StrChar", node.lineno, {"TEXT": text});
     } else if (this.isDocString(node, parent)) {
         let dedented = this.dedent(text, this.levelIndex - 1, true);
diff --git a/src/ast/ast_functions.js b/src/ast/ast_functions.js
index fddf141..fb8591c 100644
--- a/src/ast/ast_functions.js
+++ b/src/ast/ast_functions.js
@@ -1,3 +1,18 @@
+BlockMirrorTextToBlocks['ast_Image'] = function (node, parent, bmttb) {
+    if (!bmttb.blockMirror.configuration.imageMode) {
+        throw "Not using image constructor";
+    }
+    if (node.args.length !== 1) {
+        throw "More than one argument to Image constructor";
+    }
+    if (node.args[0]._astname !== "Str") {
+        throw "First argument for Image constructor must be string literal";
+    }
+    return BlockMirrorTextToBlocks.create_block("ast_Image", node.lineno, {}, {}, {},
+        {"@src": Sk.ffi.remapToJs(node.args[0].s)});
+};
+
+
 BlockMirrorTextToBlocks.prototype.FUNCTION_SIGNATURES = {
     'abs': {
         'returns': true,
@@ -36,6 +51,7 @@ BlockMirrorTextToBlocks.prototype.FUNCTION_SIGNATURES = {
     'help': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
     'hex': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH},
     'id': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.PYTHON},
+    'Image': {custom: BlockMirrorTextToBlocks.ast_Image},
     'input': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.FILE,
     simple: ['prompt']},
     'int': {returns: true, colour: BlockMirrorTextToBlocks.COLOR.MATH,
diff --git a/src/block_mirror.js b/src/block_mirror.js
index 36c3ec7..e4b3f46 100644
--- a/src/block_mirror.js
+++ b/src/block_mirror.js
@@ -92,7 +92,10 @@ BlockMirror.prototype.validateConfiguration = function (configuration) {
     this.isParsons = function() { return false; };
 
     // Convert image URLs?
-    this.configuration.imageUrls = configuration.imageUrls || true;
+    this.configuration.imageUploadHook = configuration.imageUploadHook || (old => Promise.resolve(old));
+    this.configuration.imageDownloadHook = configuration.imageDownloadHook || (old => old);
+    this.configuration.imageLiteralHook = configuration.imageLiteralHook || (old => old);
+    this.configuration.imageMode = configuration.imageMode || false;
 };
 
 BlockMirror.prototype.initializeVariables = function () {
@@ -198,6 +201,16 @@ BlockMirror.prototype.setMode = function (mode) {
     this.textEditor.setMode(mode);
 };
 
+BlockMirror.prototype.setImageMode = function (imageMode) {
+    this.configuration.imageMode = imageMode;
+    if (imageMode) {
+        this.textEditor.enableImages();
+    } else {
+        this.textEditor.disableImages();
+    }
+    console.log(imageMode);
+};
+
 BlockMirror.prototype.setReadOnly = function (isReadOnly) {
     this.textEditor.setReadOnly(isReadOnly);
     this.blockEditor.setReadOnly(isReadOnly);
diff --git a/src/text_editor.js b/src/text_editor.js
index 61da463..b90e07a 100644
--- a/src/text_editor.js
+++ b/src/text_editor.js
@@ -51,6 +51,7 @@ function BlockMirrorTextEditor(blockMirror) {
     this.codeMirror = CodeMirror.fromTextArea(this.textArea, codeMirrorOptions);
     this.codeMirror.on('change', this.changed.bind(this));
     this.codeMirror.setSize(null, '100%');
+    this.imageMarkers = [];
     this.textContainer.style.border = '1px solid lightgray';
     this.textContainer.style.float = 'left';
     this.updateWidth();
@@ -73,18 +74,19 @@ function BlockMirrorTextEditor(blockMirror) {
     });*/
     //https://i.imgur.com/ITZKRiq.png
     this.codeMirror.on("beforeChange", (cm, change) => {
-        if (this.blockMirror.configuration.imageUrls) {
+        if (this.blockMirror.configuration.imageMode) {
             if (change.origin === "paste") {
-                let newText = change.text[0];
-                if (this.isImageUrl(newText)) {
-                    change.update(null, null, [`"${newText}"`]);
+                let oldText = change.text[0];
+                if (this.isImageUrl(oldText)) {
+                    let newText = imageLiteralHook(oldText);
+                    change.update(null, null, [newText]);
                 }
             }
         }
     });
+
     this.codeMirror.on("change", (cm, change) => {
-        if (this.blockMirror.configuration.imageUrls) {
-            console.log(change);
+        if (this.blockMirror.configuration.imageMode) {
             let lastLine;
             if (change.origin === "paste" || change.origin === "setValue") {
                 //"https://game-icons.net/icons/ffffff/000000/1x1/delapouite/labrador-head.png"
@@ -92,37 +94,89 @@ function BlockMirrorTextEditor(blockMirror) {
             } else {
                 lastLine = Math.max(1 + change.to.line, change.text.length);
             }
-            cm.doc.eachLine(change.from.line, lastLine, (line) => {
-                let match;
-                while ((match = HAS_IMAGE_URL.exec(line.text)) !== null) {
-                    let imageWidget = this.makeImageWidget(match[2]);
-                    let imageMarker = cm.markText({line: cm.doc.getLineNumber(line), ch: match.index},
-                        {line: cm.doc.getLineNumber(line), ch: match.index + match[0].length},
-                        {atomic: true, replacedWith: imageWidget});
-                    imageWidget.onclick = (x) => imageMarker.clear();
+            this.updateImages(cm, change.from.line, lastLine);
+        }
+    });
+
+    this.codeMirror.on("paste", (cm, event) => {
+        if (this.blockMirror.configuration.imageMode) {
+            var items = (event.clipboardData || event.originalEvent.clipboardData).items;
+            for (let index = 0; index < items.length; index += 1) {
+                var item = items[index];
+                if (item.kind === 'file') {
+                    let blob = item.getAsFile();
+                    let promise = this.blockMirror.configuration.imageUploadHook(blob, item);
+                    promise.then(newUrl => {
+                        let doc = cm.getDoc();
+                        doc.replaceRange(newUrl, doc.getCursor("from"), doc.getCursor("to"));
+                    });
+                    event.preventDefault();
                 }
-            });
+            }
         }
     });
 
 }
 
-//BlockMirrorTextEditor.prototype.enableImages = function (url) {
-//BlockMirrorTextEditor.prototype.disableImage = function (url) {
+BlockMirrorTextEditor.prototype.enableImages = function () {
+    let doc = this.codeMirror.getDoc();
+    this.updateImages(this.codeMirror, doc.firstLine(), 1+doc.lastLine());
+};
+BlockMirrorTextEditor.prototype.disableImages = function () {
+    this.imageMarkers.map(imageMarker => imageMarker.clear());
+    this.imageMarkers = this.imageMarkers.filter(i => i.find());
+};
 
 BlockMirrorTextEditor.prototype.makeImageWidget = function (url) {
-    let x = document.createElement("IMG");
-    x.setAttribute("src", url);
-    x.setAttribute("height", "40");
-    x.setAttribute("width", "40");
-    x.setAttribute("alt", url);
-    x.onmouseover = (x) => console.log("Turn it off");
-    return x;
+    let newImage = document.createElement("IMG");
+    newImage.setAttribute("src", url);
+    newImage.setAttribute("height", "40");
+    newImage.style.maxHeight = "100px";
+    newImage.setAttribute("width", "40");
+    newImage.setAttribute("title", url);
+    newImage.onclick = (x) => {
+        if (newImage.hasAttribute('width')) {
+            newImage.removeAttribute("height");
+            newImage.removeAttribute("width");
+        } else {
+            newImage.setAttribute("height", "40");
+            newImage.setAttribute("width", "40");
+        }
+    };
+    return newImage;
+};
+
+BlockMirrorTextEditor.prototype.updateImages = function(cm, from, to) {
+    cm.doc.eachLine(from, to, (line) => {
+        let match;
+        while ((match = CONSTRUCTOR_IMAGE_URL.exec(line.text)) !== null) {
+            let imageWidget = this.makeImageWidget(match[3]);
+            let offset = (match[0].length-match[1].length);
+            console.log(offset);
+            let imageMarker = cm.markText({
+                    line: cm.doc.getLineNumber(line),
+                    ch: match.index+ offset},
+                {line: cm.doc.getLineNumber(line),
+                    ch: match.index + match[1].length + offset},
+                {atomic: true, replacedWith: imageWidget});
+            //imageWidget.onclick = (x) => imageMarker.clear();
+            this.imageMarkers.push(imageMarker);
+        }
+    });
 };
 
 //'https://game-icons.net/icons/ffffff/000000/1x1/delapouite/labrador-head.png'
-const FULL_IMAGE_URL = /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+(?:png|jpg|jpeg|gif|svg)+$/;
-const HAS_IMAGE_URL = /(["'])((?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+(?:png|jpg|jpeg|gif|svg)+)\1/g;
+const FULL_IMAGE_URL = /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+(?:png|jpg|jpeg|gif|svg|mp4)+$/;
+//const BLOB_IMAGE_URL = /(["'])(blob:null\/[A-Fa-f0-9-]+)\1/g;
+//const REGULAR_IMAGE_URL = /(["'])((?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+(?:png|jpg|jpeg|gif|svg)+)\1/g;
+const STRING_IMAGE_URL = /((["'])((?:blob:null\/[A-Fa-f0-9-]+)|(?:(?:https?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+(?:png|jpg|jpeg|gif|svg)+))\2)/g;
+//const CONSTRUCTOR_IMAGE_URL = /(?:^|\W)(Image\((["'])((?:blob:null\/[A-Fa-f0-9-]+)|(?:(?:https?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+(?:png|jpg|jpeg|gif|svg)+))\2\))/g;
+const CONSTRUCTOR_IMAGE_URL = /(?:^|\W)(Image\((["'])(.+?)\2\))/g;
+BlockMirrorTextEditor.REGEX_PATTERNS = {
+    "constructor": CONSTRUCTOR_IMAGE_URL,
+    "string": STRING_IMAGE_URL,
+    "none": false
+};
 BlockMirrorTextEditor.prototype.isImageUrl = function (url) {
     return url.match(FULL_IMAGE_URL);
 };
@@ -285,21 +339,3 @@ BlockMirrorTextEditor.prototype.clearHighlightedLines = function () {
         return removed;
     }
 };
-
-
-document.onpaste = function(event){
-    var items = (event.clipboardData || event.originalEvent.clipboardData).items;
-    console.log(JSON.stringify(items)); // will give you the mime types
-    for (index in items) {
-        var item = items[index];
-        if (item.kind === 'file') {
-            var blob = item.getAsFile();
-            var reader = new FileReader();
-            reader.onload = function(event){
-                console.log(typeof event.target.result); // data url!
-                $(".cm-embedded-image").css("background-image", "url("+event.target.result+")").css("background-size", "contain").css("background-repeat-x", "no-repeat").css("background-repeat-y", "no-repeat").css("padding-left", "30px").css("padding-bottom", "5px");
-            };
-            reader.readAsDataURL(blob);
-        }
-    }
-};
diff --git a/test/minimal_skulpt.html b/test/minimal_skulpt.html
index c08d376..458b356 100644
--- a/test/minimal_skulpt.html
+++ b/test/minimal_skulpt.html
@@ -97,7 +97,7 @@
 <div style="width:900px; margin:0 auto;"
      id='example-frame'>
 
-    <div class="btn-group" data-toggle="buttons" data-bind="visible: !assignment.upload()">
+    <div class="btn-group" data-toggle="buttons" style="display: inline-block; margin-right: 10em;">
         <label onclick="editor.setMode('block');">
             <input type="radio" name="blockpy-mode-set" autocomplete="off"> Blocks
         </label>
@@ -109,15 +109,49 @@
         </label>
     </div>
 
+    <div class="btn-group" data-toggle="buttons" style="display: inline-block">
+        <label>
+            <input type="checkbox" name="blockpy-mode-set" checked
+                   onclick="editor.setImageMode(!editor.configuration.imageMode);">
+            Image Mode
+        </label>
+    </div>
+
 
     <div id="blockmirror-editor"></div>
 </div>
 
 
 <script type="text/javascript">
+    try {
+        var KEY_VALUE_STORE = localStorage.getItem('code-mirror-kv-length') || 0;
+        //localStorage.setItem('code-mirror-kv-length', KEY_VALUE_STORE+1);
+        function lookupImage(value) {
+
+        }
+    } catch (e) {
+        console.error(e);
+        KEY_VALUE_STORE = {};
+    }
+
     var editor = new BlockMirror({
         'container': document.getElementById('blockmirror-editor'),
-        'toolbox': 'ct2'
+        'toolbox': 'normal',
+        imageMode: "constructor",
+        imageDownloadHOok: (oldUrl) => {
+            return oldUrl;
+        },
+        imageUploadHook: (blob) => {
+            return Promise.resolve("Image("+JSON.stringify(URL.createObjectURL(blob))+")");
+        },
+        imageLiteralHook: (oldUrl) => {
+            return `Image("${oldUrl}")`;
+        },
+        /*var reader = new FileReader();
+        reader.onload = function(event){
+            // Post to a server, get back a URL
+            console.log(event.target.result); // data url!
+        };*/
         //'height': '2000px'
     });
     editor.addChangeListener(function (event) {