diff --git a/ace/index.html b/ace/index.html
index d5b1823..1d869f3 100644
--- a/ace/index.html
+++ b/ace/index.html
@@ -1,54 +1,119 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;" />
-  <meta name="HandheldFriendly" content="True" />
-  <title>Editor</title>
-  <style type="text/css" media="screen">
-    body {
-        overflow: hidden;
-    }
-
-    #editor {
-        margin: 0;
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-    }
-  </style>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;" />
+    <meta name="HandheldFriendly" content="True" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>Editor</title>
+    <style type="text/css" media="screen">
+        .ace_editor,
+        .toolbar {
+            border: 1px solid lightgray;
+            margin: auto;
+            width: 80%;
+        }
+        
+        .ace_editor {
+            height: 200px;
+        }
+    </style>
 </head>
+
 <body>
 
-<pre id="editor"></pre>
-
-<script src="src-min-noconflict/ace.js" type="text/javascript" charset="utf-8"></script>
-<script>
-    var editor = ace.edit("editor");
-    editor.setOptions({
-      mode: "ace/mode/markdown",
-      theme: "ace/theme/twilight",
-      showPrintMargin: false,
-      wrap: true,
-      indentedSoftWrap: true,
-      showFoldWidgets: false,
-      showLineNumbers: true,
-      showGutter: false,
-      autoScrollEditorIntoView: true
-    })
-    
-    if (localStorage.getItem("acetest") !== null) {
-      editor.setValue(localStorage.getItem("acetest"));
-      editor.clearSelection();
-    }
-    
-    editor.getSession().on('change', function () {
-       localStorage.setItem("acetest", editor.getSession().getValue());
-   	});
-</script>
+    <script src="kitchen-sink/require.js"></script>
+    <script>
+        // setup paths
+        require.config({
+            paths: {
+                "ace": "../lib/ace"
+            }
+        });
+        // load ace and extensions
+        require(["ace/ace", "ace/ext/language_tools"], function(ace) {
+            var buildDom = require("ace/lib/dom").buildDom;
+            var editor = ace.edit();
+            editor.setOptions({
+                theme: "ace/theme/twilight",
+                showPrintMargin: false,
+                wrap: true,
+                indentedSoftWrap: true,
+                showFoldWidgets: false,
+                showLineNumbers: true,
+                showGutter: false,
+                autoScrollEditorIntoView: true
+            });
+            var refs = {};
+
+            function updateToolbar() {
+                refs.undoButton.disabled = !editor.session.getUndoManager().hasUndo();
+                refs.redoButton.disabled = !editor.session.getUndoManager().hasRedo();
+            }
+            editor.on("input", updateToolbar);
+
+            if (localStorage.getItem("acetest") !== null) {
+                editor.setValue(localStorage.getItem("acetest"));
+                editor.clearSelection();
+            }
+
+            editor.getSession().on('change', function () {
+                localStorage.setItem("acetest", editor.getSession().getValue());
+            });
+
+            function save() {
+                alert("not yet implemented");
+            }
+            editor.commands.addCommand({
+                name: "save",
+                exec: save,
+                bindKey: {
+                    win: "ctrl-s",
+                    mac: "cmd-s"
+                }
+            });
+
+            buildDom(["div", {
+                    class: "toolbar"
+                },
+                ["button", {
+                    ref: "saveButton",
+                    onclick: save
+                }, "save"],
+                ["button", {
+                    ref: "undoButton",
+                    onclick: function() {
+                        editor.undo();
+                    }
+                }, "undo"],
+                ["button", {
+                    ref: "redoButton",
+                    onclick: function() {
+                        editor.redo();
+                    }
+                }, "redo"],
+                ["button", {
+                    style: "font-weight: bold",
+                    onclick: function() {
+                        editor.insertSnippet("**${1:$SELECTION}**");
+                        editor.renderer.scrollCursorIntoView()
+                    }
+                }, "bold"],
+                ["button", {
+                    style: "font-style: italic",
+                    onclick: function() {
+                        editor.insertSnippet("*${1:$SELECTION}*");
+                        editor.renderer.scrollCursorIntoView()
+                    }
+                }, "Italic"],
+            ], document.body, refs);
+            document.body.appendChild(editor.container)
+
+            window.editor = editor;
+        });
+    </script>
 
 </body>
-</html>
+
+</html>
\ No newline at end of file
