diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..c8f4f58
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libs/tabIndent"]
+	path = libs/tabIndent
+	url = https://github.com/Jonybang/tabIndent.js
diff --git a/epiceditor/js/epiceditor.js b/epiceditor/js/epiceditor.js
index 270132e..377a5eb 100644
--- a/epiceditor/js/epiceditor.js
+++ b/epiceditor/js/epiceditor.js
@@ -133,6 +133,27 @@
     headID.appendChild(cssNode);
   }
 
+  /**
+   * Inserts a <script> tag specifically for JS
+   * @param  {string} path The path to the JS file
+   * @param  {object} context In what context you want to apply this to (document, iframe, etc)
+   * @param  {string} id An id for you to reference later for changing properties of the <script>
+   * @returns {undefined}
+   */
+  function _insertJSScript(path, context, id) {
+    id = id || '';
+    var headID = context.getElementsByTagName("head")[0]
+      , jsNode = context.createElement('script');
+    
+    _applyAttrs(jsNode, {
+      type: 'text/javascript'
+    , id: id
+    , src: path
+    });
+
+    headID.appendChild(jsNode);
+  }
+
   // Simply replaces a class (o), to a new class (n) on an element provided (e)
   function _replaceClass(e, o, n) {
     e.className = e.className.replace(o, n);
@@ -632,6 +653,10 @@
     
     // Insert Editor Stylesheet
     _insertCSSLink(self.settings.theme.editor, self.editorIframeDocument, 'theme');
+
+    // Insert Editor Javascript
+    _insertJSScript('libs/tabIndent/js/tabIndent.js', self.editorIframeDocument, 'tab-indent');
+    _insertJSScript('src/init-tab-indent.js', self.editorIframeDocument, 'init-tab-indent');
     
     // Insert Previewer Stylesheet
     _insertCSSLink(self.settings.theme.preview, self.previewerIframeDocument, 'theme');
@@ -648,6 +673,7 @@
     self.previewer = self.previewerIframeDocument.getElementById('epiceditor-preview');
    
     self.editor.contentEditable = true;
+		self.editor.setAttribute("id", "epiceditor-editor-body");
  
     // Firefox's <body> gets all fucked up so, to be sure, we need to hardcode it
     self.iframe.body.style.height = this.element.offsetHeight + 'px';
diff --git a/libs/tabIndent b/libs/tabIndent
new file mode 160000
index 0000000..44ee054
--- /dev/null
+++ b/libs/tabIndent
@@ -0,0 +1 @@
+Subproject commit 44ee0543977e516ae56dbcf257b375132eb18953
diff --git a/src/editor.js b/src/editor.js
index 0c182e4..d14bc75 100644
--- a/src/editor.js
+++ b/src/editor.js
@@ -133,6 +133,27 @@
     headID.appendChild(cssNode);
   }
 
+  /**
+   * Inserts a <script> tag specifically for JS
+   * @param  {string} path The path to the JS file
+   * @param  {object} context In what context you want to apply this to (document, iframe, etc)
+   * @param  {string} id An id for you to reference later for changing properties of the <script>
+   * @returns {undefined}
+   */
+  function _insertJSScript(path, context, id) {
+    id = id || '';
+    var headID = context.getElementsByTagName("head")[0]
+      , jsNode = context.createElement('script');
+    
+    _applyAttrs(jsNode, {
+      type: 'text/javascript'
+    , id: id
+    , src: path
+    });
+
+    headID.appendChild(jsNode);
+  }
+
   // Simply replaces a class (o), to a new class (n) on an element provided (e)
   function _replaceClass(e, o, n) {
     e.className = e.className.replace(o, n);
@@ -632,6 +653,10 @@
     
     // Insert Editor Stylesheet
     _insertCSSLink(self.settings.theme.editor, self.editorIframeDocument, 'theme');
+
+    // Insert Editor Javascript
+    _insertJSScript('libs/tabIndent/js/tabIndent.js', self.editorIframeDocument, 'tab-indent');
+    _insertJSScript('src/init-tab-indent.js', self.editorIframeDocument, 'init-tab-indent');
     
     // Insert Previewer Stylesheet
     _insertCSSLink(self.settings.theme.preview, self.previewerIframeDocument, 'theme');
@@ -648,6 +673,7 @@
     self.previewer = self.previewerIframeDocument.getElementById('epiceditor-preview');
    
     self.editor.contentEditable = true;
+		self.editor.setAttribute("id", "epiceditor-editor-body");
  
     // Firefox's <body> gets all fucked up so, to be sure, we need to hardcode it
     self.iframe.body.style.height = this.element.offsetHeight + 'px';
diff --git a/src/init-tab-indent.js b/src/init-tab-indent.js
new file mode 100644
index 0000000..c03942d
--- /dev/null
+++ b/src/init-tab-indent.js
@@ -0,0 +1,22 @@
+window.readyHandlers = [];
+window.ready = function ready(handler) {
+  window.readyHandlers.push(handler);
+  handleState();
+};
+
+window.handleState = function handleState () {
+  if (['interactive', 'complete'].indexOf(document.readyState) > -1) {
+    while(window.readyHandlers.length > 0) {
+      (window.readyHandlers.shift())();
+    }
+  }
+};
+
+document.onreadystatechange = window.handleState;
+
+ready(function () {
+	var el = document.getElementById('epiceditor-editor-body');
+	tabIndent.config.focusDelay = 200;
+	tabIndent.config.tab = '\u00A0 \u00A0 \u00A0 ';
+	tabIndent.render(el);
+});
