diff --git a/.gitignore b/.gitignore
index c44d96c..bd08399 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 .DS_Store
 .rvmrc
 runner.js
-lib
 jquery.mustache.js
 qooxdoo.mustache.js
 dojox
diff --git a/CHANGES.md b/CHANGES.md
index 40d50b8..0be6033 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,49 +1,52 @@
 # mustache.js Changes
 
+## 0.5.0-dev (1/11/2012)
+
+  * Complete rewrite
+  * Removed support for pragmas
+
 ## 0.3.1-dev-twitter-b (8/23/2011)
 
-* Cached regexes for improved performance
+  * Cached regexes for improved performance
 
 ## 0.3.1-dev-twitter (12/3/2010)
 
-* fixed double-rendering bug
-* added Rhino test-runner alongside JavaScriptCore
+  * Fixed double-rendering bug
+  * Added Rhino test-runner alongside JavaScriptCore
 
 ## 0.3.1 (??-??-????)
 
 ## 0.3.0 (21-07-2010)
 
-* Improved whitespace handling.
-* Make IMPLICIT ITERATORS a first class feature.
-* Fix Rhino compat.
-* CommonJS packaging is no longer a special case.
-* DRY Rakefile.
-* Allow whitespace around tag names.
-* Fix partial scope.
-* Fix Comments.
-* Added inverted sections.
-* Avoid double encoding of entities.
-* Use sections to dereference subcontexts.
-* Added higher order sections.
-
+  * Improved whitespace handling
+  * Make IMPLICIT ITERATORS a first class feature
+  * Fix Rhino compat
+  * CommonJS packaging is no longer a special case
+  * DRY Rakefile
+  * Allow whitespace around tag names
+  * Fix partial scope
+  * Fix Comments
+  * Added inverted sections
+  * Avoid double encoding of entities
+  * Use sections to dereference subcontexts
+  * Added higher order sections
 
 ## 0.2.3 (28-03-2010)
 
-* Better error message for missing partials.
-* Added more robust type detection.
-* Parse pragmas only once.
-* Throw exception when encountering an unknown pragma.
-* Ignore undefined partial contexts. Returns verbatim partials.
-* Added yui3 packaging.
-
+  * Better error message for missing partials
+  * Added more robust type detection
+  * Parse pragmas only once
+  * Throw exception when encountering an unknown pragma
+  * Ignore undefined partial contexts. Returns verbatim partials
+  * Added yui3 packaging
 
 ## 0.2.2 (11-02-2010)
 
-* ctemplate compat: Partials are indicated by >, not <.
-* Add support for {{%PRAGMA}} to enable features.
-* Made array of strings an option. Enable with `{{%JSTACHE-ENABLE-STRING-ARRAYS}}`.
-* mustache compat: Don't barf on unknown variables.
-* Add `rake dojo` target to create a dojo package.
-* Add streaming api.
-* Rename JSTACHE-ENABLE-STRING-ARRAYS to IMPLICIT-ITERATOR.
-* Add support for pragma options.
+  * ctemplate compat: Partials are indicated by >, not <
+  * Add support for {{%PRAGMA}} to enable features
+  * Made array of strings an option. Enable with `{{%JSTACHE-ENABLE-STRING-ARRAYS}}`
+  * mustache compat: Don't barf on unknown variables
+  * Add `rake dojo` target to create a dojo package
+  * Add streaming api
+  * Rename JSTACHE-ENABLE-STRING-ARRAYS to IMPLICIT-ITERATOR
+  * Add support for pragma options
diff --git a/README.md b/README.md
index 578df7c..7d941df 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 > What could be more logical awesome than no logic at all?
 
 [mustache.js](http://github.com/janl/mustache.js) is an implementation of the
-[Mustache](http://mustache.github.com/) templating system in JavaScript.
+[Mustache](http://mustache.github.com/) template system in JavaScript.
 
 [Mustache](http://mustache.github.com/) is a logic-less template syntax. It can
 be used for HTML, config files, source code - anything. It works by expanding
@@ -274,10 +274,11 @@ own iteration marker:
 
 ## Plugins for JavaScript Libraries
 
-mustache.js may be built specifically for several different client libraries
-and platforms, including the following:
+By default mustache.js may be used in a browser or any [CommonJS](http://www.commonjs.org/)
+environment, including [node](http://nodejs.org/). Additionally, mustache.js may
+be built specifically for several different client libraries and platforms,
+including the following:
 
-  - [node](http://nodejs.org/) (or other CommonJS platforms)
   - [jQuery](http://jquery.com/)
   - [Dojo](http://www.dojotoolkit.org/)
   - [YUI](http://developer.yahoo.com/yui/)
@@ -287,7 +288,6 @@ and platforms, including the following:
 These may be built using [Rake](http://rake.rubyforge.org/) and one of the
 following commands:
 
-    $ rake commonjs
     $ rake jquery
     $ rake dojo
     $ rake yui
diff --git a/Rakefile b/Rakefile
index 16bc724..b2a83b9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -13,7 +13,7 @@ task :spec do
 end
 
 def version
-  File.read("mustache.js").match('version: "([^\"]+)",$')[1]
+  File.read("mustache.js").match('version = "([^\"]+)";$')[1]
 end
 
 # Creates a rule that uses the .tmpl.{pre,post} stuff to make a final,
@@ -36,17 +36,10 @@ def templated_build(name, opts={})
     sh "cat #{source}/#{target_js}.tpl.pre mustache.js \
       #{source}/#{target_js}.tpl.post > #{opts[:location] || '.'}/#{target_js}"
 
-    # extra
-    if opts[:extra]
-      sh "sed -e 's/{{version}}/#{version}/' #{source}/#{opts[:extra]} \
-        > #{opts[:location]}/#{opts[:extra]}"
-    end
-
     puts "Done, see #{opts[:location] || '.'}/#{target_js}"
   end
 end
 
-templated_build "CommonJS", :location => "lib", :extra => "package.json"
 templated_build "jQuery"
 templated_build "Dojo", :location => "dojox/string"
 templated_build "YUI3", :location => "yui3/mustache"
diff --git a/TESTING.md b/TESTING.md
index 6abec93..47d15e4 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -1,4 +1,4 @@
-## Running the mustache.js Test Suite
+## Running the mustache.js test suite
 
 The mustache.js test suite uses the [RSpec](http://rspec.info/) testing
 framework. In order to run the tests you'll need to install [Ruby](http://ruby-lang.org/)
@@ -57,6 +57,6 @@ suite with the following command:
 
 All test files live in the spec/_files directory. To create a new test:
 
-  * Create a template file `somename.mustache`
-  * Create a javascript file with data and functions `somename.js`
-  * Create a file the expected result `somename.txt`
+  * Create a template file called `somename.mustache`
+  * Create a JavaScript file containing the view called `somename.js`
+  * Create a text file with the expected result called `somename.txt`
diff --git a/mustache.js b/mustache.js
index da2c410..0121abc 100644
--- a/mustache.js
+++ b/mustache.js
@@ -1,38 +1,75 @@
-/*
-  mustache.js — Logic-less templates in JavaScript
+/*!
+ * mustache.js - Logic-less {{mustache}} templates with JavaScript
+ * http://github.com/janl/mustache.js
+ */
+var Mustache = (typeof module !== "undefined" && module.exports) || {};
 
-  See http://mustache.github.com/ for more info.
-*/
+(function (exports) {
+
+  exports.name = "mustache.js";
+  exports.version = "0.5.0-dev";
+  exports.tags = ["{{", "}}"];
+  exports.parse = parse;
+  exports.compile = compile;
+  exports.render = render;
+  exports.clearCache = clearCache;
+
+  exports.to_html = render; // keep backwards compatibility
 
-var Mustache = function () {
   var _toString = Object.prototype.toString;
+  var _isArray = Array.isArray;
+  var _forEach = Array.prototype.forEach;
+  var _trim = String.prototype.trim;
 
-  Array.isArray = Array.isArray || function (obj) {
-    return _toString.call(obj) == "[object Array]";
+  var isArray;
+  if (_isArray) {
+    isArray = _isArray;
+  } else {
+    isArray = function (obj) {
+      return _toString.call(obj) === "[object Array]";
+    };
+  }
+
+  var forEach;
+  if (_forEach) {
+    forEach = function (obj, callback, scope) {
+      return _forEach.call(obj, callback, scope);
+    };
+  } else {
+    forEach = function (obj, callback, scope) {
+      for (var i = 0, len = obj.length; i < len; ++i) {
+        callback.call(scope, obj[i], i, obj);
+      }
+    };
   }
 
-  var _trim = String.prototype.trim, trim;
+  var spaceRe = /^\s*$/;
 
+  function isWhitespace(string) {
+    return spaceRe.test(string);
+  }
+
+  var trim;
   if (_trim) {
-    trim = function (text) {
-      return text == null ? "" : _trim.call(text);
-    }
+    trim = function (string) {
+      return string == null ? "" : _trim.call(string);
+    };
   } else {
     var trimLeft, trimRight;
 
-    // IE doesn't match non-breaking spaces with \s.
-    if ((/\S/).test("\xA0")) {
-      trimLeft = /^[\s\xA0]+/;
-      trimRight = /[\s\xA0]+$/;
-    } else {
+    if (isWhitespace("\xA0")) {
       trimLeft = /^\s+/;
       trimRight = /\s+$/;
+    } else {
+      // IE doesn't match non-breaking spaces with \s, thanks jQuery.
+      trimLeft = /^[\s\xA0]+/;
+      trimRight = /[\s\xA0]+$/;
     }
 
-    trim = function (text) {
-      return text == null ? "" :
-        text.toString().replace(trimLeft, "").replace(trimRight, "");
-    }
+    trim = function (string) {
+      return string == null ? "" :
+        String(string).replace(trimLeft, "").replace(trimRight, "");
+    };
   }
 
   var escapeMap = {
@@ -49,388 +86,451 @@ var Mustache = function () {
     });
   }
 
-  var regexCache = {};
-  var Renderer = function () {};
-
-  Renderer.prototype = {
-    otag: "{{",
-    ctag: "}}",
-    pragmas: {},
-    buffer: [],
-    pragmas_implemented: {
-      "IMPLICIT-ITERATOR": true
-    },
-    context: {},
-
-    render: function (template, context, partials, in_recursion) {
-      // reset buffer & set context
-      if (!in_recursion) {
-        this.context = context;
-        this.buffer = []; // TODO: make this non-lazy
-      }
+  /**
+   * Adds the `template`, `line`, and `file` properties to the given error
+   * object and alters the message to provide more useful debugging information.
+   */
+  function debug(e, template, line, file) {
+    file = file || "<template>";
+
+    var lines = template.split("\n"),
+        start = Math.max(line - 3, 0),
+        end = Math.min(lines.length, line + 3),
+        context = lines.slice(start, end);
+
+    var c;
+    for (var i = 0, len = context.length; i < len; ++i) {
+      c = i + start + 1;
+      context[i] = (c === line ? " >> " : "    ") + context[i];
+    }
 
-      // fail fast
-      if (!this.includes("", template)) {
-        if (in_recursion) {
-          return template;
-        } else {
-          this.send(template);
-          return;
-        }
-      }
+    e.template = template;
+    e.line = line;
+    e.file = file;
+    e.message = [file + ":" + line, context.join("\n"), "", e.message].join("\n");
 
-      // get the pragmas together
-      template = this.render_pragmas(template);
+    return e;
+  }
 
-      // render the template
-      var html = this.render_section(template, context, partials);
+  /**
+   * Looks up the value of the given `name` in the given context `stack`.
+   */
+  function findName(name, stack) {
+    var names = name.split(".");
+    var lastIndex = names.length - 1;
+    var target = names[lastIndex];
+
+    var value, context, i = stack.length, j, localStack;
+    while (i) {
+      localStack = stack.slice(0);
+      context = stack[--i];
+
+      j = 0;
+      while (j < lastIndex) {
+        context = context[names[j++]];
+
+        if (context == null) {
+          break;
+        }
 
-      // render_section did not find any sections, we still need to render the tags
-      if (html === false) {
-        html = this.render_tags(template, context, partials, in_recursion);
+        localStack.push(context);
       }
 
-      if (in_recursion) {
-        return html;
-      } else {
-        this.sendLines(html);
-      }
-    },
-
-    /*
-      Sends parsed lines
-    */
-    send: function (line) {
-      if (line !== "") {
-        this.buffer.push(line);
+      if (context && target in context) {
+        value = context[target];
+        break;
       }
-    },
+    }
 
-    sendLines: function (text) {
-      if (text) {
-        var lines = text.split("\n");
-        for (var i = 0; i < lines.length; i++) {
-          this.send(lines[i]);
-        }
-      }
-    },
-
-    /*
-      Looks for %PRAGMAS
-    */
-    render_pragmas: function (template) {
-      // no pragmas
-      if (!this.includes("%", template)) {
-        return template;
-      }
+    // If the value is a function, call it in the current context.
+    if (typeof value === "function") {
+      value = value.call(localStack[localStack.length - 1]);
+    }
+
+    return value == null ? "" : value;
+  }
 
-      var that = this;
-      var regex = this.getCachedRegex("render_pragmas", function (otag, ctag) {
-        return new RegExp(otag + "%([\\w-]+) ?([\\w]+=[\\w]+)?" + ctag, "g");
+  function sendSection(send, value, callback, stack, inverted) {
+    if (inverted) {
+      // From the spec: inverted sections may render text once based on the
+      // inverse value of the key. That is, they will be rendered if the key
+      // doesn't exist, is false, or is an empty list.
+      if (value == null || value === false || (isArray(value) && value.length === 0)) {
+        send(callback());
+      }
+    } else if (isArray(value)) {
+      forEach(value, function (value) {
+        stack.push(value);
+        send(callback());
+        stack.pop();
       });
+    } else if (typeof value === "object") {
+      stack.push(value);
+      send(callback());
+      stack.pop();
+    } else if (typeof value === "function") {
+      var scope = stack[stack.length - 1];
+      var scopedRender = function (template) {
+        return render(template, scope);
+      };
+      send(value.call(scope, callback(), scopedRender) || "");
+    } else if (value) {
+      send(callback());
+    }
+  }
 
-      return template.replace(regex, function (match, pragma, options) {
-        if (!that.pragmas_implemented[pragma]) {
-          throw({message:
-            "This implementation of mustache doesn't understand the '" +
-            pragma + "' pragma"});
-        }
-        that.pragmas[pragma] = {};
-        if (options) {
-          var opts = options.split("=");
-          that.pragmas[pragma][opts[0]] = opts[1];
+  /**
+   * Parses the given `template` and returns the source of a function that,
+   * with the proper arguments, will render the template. Recognized options
+   * include the following:
+   *
+   *   - file     The name of the file the template comes from (displayed in
+   *              error messages)
+   *   - tags     An array of open and close tags the `template` uses. Defaults
+   *              to the value of Mustache.tags
+   *   - debug    Set `true` to log the body of the generated function to the
+   *              console
+   *   - space    Set `true` to preserve whitespace from lines that otherwise
+   *              contain only a {{tag}}. Defaults to `false`
+   */
+  function parse(template, options) {
+    options = options || {};
+
+    var tags = options.tags || exports.tags,
+        openTag = tags[0],
+        closeTag = tags[tags.length - 1];
+
+    var code = [
+      "var line = 1;", // keep track of source line number
+      "\ntry {",
+      '\nsend("'
+    ];
+
+    var spaces = [],      // indices of whitespace in code for the current line
+        nonSpace = false; // is there a non-space char on the current line?
+
+    // Strips all space characters from the code array for the current line
+    // if there was a {{tag}} on it and otherwise only spaces.
+    var stripSpace = function () {
+      if (!nonSpace && !options.space) {
+        while (spaces.length) {
+          code.splice(spaces.pop(), 1);
         }
-        return "";
-        // ignore unknown pragmas silently
-      });
-    },
-
-    /*
-      Tries to find a partial in the curent scope and render it
-    */
-    render_partial: function (name, context, partials) {
-      name = trim(name);
-      if (!partials || partials[name] === undefined) {
-        throw({message: "unknown_partial '" + name + "'"});
-      }
-      if (!context || typeof context[name] != "object") {
-        return this.render(partials[name], context, partials, true);
-      }
-      return this.render(partials[name], context[name], partials, true);
-    },
-
-    /*
-      Renders inverted (^) and normal (#) sections
-    */
-    render_section: function (template, context, partials) {
-      if (!this.includes("#", template) && !this.includes("^", template)) {
-        // did not render anything, there were no sections
-        return false;
+      } else {
+        spaces = [];
       }
 
-      var that = this;
-
-      var regex = this.getCachedRegex("render_section", function (otag, ctag) {
-        // This regex matches _the first_ section ({{#foo}}{{/foo}}), and captures the remainder
-        return new RegExp(
-          "^([\\s\\S]*?)" +         // all the crap at the beginning that is not {{*}} ($1)
+      nonSpace = false;
+    };
+
+    // Returns a bit of code that can be used to find the given `name`.
+    var findFor = function (name) {
+      return name === "." ? "stack[stack.length - 1]" : 'find("' + name + '")';
+    };
+
+    var sectionStack = [], updateLine, nextOpenTag, nextCloseTag;
+
+    var setTags = function (source) {
+      tags = trim(source).split(/\s+/);
+      nextOpenTag = tags[0];
+      nextCloseTag = tags[tags.length - 1];
+    };
+
+    var includePartial = function (source) {
+      code.push(
+        '");',
+        updateLine,
+        '\nvar partial = partials["' + trim(source) + '"];',
+        '\nif (partial) {',
+        '\n  send(render(partial, stack[stack.length - 1], partials));',
+        '\n}',
+        '\nsend("'
+      );
+    };
+
+    var openSection = function (source, inverted) {
+      var name = trim(source);
+
+      if (name === "") {
+        throw debug(new Error("Section name may not be empty"), template, line, options.file);
+      }
 
-          otag +                    // {{
-          "(\\^|\\#)\\s*(.+)\\s*" + //  #foo (# == $2, foo == $3)
-          ctag +                    // }}
+      sectionStack.push({name: name, inverted: inverted});
+
+      code.push(
+        '");',
+        updateLine,
+        '\nvar value = ' + findFor(name) + ';',
+        '\nvar callback = (function () {',
+        '\n  var buffer, send = function (chunk) { buffer.push(chunk); };',
+        '\n  return function () {',
+        '\n    buffer = [];',
+        '\nsend("'
+      );
+    };
+
+    var openInvertedSection = function (source) {
+      openSection(source, true);
+    };
+
+    var closeSection = function (source) {
+      var name = trim(source);
+      var openName = sectionStack.length != 0 && sectionStack[sectionStack.length - 1].name;
+
+      if (!openName || name != openName) {
+        throw debug(new Error('Section named "' + name + '" was never opened'), template, line, file);
+      }
 
-          "\n*([\\s\\S]*?)" +       // between the tag ($2). leading newlines are dropped
+      var section = sectionStack.pop();
 
-          otag +                    // {{
-          "\\/\\s*\\3\\s*" +        //  /foo (backreference to the opening tag).
-          ctag +                    // }}
+      code.push(
+        '");',
+        '\n    return buffer.join("");',
+        '\n  };',
+        '\n})();'
+      );
 
-          "\\s*([\\s\\S]*)$",       // everything else in the string ($4). leading whitespace is dropped.
+      if (section.inverted) {
+        code.push("\nsendSection(send,value,callback,stack,true);");
+      } else {
+        code.push("\nsendSection(send,value,callback,stack);");
+      }
 
-        "g");
-      });
+      code.push('\nsend("');
+    };
+
+    var sendPlain = function (source) {
+      code.push(
+        '");',
+        updateLine,
+        '\nsend(' + findFor(trim(source)) + ');',
+        '\nsend("'
+      );
+    };
+
+    var sendEscaped = function (source) {
+      code.push(
+        '");',
+        updateLine,
+        '\nsend(escapeHTML(' + findFor(trim(source)) + '));',
+        '\nsend("'
+      );
+    };
+
+    var line = 1, c, callback;
+    for (var i = 0, len = template.length; i < len; ++i) {
+      if (template.slice(i, i + openTag.length) === openTag) {
+        i += openTag.length;
+        c = template.substr(i, 1);
+        updateLine = '\nline = ' + line + ';';
+        nextOpenTag = openTag;
+        nextCloseTag = closeTag;
+
+        switch (c) {
+        case "!": // comment
+          i++;
+          callback = null;
+          break;
+        case "=": // change open/close tags, e.g. {{=<% %>=}}
+          i++;
+          closeTag = "=" + closeTag;
+          callback = setTags;
+          break;
+        case ">": // include partial
+          i++;
+          callback = includePartial;
+          break;
+        case "#": // start section
+          i++;
+          callback = openSection;
+          break;
+        case "^": // start inverted section
+          i++;
+          callback = openInvertedSection;
+          break;
+        case "/": // end section
+          i++;
+          callback = closeSection;
+          break;
+        case "{": // plain variable
+          closeTag = "}" + closeTag;
+          // fall through
+        case "&": // plain variable
+          i++;
+          nonSpace = true;
+          callback = sendPlain;
+          break;
+        default: // escaped variable
+          nonSpace = true;
+          callback = sendEscaped;
+        }
 
+        var end = template.indexOf(closeTag, i);
 
-      // for each {{#foo}}{{/foo}} section do...
-      return template.replace(regex, function (match, before, type, name, content, after) {
-        // before contains only tags, no sections
-        var renderedBefore = before ? that.render_tags(before, context, partials, true) : "",
+        if (end === -1) {
+          throw debug(new Error('Tag "' + openTag + '" was not closed properly'), template, line, options.file);
+        }
 
-        // after may contain both sections and tags, so use full rendering function
-            renderedAfter = after ? that.render(after, context, partials, true) : "",
+        var source = template.substring(i, end);
 
-        // will be computed below
-            renderedContent,
+        if (callback) {
+          callback(source);
+        }
 
-            value = that.find(name, context);
+        // Maintain line count for \n in source.
+        var n = 0;
+        while (~(n = source.indexOf("\n", n))) {
+          line++;
+          n++;
+        }
 
-        if (type === "^") { // inverted section
-          if (!value || Array.isArray(value) && value.length === 0) {
-            // false or empty list, render it
-            renderedContent = that.render(content, context, partials, true);
-          } else {
-            renderedContent = "";
-          }
-        } else if (type === "#") { // normal section
-          if (Array.isArray(value)) { // Enumerable, Let's loop!
-            renderedContent = that.map(value, function (row) {
-              return that.render(content, that.create_context(row), partials, true);
-            }).join("");
-          } else if (that.is_object(value)) { // Object, Use it as subcontext!
-            renderedContent = that.render(content, that.create_context(value),
-              partials, true);
-          } else if (typeof value == "function") {
-            // higher order section
-            renderedContent = value.call(context, content, function (text) {
-              return that.render(text, context, partials, true);
-            });
-          } else if (value) { // boolean section
-            renderedContent = that.render(content, context, partials, true);
+        i = end + closeTag.length - 1;
+        openTag = nextOpenTag;
+        closeTag = nextCloseTag;
+      } else {
+        c = template.substr(i, 1);
+
+        switch (c) {
+        case '"':
+        case "\\":
+          nonSpace = true;
+          code.push("\\" + c);
+          break;
+        case "\n":
+          spaces.push(code.length);
+          code.push("\\n");
+          stripSpace(); // Check for whitespace on the current line.
+          line++;
+          break;
+        default:
+          if (isWhitespace(c)) {
+            spaces.push(code.length);
           } else {
-            renderedContent = "";
+            nonSpace = true;
           }
-        }
 
-        return renderedBefore + renderedContent + renderedAfter;
-      });
-    },
-
-    /*
-      Replace {{foo}} and friends with values from our view
-    */
-    render_tags: function (template, context, partials, in_recursion) {
-      // tit for tat
-      var that = this;
-
-      var new_regex = function () {
-        return that.getCachedRegex("render_tags", function (otag, ctag) {
-          return new RegExp(otag + "(=|!|>|&|\\{|%)?([^#\\^]+?)\\1?" + ctag + "+", "g");
-        });
-      };
-
-      var regex = new_regex();
-      var tag_replace_callback = function (match, operator, name) {
-        switch(operator) {
-        case "!": // ignore comments
-          return "";
-        case "=": // set new delimiters, rebuild the replace regexp
-          that.set_delimiters(name);
-          regex = new_regex();
-          return "";
-        case ">": // render partial
-          return that.render_partial(name, context, partials);
-        case "{": // the triple mustache is unescaped
-        case "&": // & operator is an alternative unescape method
-          return that.find(name, context);
-        default: // escape the value
-          return escapeHTML(that.find(name, context));
-        }
-      };
-      var lines = template.split("\n");
-      for(var i = 0; i < lines.length; i++) {
-        lines[i] = lines[i].replace(regex, tag_replace_callback, this);
-        if (!in_recursion) {
-          this.send(lines[i]);
+          code.push(c);
         }
       }
+    }
 
-      if (in_recursion) {
-        return lines.join("\n");
-      }
-    },
-
-    set_delimiters: function (delimiters) {
-      var dels = delimiters.split(" ");
-      this.otag = this.escape_regex(dels[0]);
-      this.ctag = this.escape_regex(dels[1]);
-    },
-
-    escape_regex: function (text) {
-      // thank you Simon Willison
-      if (!arguments.callee.sRE) {
-        var specials = [
-          '/', '.', '*', '+', '?', '|',
-          '(', ')', '[', ']', '{', '}', '\\'
-        ];
-        arguments.callee.sRE = new RegExp(
-          '(\\' + specials.join('|\\') + ')', 'g'
-        );
-      }
-      return text.replace(arguments.callee.sRE, '\\$1');
-    },
-
-    /*
-      find `name` in current `context`. That is find me a value
-      from the view object
-    */
-    find: function (name, context) {
-      name = trim(name);
-
-      // Checks whether a value is thruthy or false or 0
-      function is_kinda_truthy(bool) {
-        return bool === false || bool === 0 || bool;
-      }
+    if (sectionStack.length != 0) {
+      throw debug(new Error('Section "' + sectionStack[sectionStack.length - 1].name + '" was not closed properly'), template, line, options.file);
+    }
 
-      var value;
+    // Clean up any whitespace from a closing {{tag}} that was at the end
+    // of the template without a trailing \n.
+    stripSpace();
 
-      // check for dot notation eg. foo.bar
-      if (name.match(/([a-z_]+)\./ig)) {
-        var childValue = this.walk_context(name, context);
-        if (is_kinda_truthy(childValue)) {
-          value = childValue;
-        }
-      } else {
-        if (is_kinda_truthy(context[name])) {
-          value = context[name];
-        } else if (is_kinda_truthy(this.context[name])) {
-          value = this.context[name];
-        }
-      }
+    code.push(
+      '");',
+      "\nsend(null);", // Send null as the last operation.
+      "\n} catch (e) { throw {error: e, line: line}; }"
+    );
 
-      if (typeof value == "function") {
-        return value.apply(context);
-      }
-      if (value !== undefined) {
-        return value;
-      }
-      // silently ignore unkown variables
-      return "";
-    },
-
-    walk_context: function (name, context) {
-      var path = name.split('.');
-      // if the var doesn't exist in current context, check the top level context
-      var value_context = (context[path[0]] != undefined) ? context : this.context;
-      var value = value_context[path.shift()];
-      while (value != undefined && path.length > 0) {
-        value_context = value;
-        value = value[path.shift()];
+    // Ignore empty send("") statements.
+    var body = code.join("").replace(/send\(""\);\n/g, "");
+
+    if (options.debug) {
+      if (typeof console != "undefined" && console.log) {
+        console.log(body);
+      } else if (typeof print === "function") {
+        print(body);
       }
-      // if the value is a function, call it, binding the correct context
-      if (typeof value == "function") {
-        return value.apply(value_context);
+    }
+
+    return body;
+  }
+
+  /**
+   * Used by `compile` to generate a reusable function for the given `template`.
+   */
+  function _compile(template, options) {
+    var args = "view,partials,send,stack,find,escapeHTML,sendSection,render";
+    var body = parse(template, options);
+    var fn = new Function(args, body);
+
+    // This anonymous function wraps the generated function so we can do
+    // argument coercion, setup some variables, and handle any errors
+    // encountered while executing it.
+    return function (view, partials, callback) {
+      if (typeof partials === "function") {
+        callback = partials;
+        partials = {};
       }
-      return value;
-    },
 
-    // Utility methods
+      partials = partials || {};
 
-    /* includes tag */
-    includes: function (needle, haystack) {
-      return haystack.indexOf(this.otag + needle) != -1;
-    },
+      var buffer = []; // output buffer
 
-    // by @langalex, support for arrays of strings
-    create_context: function (_context) {
-      if (this.is_object(_context)) {
-        return _context;
-      } else {
-        var iterator = ".";
-        if (this.pragmas["IMPLICIT-ITERATOR"]) {
-          iterator = this.pragmas["IMPLICIT-ITERATOR"].iterator;
-        }
-        var ctx = {};
-        ctx[iterator] = _context;
-        return ctx;
-      }
-    },
-
-    is_object: function (a) {
-      return a && typeof a == "object";
-    },
-
-    /*
-      Why, why, why? Because IE. Cry, cry cry.
-    */
-    map: function (array, fn) {
-      if (typeof array.map == "function") {
-        return array.map(fn);
-      } else {
-        var r = [];
-        var l = array.length;
-        for(var i = 0; i < l; i++) {
-          r.push(fn(array[i]));
-        }
-        return r;
-      }
-    },
+      var send = callback || function (chunk) {
+        buffer.push(chunk);
+      };
 
-    getCachedRegex: function (name, generator) {
-      var byOtag = regexCache[this.otag];
-      if (!byOtag) {
-        byOtag = regexCache[this.otag] = {};
-      }
+      var stack = [view]; // context stack
 
-      var byCtag = byOtag[this.ctag];
-      if (!byCtag) {
-        byCtag = byOtag[this.ctag] = {};
-      }
+      var find = function (name) {
+        return findName(name, stack);
+      };
 
-      var regex = byCtag[name];
-      if (!regex) {
-        regex = byCtag[name] = generator(this.otag, this.ctag);
+      try {
+        fn(view, partials, send, stack, find, escapeHTML, sendSection, render);
+      } catch (e) {
+        throw debug(e.error, template, e.line, options.file);
       }
 
-      return regex;
-    }
-  };
+      return buffer.join("");
+    };
+  }
 
-  return({
-    name: "mustache.js",
-    version: "0.5.0-dev",
-
-    /*
-      Turns a template and view into HTML
-    */
-    to_html: function (template, view, partials, send_fun) {
-      var renderer = new Renderer();
-      if (send_fun) {
-        renderer.send = send_fun;
-      }
-      renderer.render(template, view || {}, partials);
-      if (!send_fun) {
-        return renderer.buffer.join("\n");
+  // Cache of pre-compiled templates.
+  var _cache = {};
+
+  /**
+   * Clear the cache of compiled templates.
+   */
+  function clearCache() {
+    _cache = {};
+  }
+
+  /**
+   * Compiles the given `template` into a reusable function using the given
+   * `options`. In addition to the options accepted by Mustache.parse,
+   * recognized options include the following:
+   *
+   *   - cache    Set `false` to bypass any pre-compiled version of the given
+   *              template. Otherwise, a given `template` string will be cached
+   *              the first time it is parsed
+   */
+  function compile(template, options) {
+    options = options || {};
+
+    // Use a pre-compiled version from the cache if we have one.
+    if (options.cache !== false) {
+      if (!_cache[template]) {
+        _cache[template] = _compile(template, options);
       }
+
+      return _cache[template];
     }
-  });
-}();
+
+    return _compile(template, options);
+  }
+
+  /**
+   * High-level function that renders the given `template` using the given
+   * `view`, `partials`, and `callback`. The `callback` is used to return the
+   * output piece by piece, as it is rendered. When finished, the callback will
+   * receive `null` as its argument, after which it will not be called any more.
+   * If no callback is given, the complete rendered template will be used as the
+   * return value for the function.
+   *
+   * Note: If no partials are needed, the third argument may be the callback.
+   * If you need to use any of the template options (see `compile` above), you
+   * must compile in a separate step, and then call that compiled function.
+   */
+  function render(template, view, partials, callback) {
+    return compile(template)(view, partials, callback);
+  }
+
+})(Mustache);
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..874404b
--- /dev/null
+++ b/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "mustache",
+  "version": "0.4.0",
+  "description": "Logic-less {{mustache}} templates with JavaScript",
+  "author": "mustache.js Authors <http://github.com/janl/mustache.js>",
+  "keywords": ["mustache", "template", "templates", "ejs"],
+  "main": "./mustache"
+}
diff --git a/spec/_files/array_of_partials_implicit_partial.js b/spec/_files/array_of_partials_implicit_partial.js
deleted file mode 100644
index fcdf3b0..0000000
--- a/spec/_files/array_of_partials_implicit_partial.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var partial_context = { 
-  numbers: ['1', '2', '3', '4']
-};
diff --git a/spec/_files/array_of_strings.mustache b/spec/_files/array_of_strings.mustache
index 2898705..4d65738 100644
--- a/spec/_files/array_of_strings.mustache
+++ b/spec/_files/array_of_strings.mustache
@@ -1 +1 @@
-{{#array_of_strings}}{{.}} {{/array_of_strings}}
\ No newline at end of file
+{{#array_of_strings}}{{.}} {{/array_of_strings}}
diff --git a/spec/_files/array_of_strings_options.js b/spec/_files/array_of_strings_options.js
deleted file mode 100644
index 2e29adf..0000000
--- a/spec/_files/array_of_strings_options.js
+++ /dev/null
@@ -1 +0,0 @@
-var array_of_strings_options = {array_of_strings_options: ['hello', 'world']};
diff --git a/spec/_files/array_of_strings_options.mustache b/spec/_files/array_of_strings_options.mustache
deleted file mode 100644
index 6b28278..0000000
--- a/spec/_files/array_of_strings_options.mustache
+++ /dev/null
@@ -1,2 +0,0 @@
-{{%IMPLICIT-ITERATOR iterator=rob}}
-{{#array_of_strings_options}}{{rob}} {{/array_of_strings_options}}
\ No newline at end of file
diff --git a/spec/_files/array_of_strings_options.txt b/spec/_files/array_of_strings_options.txt
deleted file mode 100644
index 4a1f475..0000000
--- a/spec/_files/array_of_strings_options.txt
+++ /dev/null
@@ -1 +0,0 @@
-hello world 
diff --git a/spec/_files/array_partial.js b/spec/_files/array_partial.js
deleted file mode 100644
index 88d7592..0000000
--- a/spec/_files/array_partial.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var partial_context = { 
-  partial: {
-    array: ['1', '2', '3', '4']
-  }
-};
\ No newline at end of file
diff --git a/spec/_files/changing_delimiters.js b/spec/_files/changing_delimiters.js
new file mode 100644
index 0000000..4fbe9f3
--- /dev/null
+++ b/spec/_files/changing_delimiters.js
@@ -0,0 +1,4 @@
+var changing_delimiters = {
+  "foo": "foooooooooooooo",
+  "bar":"<b>bar!</b>"
+};
diff --git a/spec/_files/changing_delimiters.mustache b/spec/_files/changing_delimiters.mustache
new file mode 100644
index 0000000..0cd044c
--- /dev/null
+++ b/spec/_files/changing_delimiters.mustache
@@ -0,0 +1 @@
+{{=<% %>=}}<% foo %> {{foo}} <%{bar}%> {{{bar}}}
diff --git a/spec/_files/changing_delimiters.txt b/spec/_files/changing_delimiters.txt
new file mode 100644
index 0000000..1b1510d
--- /dev/null
+++ b/spec/_files/changing_delimiters.txt
@@ -0,0 +1 @@
+foooooooooooooo {{foo}} <b>bar!</b> {{{bar}}}
diff --git a/spec/_files/complex.mustache b/spec/_files/complex.mustache
index 23bec3c..869a4f0 100644
--- a/spec/_files/complex.mustache
+++ b/spec/_files/complex.mustache
@@ -13,4 +13,4 @@
 {{/list}}
 {{#empty}}
   <p>The list is empty.</p>
-{{/empty}}
\ No newline at end of file
+{{/empty}}
diff --git a/spec/_files/complex.txt b/spec/_files/complex.txt
index b51ca10..596d3f6 100644
--- a/spec/_files/complex.txt
+++ b/spec/_files/complex.txt
@@ -1,6 +1,6 @@
 <h1>Colors</h1>
   <ul>
-      <li><strong>red</strong></li>
-      <li><a href="#Green">green</a></li>
-      <li><a href="#Blue">blue</a></li>
+  <li><strong>red</strong></li>
+  <li><a href="#Green">green</a></li>
+  <li><a href="#Blue">blue</a></li>
   </ul>
diff --git a/spec/_files/context_lookup.js b/spec/_files/context_lookup.js
new file mode 100644
index 0000000..49d4453
--- /dev/null
+++ b/spec/_files/context_lookup.js
@@ -0,0 +1,8 @@
+var context_lookup = {
+  "outer": {
+    "id": 1,
+    "second": {
+      "nothing": 2
+    }
+  }
+};
diff --git a/spec/_files/context_lookup.mustache b/spec/_files/context_lookup.mustache
new file mode 100644
index 0000000..3c7b767
--- /dev/null
+++ b/spec/_files/context_lookup.mustache
@@ -0,0 +1 @@
+{{#outer}}{{#second}}{{id}}{{/second}}{{/outer}}
diff --git a/spec/_files/context_lookup.txt b/spec/_files/context_lookup.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/spec/_files/context_lookup.txt
@@ -0,0 +1 @@
+1
diff --git a/spec/_files/delimiters.mustache b/spec/_files/delimiters.mustache
index a73e061..7fac846 100644
--- a/spec/_files/delimiters.mustache
+++ b/spec/_files/delimiters.mustache
@@ -4,4 +4,4 @@
 <%=| |=%>
 * | third |
 |={{ }}=|
-* {{ fourth }}
\ No newline at end of file
+* {{ fourth }}
diff --git a/spec/_files/disappearing_whitespace.js b/spec/_files/disappearing_whitespace.js
new file mode 100644
index 0000000..3fe7121
--- /dev/null
+++ b/spec/_files/disappearing_whitespace.js
@@ -0,0 +1,4 @@
+var disappearing_whitespace = {
+  bedrooms: true,
+  total: 1
+};
diff --git a/spec/_files/disappearing_whitespace.mustache b/spec/_files/disappearing_whitespace.mustache
new file mode 100644
index 0000000..16c16e0
--- /dev/null
+++ b/spec/_files/disappearing_whitespace.mustache
@@ -0,0 +1 @@
+{{#bedrooms}}{{total}}{{/bedrooms}} BED
diff --git a/spec/_files/disappearing_whitespace.txt b/spec/_files/disappearing_whitespace.txt
new file mode 100644
index 0000000..66e98ef
--- /dev/null
+++ b/spec/_files/disappearing_whitespace.txt
@@ -0,0 +1 @@
+1 BED
diff --git a/spec/_files/empty_list.js b/spec/_files/empty_list.js
new file mode 100644
index 0000000..80555c0
--- /dev/null
+++ b/spec/_files/empty_list.js
@@ -0,0 +1,3 @@
+var empty_list = {
+    jobs: []
+};
diff --git a/spec/_files/empty_list.mustache b/spec/_files/empty_list.mustache
new file mode 100644
index 0000000..4fdf13d
--- /dev/null
+++ b/spec/_files/empty_list.mustache
@@ -0,0 +1,4 @@
+These are the jobs:
+{{#jobs}}
+{{.}}
+{{/jobs}}
diff --git a/spec/_files/empty_list.txt b/spec/_files/empty_list.txt
new file mode 100644
index 0000000..d9b4a67
--- /dev/null
+++ b/spec/_files/empty_list.txt
@@ -0,0 +1 @@
+These are the jobs:
diff --git a/spec/_files/empty_partial.2.mustache b/spec/_files/empty_partial.2.mustache
deleted file mode 100644
index b920295..0000000
--- a/spec/_files/empty_partial.2.mustache
+++ /dev/null
@@ -1 +0,0 @@
-yo
\ No newline at end of file
diff --git a/spec/_files/empty_partial.js b/spec/_files/empty_partial.js
deleted file mode 100644
index 9cc53c6..0000000
--- a/spec/_files/empty_partial.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var partial_context = {
-  foo: 1
-};
diff --git a/spec/_files/empty_string.js b/spec/_files/empty_string.js
new file mode 100644
index 0000000..2151336
--- /dev/null
+++ b/spec/_files/empty_string.js
@@ -0,0 +1,6 @@
+var empty_string = {
+  description: "That is all!",
+  child: {
+    description: ""
+  }
+};
diff --git a/spec/_files/empty_string.mustache b/spec/_files/empty_string.mustache
new file mode 100644
index 0000000..f568441
--- /dev/null
+++ b/spec/_files/empty_string.mustache
@@ -0,0 +1 @@
+{{description}}{{#child}}{{description}}{{/child}}
diff --git a/spec/_files/empty_string.txt b/spec/_files/empty_string.txt
new file mode 100644
index 0000000..22e2a6e
--- /dev/null
+++ b/spec/_files/empty_string.txt
@@ -0,0 +1 @@
+That is all!
diff --git a/spec/_files/empty_template.txt b/spec/_files/empty_template.txt
index 60652b6..bb2367a 100644
--- a/spec/_files/empty_template.txt
+++ b/spec/_files/empty_template.txt
@@ -1 +1 @@
-<html><head></head><body><h1>Test</h1></body></html>
+<html><head></head><body><h1>Test</h1></body></html>
\ No newline at end of file
diff --git a/spec/_files/error_not_found.txt b/spec/_files/error_not_found.txt
index 8b13789..e69de29 100644
--- a/spec/_files/error_not_found.txt
+++ b/spec/_files/error_not_found.txt
@@ -1 +0,0 @@
-
diff --git a/spec/_files/included_tag.js b/spec/_files/included_tag.js
new file mode 100644
index 0000000..a63df27
--- /dev/null
+++ b/spec/_files/included_tag.js
@@ -0,0 +1,3 @@
+var included_tag = {
+  html: "I like {{mustache}}"
+};
diff --git a/spec/_files/included_tag.mustache b/spec/_files/included_tag.mustache
new file mode 100644
index 0000000..70631c2
--- /dev/null
+++ b/spec/_files/included_tag.mustache
@@ -0,0 +1 @@
+You said "{{{html}}}" today
diff --git a/spec/_files/included_tag.txt b/spec/_files/included_tag.txt
new file mode 100644
index 0000000..1af4556
--- /dev/null
+++ b/spec/_files/included_tag.txt
@@ -0,0 +1 @@
+You said "I like {{mustache}}" today
diff --git a/spec/_files/inverted_section.txt b/spec/_files/inverted_section.txt
index 5fd0de1..06d5d66 100644
--- a/spec/_files/inverted_section.txt
+++ b/spec/_files/inverted_section.txt
@@ -1 +1,2 @@
+
 No repos :(
diff --git a/spec/_files/nested_iterating.js b/spec/_files/nested_iterating.js
new file mode 100644
index 0000000..a8275f9
--- /dev/null
+++ b/spec/_files/nested_iterating.js
@@ -0,0 +1,8 @@
+var nested_iterating = {
+  inner: [{
+    foo: 'foo',
+    inner: [{
+      bar: 'bar'
+    }]
+  }]
+};
diff --git a/spec/_files/nested_iterating.mustache b/spec/_files/nested_iterating.mustache
new file mode 100644
index 0000000..1a3bb1a
--- /dev/null
+++ b/spec/_files/nested_iterating.mustache
@@ -0,0 +1 @@
+{{#inner}}{{foo}}{{#inner}}{{bar}}{{/inner}}{{/inner}}
diff --git a/spec/_files/nested_iterating.txt b/spec/_files/nested_iterating.txt
new file mode 100644
index 0000000..323fae0
--- /dev/null
+++ b/spec/_files/nested_iterating.txt
@@ -0,0 +1 @@
+foobar
diff --git a/spec/_files/nesting.txt b/spec/_files/nesting.txt
index caf5afd..7db34b1 100644
--- a/spec/_files/nesting.txt
+++ b/spec/_files/nesting.txt
@@ -1,4 +1,3 @@
-      1
-        2
-        3
-  
+    1
+    2
+    3
diff --git a/spec/_files/nesting_same_name.js b/spec/_files/nesting_same_name.js
new file mode 100644
index 0000000..a5fb65b
--- /dev/null
+++ b/spec/_files/nesting_same_name.js
@@ -0,0 +1,8 @@
+var nesting_same_name = {
+  items: [
+    {
+      name: 'name',
+      items: [1, 2, 3, 4]
+    }
+  ]
+};
diff --git a/spec/_files/nesting_same_name.mustache b/spec/_files/nesting_same_name.mustache
new file mode 100644
index 0000000..777dbd6
--- /dev/null
+++ b/spec/_files/nesting_same_name.mustache
@@ -0,0 +1 @@
+{{#items}}{{name}}{{#items}}{{.}}{{/items}}{{/items}}
diff --git a/spec/_files/nesting_same_name.txt b/spec/_files/nesting_same_name.txt
new file mode 100644
index 0000000..34fcfd3
--- /dev/null
+++ b/spec/_files/nesting_same_name.txt
@@ -0,0 +1 @@
+name1234
diff --git a/spec/_files/null_string.js b/spec/_files/null_string.js
index 93414a1..ab5291f 100644
--- a/spec/_files/null_string.js
+++ b/spec/_files/null_string.js
@@ -3,6 +3,7 @@ var null_string = {
   glytch: true,
   binary: false,
   value: null,
+  undef: undefined,
   numeric: function() {
     return NaN;
   }
diff --git a/spec/_files/null_string.mustache b/spec/_files/null_string.mustache
index 12bcb08..a6f3300 100644
--- a/spec/_files/null_string.mustache
+++ b/spec/_files/null_string.mustache
@@ -2,4 +2,5 @@ Hello {{name}}
 glytch {{glytch}}
 binary {{binary}}
 value {{value}}
-numeric {{numeric}}
\ No newline at end of file
+undef {{undef}}
+numeric {{numeric}}
diff --git a/spec/_files/null_string.txt b/spec/_files/null_string.txt
index 827569b..bcabe0a 100644
--- a/spec/_files/null_string.txt
+++ b/spec/_files/null_string.txt
@@ -2,4 +2,5 @@ Hello Elise
 glytch true
 binary false
 value 
+undef 
 numeric NaN
diff --git a/spec/_files/partial_array.js b/spec/_files/partial_array.js
new file mode 100644
index 0000000..f16e9eb
--- /dev/null
+++ b/spec/_files/partial_array.js
@@ -0,0 +1,3 @@
+var partial_array = {
+  array: ['1', '2', '3', '4']
+};
\ No newline at end of file
diff --git a/spec/_files/array_partial.mustache b/spec/_files/partial_array.mustache
similarity index 100%
rename from spec/_files/array_partial.mustache
rename to spec/_files/partial_array.mustache
diff --git a/spec/_files/array_partial.2.mustache b/spec/_files/partial_array.partial
similarity index 83%
rename from spec/_files/array_partial.2.mustache
rename to spec/_files/partial_array.partial
index 235dd5f..0ba652c 100644
--- a/spec/_files/array_partial.2.mustache
+++ b/spec/_files/partial_array.partial
@@ -1,4 +1,4 @@
 Here's a non-sense array of values
 {{#array}}
   {{.}}
-{{/array}}
\ No newline at end of file
+{{/array}}
diff --git a/spec/_files/array_partial.txt b/spec/_files/partial_array.txt
similarity index 98%
rename from spec/_files/array_partial.txt
rename to spec/_files/partial_array.txt
index fd5f48e..892837c 100644
--- a/spec/_files/array_partial.txt
+++ b/spec/_files/partial_array.txt
@@ -3,4 +3,3 @@ Here's a non-sense array of values
   2
   3
   4
-
diff --git a/spec/_files/array_of_partials_partial.js b/spec/_files/partial_array_of_partials.js
similarity index 61%
rename from spec/_files/array_of_partials_partial.js
rename to spec/_files/partial_array_of_partials.js
index 45611cf..706e7ed 100644
--- a/spec/_files/array_of_partials_partial.js
+++ b/spec/_files/partial_array_of_partials.js
@@ -1,3 +1,3 @@
-var partial_context = { 
+var partial_array_of_partials = { 
   numbers: [{i: '1'}, {i: '2'}, {i: '3'}, {i: '4'}]
 };
diff --git a/spec/_files/array_of_partials_implicit_partial.mustache b/spec/_files/partial_array_of_partials.mustache
similarity index 100%
rename from spec/_files/array_of_partials_implicit_partial.mustache
rename to spec/_files/partial_array_of_partials.mustache
diff --git a/spec/_files/array_of_partials_partial.2.mustache b/spec/_files/partial_array_of_partials.partial
similarity index 100%
rename from spec/_files/array_of_partials_partial.2.mustache
rename to spec/_files/partial_array_of_partials.partial
diff --git a/spec/_files/array_of_partials_implicit_partial.txt b/spec/_files/partial_array_of_partials.txt
similarity index 100%
rename from spec/_files/array_of_partials_implicit_partial.txt
rename to spec/_files/partial_array_of_partials.txt
diff --git a/spec/_files/partial_array_of_partials_implicit.js b/spec/_files/partial_array_of_partials_implicit.js
new file mode 100644
index 0000000..864efa3
--- /dev/null
+++ b/spec/_files/partial_array_of_partials_implicit.js
@@ -0,0 +1,3 @@
+var partial_array_of_partials_implicit = { 
+  numbers: ['1', '2', '3', '4']
+};
diff --git a/spec/_files/array_of_partials_partial.mustache b/spec/_files/partial_array_of_partials_implicit.mustache
similarity index 100%
rename from spec/_files/array_of_partials_partial.mustache
rename to spec/_files/partial_array_of_partials_implicit.mustache
diff --git a/spec/_files/array_of_partials_implicit_partial.2.mustache b/spec/_files/partial_array_of_partials_implicit.partial
similarity index 100%
rename from spec/_files/array_of_partials_implicit_partial.2.mustache
rename to spec/_files/partial_array_of_partials_implicit.partial
diff --git a/spec/_files/array_of_partials_partial.txt b/spec/_files/partial_array_of_partials_implicit.txt
similarity index 100%
rename from spec/_files/array_of_partials_partial.txt
rename to spec/_files/partial_array_of_partials_implicit.txt
diff --git a/spec/_files/partial_empty.js b/spec/_files/partial_empty.js
new file mode 100644
index 0000000..3f36df6
--- /dev/null
+++ b/spec/_files/partial_empty.js
@@ -0,0 +1,3 @@
+var partial_empty = {
+  foo: 1
+};
diff --git a/spec/_files/empty_partial.mustache b/spec/_files/partial_empty.mustache
similarity index 100%
rename from spec/_files/empty_partial.mustache
rename to spec/_files/partial_empty.mustache
diff --git a/spec/_files/partial_empty.partial b/spec/_files/partial_empty.partial
new file mode 100644
index 0000000..e69de29
diff --git a/spec/_files/empty_partial.txt b/spec/_files/partial_empty.txt
similarity index 66%
rename from spec/_files/empty_partial.txt
rename to spec/_files/partial_empty.txt
index 90d2b9f..1a67907 100644
--- a/spec/_files/empty_partial.txt
+++ b/spec/_files/partial_empty.txt
@@ -1,2 +1 @@
 hey 1
-yo
diff --git a/spec/_files/partial_recursion.js b/spec/_files/partial_recursion.js
index ad1f2eb..3094eba 100644
--- a/spec/_files/partial_recursion.js
+++ b/spec/_files/partial_recursion.js
@@ -1,4 +1,4 @@
-var partial_context = {
+var partial_recursion = {
   name: '1',
   kids: [
     {
diff --git a/spec/_files/partial_recursion.mustache b/spec/_files/partial_recursion.mustache
index d965a6a..3c3651a 100644
--- a/spec/_files/partial_recursion.mustache
+++ b/spec/_files/partial_recursion.mustache
@@ -1,4 +1,4 @@
 {{name}}
 {{#kids}}
 {{>partial}}
-{{/kids}}
\ No newline at end of file
+{{/kids}}
diff --git a/spec/_files/partial_recursion.2.mustache b/spec/_files/partial_recursion.partial
similarity index 72%
rename from spec/_files/partial_recursion.2.mustache
rename to spec/_files/partial_recursion.partial
index 457d2a0..ba6f8fa 100644
--- a/spec/_files/partial_recursion.2.mustache
+++ b/spec/_files/partial_recursion.partial
@@ -1,4 +1,4 @@
 {{name}}
 {{#children}}
 {{>partial}}
-{{/children}}
\ No newline at end of file
+{{/children}}
diff --git a/spec/_files/partial_template.js b/spec/_files/partial_template.js
new file mode 100644
index 0000000..196f1e8
--- /dev/null
+++ b/spec/_files/partial_template.js
@@ -0,0 +1,6 @@
+var partial_template = {
+  title: function() {
+    return "Welcome";
+  },
+  again: "Goodbye"
+};
diff --git a/spec/_files/template_partial.mustache b/spec/_files/partial_template.mustache
similarity index 59%
rename from spec/_files/template_partial.mustache
rename to spec/_files/partial_template.mustache
index 6a09372..6a7492e 100644
--- a/spec/_files/template_partial.mustache
+++ b/spec/_files/partial_template.mustache
@@ -1,2 +1,2 @@
 <h1>{{title}}</h1>
-{{>partial}}
\ No newline at end of file
+{{>partial}}
diff --git a/spec/_files/partial_template.partial b/spec/_files/partial_template.partial
new file mode 100644
index 0000000..a404529
--- /dev/null
+++ b/spec/_files/partial_template.partial
@@ -0,0 +1 @@
+Again, {{again}}!
diff --git a/spec/_files/template_partial.txt b/spec/_files/partial_template.txt
similarity index 100%
rename from spec/_files/template_partial.txt
rename to spec/_files/partial_template.txt
diff --git a/spec/_files/partial_view.js b/spec/_files/partial_view.js
new file mode 100644
index 0000000..4ea8a12
--- /dev/null
+++ b/spec/_files/partial_view.js
@@ -0,0 +1,16 @@
+var partial_view = {
+  greeting: function() {
+    return "Welcome";
+  },
+
+  farewell: function() {
+    return "Fair enough, right?";
+  },
+
+  name: "Chris",
+  value: 10000,
+  taxed_value: function() {
+    return this.value - (this.value * 0.4);
+  },
+  in_ca: true
+};
diff --git a/spec/_files/view_partial.mustache b/spec/_files/partial_view.mustache
similarity index 61%
rename from spec/_files/view_partial.mustache
rename to spec/_files/partial_view.mustache
index 8f0c08d..f8f6a5b 100644
--- a/spec/_files/view_partial.mustache
+++ b/spec/_files/partial_view.mustache
@@ -1,3 +1,3 @@
 <h1>{{greeting}}</h1>
 {{>partial}}
-<h3>{{farewell}}</h3>
\ No newline at end of file
+<h3>{{farewell}}</h3>
diff --git a/spec/_files/view_partial.2.mustache b/spec/_files/partial_view.partial
similarity index 100%
rename from spec/_files/view_partial.2.mustache
rename to spec/_files/partial_view.partial
diff --git a/spec/_files/view_partial.txt b/spec/_files/partial_view.txt
similarity index 99%
rename from spec/_files/view_partial.txt
rename to spec/_files/partial_view.txt
index 160b0b6..c09147c 100644
--- a/spec/_files/view_partial.txt
+++ b/spec/_files/partial_view.txt
@@ -2,5 +2,4 @@
 Hello Chris
 You have just won $10000!
 Well, $6000, after taxes.
-
 <h3>Fair enough, right?</h3>
diff --git a/spec/_files/partial_whitespace.js b/spec/_files/partial_whitespace.js
new file mode 100644
index 0000000..f4b1ee5
--- /dev/null
+++ b/spec/_files/partial_whitespace.js
@@ -0,0 +1,17 @@
+var partial_whitespace = {
+  greeting: function() {
+    return "Welcome";
+  },
+
+  farewell: function() {
+    return "Fair enough, right?";
+  },
+
+  name: "Chris",
+  value: 10000,
+  taxed_value: function() {
+    return this.value - (this.value * 0.4);
+  },
+  in_ca: true
+};
+
diff --git a/spec/_files/whitespace_partial.mustache b/spec/_files/partial_whitespace.mustache
similarity index 63%
rename from spec/_files/whitespace_partial.mustache
rename to spec/_files/partial_whitespace.mustache
index ce43cb3..48bd1ff 100644
--- a/spec/_files/whitespace_partial.mustache
+++ b/spec/_files/partial_whitespace.mustache
@@ -1,3 +1,3 @@
 <h1>{{  greeting  }}</h1>
 {{> partial }}
-<h3>{{ farewell }}</h3>
\ No newline at end of file
+<h3>{{ farewell }}</h3>
diff --git a/spec/_files/whitespace_partial.2.mustache b/spec/_files/partial_whitespace.partial
similarity index 100%
rename from spec/_files/whitespace_partial.2.mustache
rename to spec/_files/partial_whitespace.partial
diff --git a/spec/_files/whitespace_partial.txt b/spec/_files/partial_whitespace.txt
similarity index 99%
rename from spec/_files/whitespace_partial.txt
rename to spec/_files/partial_whitespace.txt
index 160b0b6..c09147c 100644
--- a/spec/_files/whitespace_partial.txt
+++ b/spec/_files/partial_whitespace.txt
@@ -2,5 +2,4 @@
 Hello Chris
 You have just won $10000!
 Well, $6000, after taxes.
-
 <h3>Fair enough, right?</h3>
diff --git a/spec/_files/reuse_of_enumerables.js b/spec/_files/reuse_of_enumerables.js
index 543e121..a3168d3 100644
--- a/spec/_files/reuse_of_enumerables.js
+++ b/spec/_files/reuse_of_enumerables.js
@@ -1,6 +1,6 @@
 var reuse_of_enumerables = {
   terms: [
     {name: 't1', index: 0},
-    {name: 't2', index: 1},
+    {name: 't2', index: 1}
   ]
 };
\ No newline at end of file
diff --git a/spec/_files/section_as_context.txt b/spec/_files/section_as_context.txt
index 53ee336..d834e80 100644
--- a/spec/_files/section_as_context.txt
+++ b/spec/_files/section_as_context.txt
@@ -1,6 +1,6 @@
   <h1>this is an object</h1>
   <p>one of its attributes is a list</p>
   <ul>
-        <li>listitem1</li>
-        <li>listitem2</li>
-    </ul>
+    <li>listitem1</li>
+    <li>listitem2</li>
+  </ul>
diff --git a/spec/_files/simple.mustache b/spec/_files/simple.mustache
index 03df206..2fea632 100644
--- a/spec/_files/simple.mustache
+++ b/spec/_files/simple.mustache
@@ -2,4 +2,4 @@ Hello {{name}}
 You have just won ${{value}}!
 {{#in_ca}}
 Well, ${{ taxed_value }}, after taxes.
-{{/in_ca}}
\ No newline at end of file
+{{/in_ca}}
diff --git a/spec/_files/template_partial.2.mustache b/spec/_files/template_partial.2.mustache
deleted file mode 100644
index 54bdd7d..0000000
--- a/spec/_files/template_partial.2.mustache
+++ /dev/null
@@ -1 +0,0 @@
-Again, {{again}}!
\ No newline at end of file
diff --git a/spec/_files/template_partial.js b/spec/_files/template_partial.js
deleted file mode 100644
index 68a4317..0000000
--- a/spec/_files/template_partial.js
+++ /dev/null
@@ -1,8 +0,0 @@
-var partial_context = {
-  title: function() {
-    return "Welcome";
-  },
-  partial: {
-    again: "Goodbye"
-  }
-}
diff --git a/spec/_files/two_in_a_row.mustache b/spec/_files/two_in_a_row.mustache
index dc38602..b23f29e 100644
--- a/spec/_files/two_in_a_row.mustache
+++ b/spec/_files/two_in_a_row.mustache
@@ -1 +1 @@
-{{greeting}}, {{name}}!
\ No newline at end of file
+{{greeting}}, {{name}}!
diff --git a/spec/_files/two_sections.txt b/spec/_files/two_sections.txt
index 8b13789..e69de29 100644
--- a/spec/_files/two_sections.txt
+++ b/spec/_files/two_sections.txt
@@ -1 +0,0 @@
-
diff --git a/spec/_files/unescaped.mustache b/spec/_files/unescaped.mustache
index 9982708..6b07d7b 100644
--- a/spec/_files/unescaped.mustache
+++ b/spec/_files/unescaped.mustache
@@ -1 +1 @@
-<h1>{{{title}}}</h1>
\ No newline at end of file
+<h1>{{{title}}}</h1>
diff --git a/spec/_files/unknown_pragma.js b/spec/_files/unknown_pragma.js
deleted file mode 100644
index 68344a5..0000000
--- a/spec/_files/unknown_pragma.js
+++ /dev/null
@@ -1 +0,0 @@
-var unknown_pragma = {};
diff --git a/spec/_files/unknown_pragma.mustache b/spec/_files/unknown_pragma.mustache
deleted file mode 100644
index 113810d..0000000
--- a/spec/_files/unknown_pragma.mustache
+++ /dev/null
@@ -1 +0,0 @@
-{{%I-HAVE-THE-GREATEST-MUSTACHE}}
diff --git a/spec/_files/unknown_pragma.txt b/spec/_files/unknown_pragma.txt
deleted file mode 100644
index a34840d..0000000
--- a/spec/_files/unknown_pragma.txt
+++ /dev/null
@@ -1 +0,0 @@
-ERROR: This implementation of mustache doesn't understand the 'I-HAVE-THE-GREATEST-MUSTACHE' pragma
diff --git a/spec/_files/view_partial.js b/spec/_files/view_partial.js
deleted file mode 100644
index 30ade55..0000000
--- a/spec/_files/view_partial.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var partial_context = {
-  greeting: function() {
-    return "Welcome";
-  },
-
-  farewell: function() {
-    return "Fair enough, right?";
-  },
-
-  partial: {
-    name: "Chris",
-    value: 10000,
-    taxed_value: function() {
-      return this.value - (this.value * 0.4);
-    },
-    in_ca: true
-  }
-};
-
diff --git a/spec/_files/whitespace_partial.js b/spec/_files/whitespace_partial.js
deleted file mode 100644
index 30ade55..0000000
--- a/spec/_files/whitespace_partial.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var partial_context = {
-  greeting: function() {
-    return "Welcome";
-  },
-
-  farewell: function() {
-    return "Fair enough, right?";
-  },
-
-  partial: {
-    name: "Chris",
-    value: 10000,
-    taxed_value: function() {
-      return this.value - (this.value * 0.4);
-    },
-    in_ca: true
-  }
-};
-
diff --git a/spec/mustache_spec.rb b/spec/mustache_spec.rb
index e04bec1..5f07294 100644
--- a/spec/mustache_spec.rb
+++ b/spec/mustache_spec.rb
@@ -11,26 +11,21 @@ TESTS = Dir.glob(File.join(FILES, '*.js')).map do |name|
   File.basename name, '.js'
 end
 
-PARTIALS = TESTS.select {|t| t.include? "partial" }
-NON_PARTIALS = TESTS.select {|t| not t.include? "partial" }
-
 NODE_PATH = `which node`.strip
 JS_PATH = `which js`.strip
 JSC_PATH = "/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resources/jsc"
 RHINO_JAR = "org.mozilla.javascript.tools.shell.Main"
 
-def load_test(name, is_partial=false)
+def load_test(name)
+  template = File.read(File.join(FILES, "#{name}.mustache"))
   view = File.read(File.join(FILES, "#{name}.js"))
-  template = File.read(File.join(FILES, "#{name}.mustache")).to_json
-  expect = File.read(File.join(FILES, "#{name}.txt"))
-
-  test = [view, template, expect]
-
-  if is_partial
-    test << File.read(File.join(FILES, "#{name}.2.mustache")).to_json
+  partial_file = File.join(FILES, "#{name}.partial")
+  partial = if File.exist?(partial_file)
+    File.read(partial_file)
   end
+  expect = File.read(File.join(FILES, "#{name}.txt"))
 
-  test
+  [template, view, partial, expect]
 end
 
 def run_js(runner, js)
@@ -41,7 +36,7 @@ def run_js(runner, js)
       JSC_PATH
     when :rhino
       "java #{RHINO_JAR}"
-    when :node
+    when :v8
       NODE_PATH
     end
 
@@ -60,11 +55,11 @@ describe "mustache" do
       $engines_run += 1
     end
 
-    it "should return the same when invoked multiple times" do
+    it "should return the same result when invoked multiple times" do
       js = <<-JS
         #{@boilerplate}
-        Mustache.to_html("x")
-        print(Mustache.to_html("x"));
+        Mustache.render("x")
+        print(Mustache.render("x"));
       JS
 
       run_js(@runner, js).should == "x\n"
@@ -73,9 +68,9 @@ describe "mustache" do
     it "should clear the context after each run" do
       js = <<-JS
         #{@boilerplate}
-        Mustache.to_html("{{#list}}{{x}}{{/list}}", {list: [{x: 1}]})
+        Mustache.render("{{#list}}{{x}}{{/list}}", {list: [{x: 1}]})
         try {
-          print(Mustache.to_html("{{#list}}{{x}}{{/list}}", {list: [{}]}));
+          print(Mustache.render("{{#list}}{{x}}{{/list}}", {list: [{}]}));
         } catch(e) {
           print('ERROR: ' + e.message);
         }
@@ -84,111 +79,62 @@ describe "mustache" do
       run_js(@runner, js).should == "\n"
     end
 
-    NON_PARTIALS.each do |test|
+    TESTS.each do |test|
       describe test do
-        it "should generate the correct html" do
-          view, template, expect = load_test(test)
+        it "should render the correct output" do
+          template, view, partial, expect = load_test(test)
 
           js = <<-JS
             try {
               #{@boilerplate}
+              var template = #{template.to_json};
               #{view}
-              var template = #{template};
-              var result = Mustache.to_html(template, #{test});
-              print(result);
+              var partials = {partial: #{partial ? partial.to_json : '""'}};
+              print(Mustache.render(template, #{test}, partials));
             } catch(e) {
               print('ERROR: ' + e.message);
             }
           JS
 
-          run_js(@runner, js).should == expect
+          run_js(@runner, js).chomp.should == expect
         end
 
-        it "should sendFun the correct html" do
-          view, template, expect = load_test(test)
+        it "should send the correct output" do
+          template, view, partial, expect = load_test(test)
 
           js = <<-JS
             try {
               #{@boilerplate}
+              var template = #{template.to_json};
               #{view}
-              var chunks = [];
-              var sendFun = function(chunk) {
-                if (chunk != "") {
-                  chunks.push(chunk);
-                }
-              }
-              var template = #{template};
-              Mustache.to_html(template, #{test}, null, sendFun);
-              print(chunks.join("\\n"));
+              var partials = {
+                "partial": #{(partial || '').to_json}
+              };
+              var buffer = [];
+              var send = function (chunk) {
+                buffer.push(chunk);
+              };
+              Mustache.render(template, #{test}, partials, send);
+              print(buffer.join(""));
             } catch(e) {
               print('ERROR: ' + e.message);
             }
           JS
 
-          run_js(@runner, js).strip.should == expect.strip
-        end
-      end
-    end
-
-    PARTIALS.each do |test|
-      describe test do
-        it "should generate the correct html" do
-          view, template, expect, partial = load_test(test, true)
-
-          js = <<-JS
-            try {
-              #{@boilerplate}
-              #{view}
-              var template = #{template};
-              var partials = {"partial": #{partial}};
-              var result = Mustache.to_html(template, partial_context, partials);
-              print(result);
-            } catch(e) {
-              print('ERROR: ' + e.message);
-            }
-          JS
-
-          run_js(@runner, js).should == expect
-        end
-
-        it "should sendFun the correct html" do
-          view, template, expect, partial = load_test(test, true)
-
-          js = <<-JS
-            try {
-              #{@boilerplate}
-              #{view};
-              var template = #{template};
-              var partials = {"partial": #{partial}};
-              var chunks = [];
-              var sendFun = function(chunk) {
-                if (chunk != "") {
-                  chunks.push(chunk);
-                }
-              }
-              Mustache.to_html(template, partial_context, partials, sendFun);
-              print(chunks.join("\\n"));
-            } catch(e) {
-              print('ERROR: ' + e.message);
-            }
-          JS
-
-          run_js(@runner, js).strip.should == expect.strip
+          run_js(@runner, js).chomp.should == expect
         end
       end
     end
   end
 
-  context "running in node" do
+  context "running in V8 (Chrome, node)" do
     if File.exist?(NODE_PATH)
       before(:all) do
-        $stdout.write "Testing in node "
-        @runner = :node
+        $stdout.write "Testing in V8 "
+        @runner = :v8
         @boilerplate = MUSTACHE.dup
         @boilerplate << <<-JS
-        function print(message) {
-          console.log(message);
-        }
+        var print = console.log;
         JS
       end
 
@@ -198,7 +144,7 @@ describe "mustache" do
 
       it_should_behave_like "mustache rendering"
     else
-      puts "Skipping tests in node (node not found)"
+      puts "Skipping tests in V8 (node not found)"
     end
   end
 
@@ -258,15 +204,11 @@ describe "mustache" do
 
   context "suite" do
     before(:each) do
-      $stdout.write "Verifying that we ran at the tests in at least one engine ... "
+      $stdout.write "Verifying that we ran the tests in at least one engine ... "
     end
 
     after(:each) do
-      if @exception.nil?
-        puts "OK"
-      else
-        puts "ERROR!"
-      end
+      puts @exception.nil? ? "OK" : "ERROR"
     end
 
     it "should have run at least one time" do
diff --git a/wrappers/commonjs/mustache.js.tpl.post b/wrappers/commonjs/mustache.js.tpl.post
deleted file mode 100644
index f566443..0000000
--- a/wrappers/commonjs/mustache.js.tpl.post
+++ /dev/null
@@ -1,8 +0,0 @@
-if (typeof module !== 'undefined' && module.exports) {
-    exports.name = Mustache.name;
-    exports.version = Mustache.version;
-
-    exports.to_html = function() {
-      return Mustache.to_html.apply(this, arguments);
-    };
-}
diff --git a/wrappers/commonjs/mustache.js.tpl.pre b/wrappers/commonjs/mustache.js.tpl.pre
deleted file mode 100644
index 5e33b34..0000000
--- a/wrappers/commonjs/mustache.js.tpl.pre
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * CommonJS-compatible mustache.js module
- *
- * See http://github.com/janl/mustache.js for more info.
- */
-
diff --git a/wrappers/commonjs/package.json b/wrappers/commonjs/package.json
deleted file mode 100644
index 8e13993..0000000
--- a/wrappers/commonjs/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "name": "mustache",
-    "author": "http://mustache.github.com/",
-    "description": "Logic-less {{mustache}} templates with JavaScript",
-    "keywords": ["template", "templates", "mustache"],
-    "version": "{{version}}",
-    "main": "./mustache"
-}