diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index f30fbaaa53..0000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "tools"]
-	path = tools
-	url = https://github.com/Polymer/tools.git
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8be03fdcbb..1de2f3418e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,21 +21,29 @@ Other projects require a similar agreement: jQuery, Firefox, Apache, Node, and m
 
 Here's an easy guide that should get you up and running:
 
+1. Setup Grunt: `sudo npm install -g grunt-cli`
 1. Fork the project on github and pull down your copy.
    > replace the {{ username }} with your username and {{ repository }} with the repository name
 
-        git clone git@github.com:{{ username }}/{{ repository }}.git -b master --recursive
+        git clone git@github.com:{{ username }}/{{ repository }}.git --recursive
 
     Note the `--recursive`. This is necessary for submodules to initialize properly. If you don't do a recursive clone, you'll have to init them manually:
 
         git submodule init
         git submodule update
 
-    Adding `-b master` is a shorthand to checkout the `master` branch. If you include it, skip step 2.
+    Download and run the `pull-all.sh` script to install the sibling dependencies.
 
-2. Development happens on the `master` branch. Get yourself on it!
+        git clone git://github.com/Polymer/tools.git && tools/bin/pull-all.sh
 
-        git checkout master
+1. Test your change
+   > in the repo you've made changes to, run the tests:
+
+        cd $REPO
+        npm install
+        grunt test
+
+1. Commit your code and make a pull request.
 
 That's it for the one time setup. Now you're ready to make a change.
 
diff --git a/conf/karma.conf.js b/conf/karma.conf.js
index 573c264a7f..c6ddf2469c 100644
--- a/conf/karma.conf.js
+++ b/conf/karma.conf.js
@@ -1,46 +1,47 @@
 module.exports = function(karma) {
-  var common = require('../tools/test/karma-common.conf.js');
+  var common = require('../../tools/test/karma-common.conf.js');
   karma.set(common.mixin_common_opts(karma, {
     // base path, that will be used to resolve files and exclude
     basePath: '../../',
 
     // list of files / patterns to load in the browser
     files: [
-      'polymer/tools/test/mocha-htmltest.js',
+      'tools/test/mocha-htmltest.js',
       'polymer/conf/mocha.conf.js',
       'polymer/node_modules/chai/chai.js',
       'polymer/polymer.js',
       'polymer/test/js/*.js',
-      {pattern: 'platform/*.js', included: false},
-      {pattern: 'platform/tools/**/*.js', included: false},
-      {pattern: 'platform/platform.*', included: false},
-      {pattern: 'platform/test/**/*.html', included: false},
-      {pattern: 'platform/test/**/*.js', included: false},
-      {pattern: 'platform/src/*.js', included: false},
-      {pattern: 'CustomElements/custom-elements.js', included: false},
       {pattern: 'CustomElements/MutationObservers/*.js', included: false},
+      {pattern: 'CustomElements/custom-elements.js', included: false},
       {pattern: 'CustomElements/src/*.js', included: false},
       {pattern: 'HTMLImports/html-imports.js', included: false},
       {pattern: 'HTMLImports/src/*', included: false},
+      {pattern: 'NodeBind/src/*.js', included: false},
+      {pattern: 'PointerEvents/pointerevents.js', included: false},
+      {pattern: 'PointerEvents/src/*.js', included: false},
+      {pattern: 'PointerGestures/pointergestures.js', included: false},
+      {pattern: 'PointerGestures/src/*.js', included: false},
       {pattern: 'ShadowDOM/shadowdom.js', included: false},
       {pattern: 'ShadowDOM/src/**/*.js', included: false},
-      {pattern: 'observe-js/src/*.js', included: false},
-      {pattern: 'observe-js/util/*.js', included: false},
-      {pattern: 'NodeBind/src/*.js', included: false},
       {pattern: 'TemplateBinding/load.js', included: false},
-      {pattern: 'TemplateBinding/src/*.js', included: false},
       {pattern: 'TemplateBinding/src/*.css', included: false},
+      {pattern: 'TemplateBinding/src/*.js', included: false},
+      {pattern: 'WeakMap/weakmap.js', included: false},
+      {pattern: 'observe-js/src/*.js', included: false},
+      {pattern: 'observe-js/util/*.js', included: false},
+      {pattern: 'platform/*.js', included: false},
+      {pattern: 'platform/platform.*', included: false},
+      {pattern: 'platform/src/*.js', included: false},
+      {pattern: 'platform/test/**/*.html', included: false},
+      {pattern: 'platform/test/**/*.js', included: false},
+      {pattern: 'platform/tools/**/*.js', included: false},
       {pattern: 'polymer-expressions/src/*.js', included: false},
       {pattern: 'polymer-expressions/third_party/**/*.js', included: false},
-      {pattern: 'PointerEvents/pointerevents.js', included: false},
-      {pattern: 'PointerEvents/src/*.js', included: false},
-      {pattern: 'PointerGestures/pointergestures.js', included: false},
-      {pattern: 'PointerGestures/src/*.js', included: false},
-      {pattern: 'polymer/tools/**/*.js', included: false},
       {pattern: 'polymer/src/**/*.js', included: false},
-      {pattern: 'polymer/test/**/*.html', included: false},
       {pattern: 'polymer/test/**/*.css', included: false},
-      {pattern: 'polymer/test/**/*.js', included: false}
+      {pattern: 'polymer/test/**/*.html', included: false},
+      {pattern: 'polymer/test/**/*.js', included: false},
+      {pattern: 'tools/**/*.js', included: false}
     ]
   }));
 };
diff --git a/gruntfile.js b/gruntfile.js
index a67d95db03..f2a74eaafc 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -78,7 +78,7 @@ module.exports = function(grunt) {
           outdir: 'docs',
           linkNatives: 'true',
           tabtospace: 2,
-          themedir: 'tools/doc/themes/bootstrap'
+          themedir: '../tools/doc/themes/bootstrap'
         }
       }
     },
diff --git a/package.json b/package.json
index 89bd93801e..98e8db9346 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Polymer",
-  "version": "0.0.20130905",
+  "version": "0.0.20130912",
   "devDependencies": {
     "mocha": "*",
     "chai": "*",
diff --git a/polymer.js b/polymer.js
index 42bb26986c..453f28ede0 100644
--- a/polymer.js
+++ b/polymer.js
@@ -52,7 +52,7 @@ var src = script.attributes.src.value;
 var basePath = src.slice(0, src.indexOf(thisFile));
 
 if (!window.PolymerLoader) {
-  var path = basePath + 'tools/loader/loader.js';
+  var path = basePath + '../tools/loader/loader.js';
   document.write('<script src="' + path + '"></script>');
 } 
 document.write('<script>PolymerLoader.load("' + scopeName + '")</script>');
diff --git a/src/declaration/attributes.js b/src/declaration/attributes.js
index 1c8e66d5a0..9a52f6ac8e 100644
--- a/src/declaration/attributes.js
+++ b/src/declaration/attributes.js
@@ -5,80 +5,42 @@
  */
 (function(scope) {
 
-  // imports
-
-  var api = scope.api.instance.attributes;
-
-  var PUBLISHED = api.PUBLISHED;
-  var INSTANCE_ATTRIBUTES = api.INSTANCE_ATTRIBUTES;
-
   // magic words
 
-  var PUBLISH = 'publish';
-  var ATTRIBUTES = 'attributes';
+  var ATTRIBUTES_ATTRIBUTE = 'attributes';
 
   // attributes api
 
   var attributes = {
     inheritAttributesObjects: function(prototype) {
-      this.inheritObject(prototype, PUBLISHED);
-      this.inheritObject(prototype, INSTANCE_ATTRIBUTES);
+      // chain our lower-cased publish map to the inherited version
+      this.inheritObject(prototype, 'publishLC');
+      // chain our instance attributes map to the inherited version
+      this.inheritObject(prototype, '_instanceAttributes');
     },
-    parseAttributes: function() {
-      this.publishAttributes(this.prototype);
-      this.publishProperties(this.prototype);
-      this.accumulateInstanceAttributes();
-    },
-    publishAttributes: function(prototype) {
-      // get published properties
-      var published = prototype[PUBLISHED];
-      // merge attribute names from 'attributes' attribute
-      var attributes = this.getAttribute(ATTRIBUTES);
+    publishAttributes: function(prototype, base) {
+      // merge names from 'attributes' attribute
+      var attributes = this.getAttribute(ATTRIBUTES_ATTRIBUTE);
       if (attributes) {
-        // attributes='a b c' or attributes='a,b,c'
+        // get properties to publish
+        var publish = prototype.publish || (prototype.publish = {});
+        // names='a b c' or names='a,b,c'
         var names = attributes.split(attributes.indexOf(',') >= 0 ? ',' : ' ');
         // record each name for publishing
-        names.forEach(function(p) {
-          p = p.trim();
-          if (p && !(p in published)) {
-            published[p] = null;
+        for (var i=0, l=names.length, n; i<l; i++) {
+          // remove excess ws
+          n = names[i].trim();
+          // do not override explicit entries
+          if (publish[n] === undefined && base[n] === undefined) {
+            publish[n] = null;
           }
-        });
-      }
-      // install 'attributes' as properties on the prototype, 
-      // but don't override
-      Object.keys(published).forEach(function(p) {
-        if (!(p in prototype)) {
-          prototype[p] = published[p];
         }
-      });
-    },
-    publishProperties: function(prototype) {
-      this.publishPublish(prototype);
-    },
-    publishPublish: function(prototype) {
-      // process only the PUBLISH block on this prototype, not the chain
-      if (!prototype.hasOwnProperty(PUBLISH)) {
-        return;
-      }
-      // acquire properties published imperatively
-      var imperative = prototype[PUBLISH];
-      if (imperative) {
-        // install imperative properties, overriding defaults
-        Object.keys(imperative).forEach(function(p) {
-          prototype[p] = imperative[p];
-        });
-        // combine with other published properties
-        Platform.mixin(
-          prototype[PUBLISHED],
-          imperative
-        );
       }
     },
     // record clonable attributes from <element>
     accumulateInstanceAttributes: function() {
       // inherit instance attributes
-      var clonable = this.prototype[INSTANCE_ATTRIBUTES];
+      var clonable = this.prototype._instanceAttributes;
       // merge attributes from element
       this.attributes.forEach(function(a) {
         if (this.isInstanceAttribute(a.name)) {
@@ -93,11 +55,11 @@
     blackList: {name: 1, 'extends': 1, constructor: 1, noscript: 1}
   };
 
-  // add ATTRIBUTES symbol to blacklist
-  attributes.blackList[ATTRIBUTES] = 1;
+  // add ATTRIBUTES_ATTRIBUTE to the blacklist
+  attributes.blackList[ATTRIBUTES_ATTRIBUTE] = 1;
 
   // exports
 
   scope.api.declaration.attributes = attributes;
-  
+
 })(Polymer);
diff --git a/src/declaration/polymer-element.js b/src/declaration/polymer-element.js
index b675aa9df2..31e87012b6 100644
--- a/src/declaration/polymer-element.js
+++ b/src/declaration/polymer-element.js
@@ -49,12 +49,19 @@
       // finalizing elements in the main document
       if (document.contains(this)) {
         whenImportsLoaded(function() {
-          this.register(this.name, extendee);
+          this._register(extendee);
         }.bind(this));
       } else {
-        this.register(this.name, extendee);
+        this._register(extendee);
       }
     },
+    _register: function(extendee) {
+      //console.group('registering', this.name);
+      this.register(this.name, extendee);
+      //console.groupEnd();
+      // subclasses may now register themselves
+      notifySuper(this.name);
+    },
     waitingForPrototype: function(name) {
       if (!getRegisteredPrototype(name)) {
         // then wait for a prototype
@@ -87,60 +94,12 @@
           return true;
         }
       }
-    },
-    register: function(name, extendee) {
-      // build prototype combining extendee, Polymer base, and named api
-      this.prototype = this.generateCustomPrototype(name, extendee);
-      // backref
-      this.prototype.element = this;
-      // TODO(sorvell): install a helper method this.resolvePath to aid in 
-      // setting resource paths. e.g. 
-      // this.$.image.src = this.resolvePath('images/foo.png')
-      // Potentially remove when spec bug is addressed.
-      // https://www.w3.org/Bugs/Public/show_bug.cgi?id=21407
-      this.addResolvePathApi();
-      // declarative features
-      this.desugar();
-      // under ShadowDOMPolyfill, transforms to approximate missing CSS features
-      if (window.ShadowDOMPolyfill) {
-        Platform.ShadowCSS.shimStyling(this.templateContent(), name, extendee);
-      }
-      // register our custom element
-      this.registerPrototype(name);
-      // reference constructor in a global named by 'constructor' attribute
-      this.publishConstructor();
-      // subclasses may now register themselves
-      notifySuper(name);
-    },
-    // implement various declarative features
-    desugar: function(prototype) {
-      // parse `attribute` attribute and `publish` object
-      this.parseAttributes();
-      // parse on-* delegates declared on `this` element
-      this.parseHostEvents();
-      // parse on-* delegates declared in templates
-      this.parseLocalEvents();
-      // install external stylesheets as if they are inline
-      this.installSheets();
-      // allow custom element access to the declarative context
-      if (this.prototype.registerCallback) {
-        this.prototype.registerCallback(this);
-      }
-      // cache the list of custom prototype names for faster reflection
-      this.cacheProperties();
-    },
-    // if a named constructor is requested in element, map a reference
-    // to the constructor to the given symbol
-    publishConstructor: function() {
-      var symbol = this.getAttribute('constructor');
-      if (symbol) {
-        window[symbol] = this.ctor;
-      }
     }
   });
 
   // semi-pluggable APIs 
-  // TODO(sjmiles): should be fully pluggable
+  // TODO(sjmiles): should be fully pluggable (aka decoupled, currently
+  // the various plugins are allowed to depend on each other directly)
   Object.keys(apis).forEach(function(n) {
     extend(prototype, apis[n]);
   });
diff --git a/src/declaration/properties.js b/src/declaration/properties.js
index 5699b62eee..68a6f1214f 100644
--- a/src/declaration/properties.js
+++ b/src/declaration/properties.js
@@ -4,54 +4,73 @@
  * license that can be found in the LICENSE file.
  */
 (function(scope) {
-  
-  // imports
-
-  var attributes_api = scope.api.instance.attributes,
-      events_api = scope.api.instance.events
-      ;
-
-  // magic words
-
-  var OBSERVE_SUFFIX = 'Changed';
 
   // element api
-  
-  var empty = [];
 
   var properties = {
-    cacheProperties: function() {
-      this.prototype.customPropertyNames = this.getCustomPropertyNames(this.prototype);
-    },
-    // fetch an array of all property names in our prototype chain 
-    // above PolymerBase
-    // TODO(sjmiles): perf: reflection is slow, relatively speaking
-    //  If an element may take 6us to create, getCustomPropertyNames might
-    //  cost 1.6us more.
-    getCustomPropertyNames: function(p) {
-      var properties = {}, some;
-      while (p && !scope.isBase(p)) {
-        var names = Object.getOwnPropertyNames(p);
-        for (var i=0, l=names.length, n; (i<l) && (n=names[i]); i++) {
-          if (!custom_property_black_list[n]) {
-            properties[n] = true;
-            some = true;
+    inferObservers: function(prototype) {
+      var observe = prototype.observe;
+      for (var n in prototype) {
+        if (n.slice(-7) === 'Changed') {
+          if (!observe) {
+            observe  = (prototype.observe = {});
           }
+          observe[n.slice(0, -7)] = n;
+          //console.log('inferring observe entry for', n);
         }
-      // TODO(sjmiles): __proto__ is simulated on non-supporting platforms
-        p = p.__proto__;
-      }  
-      return some ? Object.keys(properties) : empty;
+      }
+    },
+    optimizePropertyMaps: function(prototype, base) {
+      if (prototype.observe) {
+        // combine name list
+        prototype._observeNames = Object.keys(prototype.observe).concat(base._observeNames || []);
+        // build value list
+        prototype._observeValues = valuesForNames(prototype._observeNames, prototype.observe);
+      }
+      if (prototype.publish) {
+        // combine name list
+        prototype._publishNames = Object.keys(prototype.publish).concat(base._publishNames || []);
+        // build value list
+        prototype._publishValues = valuesForNames(prototype._publishNames, prototype.publish);
+      }
+    },
+    publishProperties: function(prototype, base) {
+      // if we have any properties to publish
+      var publish = prototype.publish;
+      if (publish) {
+        // transcribe `publish` entries onto own prototype
+        this.requireProperties(publish, prototype, base);
+        // construct map of lower-cased property names
+        prototype._publishLC = this.lowerCaseMap(publish);
+      }
+    },
+    requireProperties: function(properties, prototype, base) {
+      // ensure a prototype value for each one
+      for (var n in properties) {
+        if (prototype[n] === undefined && base[n] === undefined) {
+          prototype[n] = properties[n];
+        }
+      }
+    },
+    lowerCaseMap: function(properties) {
+      var map = {};
+      for (var n in properties) {
+        map[n.toLowerCase()] = n;
+      }
+      return map;
     }
   };
 
-  var custom_property_black_list = {};
-  custom_property_black_list[attributes_api.PUBLISHED] = 1;
-  custom_property_black_list[attributes_api.INSTANCE_ATTRIBUTES] = 1;
-  custom_property_black_list[events_api.DELEGATES] = 1;
+  function valuesForNames(names, map) {
+    var values = [];
+    for (var i=0, l=names.length; i<l; i++) {
+      values[i] = map[names[i]];
+    }
+    return values;
+  }
 
   // exports
 
   scope.api.declaration.properties = properties;
-  
+
 })(Polymer);
diff --git a/src/declaration/prototype.js b/src/declaration/prototype.js
index 0b7ac527b2..c128a31246 100644
--- a/src/declaration/prototype.js
+++ b/src/declaration/prototype.js
@@ -12,89 +12,194 @@
   var extend = scope.extend;
   
   // returns a prototype that chains to <tag> or HTMLElement
-  function generatePrototype(tag) {
-    return Object.create(HTMLElement.getPrototypeForTag(tag));
-  }
 
-  // On platforms that do not support __proto__ (IE10), the prototype chain
-  // of a custom element is simulated via installation of __proto__.
-  // Although custom elements manages this, we install it here so it's 
-  // available during desugaring.
-  function ensurePrototypeTraversal(prototype) {
-    if (!Object.__proto__) {
-      var ancestor = Object.getPrototypeOf(prototype);
-      prototype.__proto__ = ancestor;
-      if (isBase(ancestor)) {
-        ancestor.__proto__ = Object.getPrototypeOf(ancestor);
+  // TODO(sjmiles): duplicated in attributes.js
+  if (Object.__proto__) {
+    var chainObject = function(object, inherited) {
+      if (object && inherited && object !== inherited) {
+        object.__proto__ = inherited;
       }
     }
+  } else {
+    chainObject = function(object, inherited) {
+      throw "Fix chainObject for IE";
+    }
   }
 
-  // declarative implementation: <polymer-element>
-
-  var prototype = generatePrototype();
-  
   // prototype api
 
   var prototype = {
-    // prototype marshaling
-    // build prototype combining extendee, Polymer base, and named api
-    generateCustomPrototype: function (name, extnds) {
-      // basal prototype
-      var prototype = this.generateBasePrototype(extnds);
-      // mixin registered custom api
-      this.addNamedApi(prototype, name);
+    register: function(name, extendee) {
+      // build prototype combining extendee, Polymer base, and named api
+      this.prototype = this.buildPrototype(name, extendee);
+      // back reference declaration element
+      // TODO(sjmiles): replace `element` with `elementElement` or `declaration`
+      this.prototype.element = this;
+      // more declarative features
+      this.desugar();
+      // TODO(sorvell): install a helper method this.resolvePath to aid in 
+      // setting resource paths. e.g.
+      // this.$.image.src = this.resolvePath('images/foo.png')
+      // Potentially remove when spec bug is addressed.
+      // https://www.w3.org/Bugs/Public/show_bug.cgi?id=21407
+      this.addResolvePathApi();
+      // under ShadowDOMPolyfill, transforms to approximate missing CSS features
+      if (window.ShadowDOMPolyfill) {
+        Platform.ShadowCSS.shimStyling(this.templateContent(), name, extendee);
+      }
+      // register our custom element with the platform
+      this.registerPrototype(name, extendee);
+      // reference constructor in a global named by 'constructor' attribute
+      this.publishConstructor();
+    },
+    buildPrototype: function(name, extendee) {
+      // get our custom prototype (before chaining)
+      var prototype = scope.getRegisteredPrototype(name);
+      // get basal prototype
+      var base = this.generateBasePrototype(extendee);
+      // transcribe `attributes` declarations onto own prototype's `publish`
+      this.publishAttributes(prototype, base);
+      // `publish` properties to the prototype and to attribute watch
+      this.publishProperties(prototype, base);
+      // infer observers for `observe` list based on method names
+      this.inferObservers(prototype);
+      // chain various meta-data objects to inherited versions
+      this.inheritMetaData(prototype, base);
+      // chain custom api to inherited
+      prototype = this.chainObject(prototype, base);
+      // build side-chained lists to optimize iterations
+      this.optimizePropertyMaps(prototype, base);
+      // inherit publishing meta-data
+      //this.inheritAttributesObjects(prototype);
+      //this.inheritDelegates(prototype);
       // x-platform fixups
       ensurePrototypeTraversal(prototype);
       return prototype;
     },
+    inheritMetaData: function(prototype, base) {
+      // chain observe object to inherited
+      this.inheritObject('observe', prototype, base);
+      // chain publish object to inherited
+      this.inheritObject('publish', prototype, base);
+      // chain our lower-cased publish map to the inherited version
+      this.inheritObject('_publishLC', prototype, base);
+      // chain our instance attributes map to the inherited version
+      this.inheritObject('_instanceAttributes', prototype, base);
+      // chain our event delegates map to the inherited version
+      this.inheritObject('eventDelegates', prototype, base);
+    },
+    // implement various declarative features
+    desugar: function(prototype) {
+      // compile list of attributes to copy to instances
+      this.accumulateInstanceAttributes();
+      // parse on-* delegates declared on `this` element
+      this.parseHostEvents();
+      // parse on-* delegates declared in templates
+      this.parseLocalEvents();
+      // install external stylesheets as if they are inline
+      this.installSheets();
+      // allow custom element access to the declarative context
+      if (this.prototype.registerCallback) {
+        this.prototype.registerCallback(this);
+      }
+    },
+    // if a named constructor is requested in element, map a reference
+    // to the constructor to the given symbol
+    publishConstructor: function() {
+      var symbol = this.getAttribute('constructor');
+      if (symbol) {
+        window[symbol] = this.ctor;
+      }
+    },
     // build prototype combining extendee, Polymer base, and named api
     generateBasePrototype: function(extnds) {
-      // create a prototype based on tag-name extension
-      var prototype = generatePrototype(extnds);
-      // insert base api in inheritance chain (if needed)
-      return this.ensureBaseApi(prototype);
+      var prototype = memoizedBases[extnds];
+      if (!prototype) {
+        // create a prototype based on tag-name extension
+        var prototype = HTMLElement.getPrototypeForTag(extnds);
+        // insert base api in inheritance chain (if needed)
+        prototype = this.ensureBaseApi(prototype);
+        // memoize this base
+        memoizedBases[extnds] = prototype;
+      }
+      return prototype;
     },
     // install Polymer instance api into prototype chain, as needed 
-    ensureBaseApi: function(prototype) { 
+    ensureBaseApi: function(prototype) {
       if (!prototype.PolymerBase) {
-        Object.keys(api.instance).forEach(function(n) {
-          extend(prototype, api.instance[n]);
-        });
-        prototype = Object.create(prototype);
+       prototype = Object.create(prototype);
+       // we need a unique copy of base api for each base prototype
+       // therefore we 'extend' here instead of simply chaining
+       // we could memoize instead, especially for the common cases,
+       // in particular, for base === HTMLElement.prototype
+       for (var n in api.instance) {
+         extend(prototype, api.instance[n]);
+       }
       }
-      // inherit publishing meta-data
-      this.inheritAttributesObjects(prototype);
-      // inherit event delegates
-      this.inheritDelegates(prototype);
       // return buffed-up prototype
       return prototype;
     },
-    // mix api registered to 'name' into 'prototype' 
-    addNamedApi: function(prototype, name) { 
-      // combine custom api into prototype
-      return extend(prototype, scope.getRegisteredPrototype(name));
-    },
-    // make a fresh object that inherits from a prototype object
-    inheritObject: function(prototype, name) {
-      // copy inherited properties onto a new object
-      prototype[name] = extend({}, Object.getPrototypeOf(prototype)[name]);
+    // ensure prototype[name] inherits from a prototype.prototype[name]
+    inheritObject: function(name, prototype, base) {
+      // require an object
+      var source = prototype[name] || {};
+      // chain inherited properties onto a new object
+      prototype[name] = this.chainObject(source, base[name]);
     },
     // register 'prototype' to custom element 'name', store constructor 
-    registerPrototype: function(name) { 
-      // register the custom type
-      this.ctor = document.register(name, {
+    registerPrototype: function(name, extendee) { 
+      var info = {
         prototype: this.prototype
-      });
+      }
+      // native element must be specified in extends
+      if (extendee && extendee.indexOf('-') < 0) {
+        info.extends = extendee;
+      }
+      // register the custom type
+      this.ctor = document.register(name, info);
       // constructor shenanigans
       this.prototype.constructor = this.ctor;
       // register the prototype with HTMLElement for name lookup
       HTMLElement.register(name, this.prototype);
     }
   };
-  
+
+  if (Object.__proto__) {
+    prototype.chainObject = function(object, inherited) {
+      if (object && inherited && object !== inherited) {
+        object.__proto__ = inherited;
+      }
+      return object;
+    }
+  } else {
+    prototype.chainObject = function(object, inherited) {
+      if (object && inherited && object !== inherited) {
+        var chained = Object.create(inherited);
+        object = extend(chained, object);
+      }
+      return object;
+    }
+  }
+
+  // memoize base prototypes
+  memoizedBases = {};
+
+  // On platforms that do not support __proto__ (version of IE), the prototype
+  // chain of a custom element is simulated via installation of __proto__.
+  // Although custom elements manages this, we install it here so it's
+  // available during desugaring.
+  function ensurePrototypeTraversal(prototype) {
+    if (!Object.__proto__) {
+      var ancestor = Object.getPrototypeOf(prototype);
+      prototype.__proto__ = ancestor;
+      if (isBase(ancestor)) {
+        ancestor.__proto__ = Object.getPrototypeOf(ancestor);
+      }
+    }
+  }
+
   // exports
 
   api.declaration.prototype = prototype;
-  
+
 })(Polymer);
diff --git a/src/instance/attributes.js b/src/instance/attributes.js
index 1ef6ae6d36..ee6811a220 100644
--- a/src/instance/attributes.js
+++ b/src/instance/attributes.js
@@ -5,26 +5,23 @@
  */
 (function(scope) {
 
-  // magic words
-
-  var PUBLISHED = '__published';
-  var INSTANCE_ATTRIBUTES = '__instance_attributes';
-
   // instance api for attributes
 
   var attributes = {
-    PUBLISHED: PUBLISHED,
-    INSTANCE_ATTRIBUTES: INSTANCE_ATTRIBUTES,
     copyInstanceAttributes: function () {
-      var a$ = this[INSTANCE_ATTRIBUTES];
+      var a$ = this._instanceAttributes;
       for (var k in a$) {
         this.setAttribute(k, a$[k]);
       }
     },
     // for each attribute on this, deserialize value to property as needed
     takeAttributes: function() {
-      for (var i=0, a$=this.attributes, l=a$.length, a; (a=a$[i]) && i<l; i++) {
-        this.attributeToProperty(a.name, a.value);
+      // if we have no publish lookup table, we have no attributes to take
+      // TODO(sjmiles): ad hoc
+      if (this._publishLC) {
+        for (var i=0, a$=this.attributes, l=a$.length, a; (a=a$[i]) && i<l; i++) {
+          this.attributeToProperty(a.name, a.value);
+        }
       }
     },
     // if attribute 'name' is mapped to a property, deserialize
@@ -53,10 +50,9 @@
     },
     // return the published property matching name, or undefined
     propertyForAttribute: function(name) {
-      // matchable properties must be published
-      var properties = Object.keys(this[PUBLISHED]);
-      // search for a matchable property
-      return properties[properties.map(lowerCase).indexOf(name.toLowerCase())];
+      var match = this._publishLC && this._publishLC[name];
+      //console.log('propertyForAttribute:', name, 'matches', match);
+      return match;
     },
     // convert representation of 'stringValue' based on type of 'defaultValue'
     deserializeValue: function(stringValue, defaultValue) {
@@ -70,29 +66,27 @@
         return value;
       }
     },
-    propertyToAttribute: function(name) {
-      if (Object.keys(this[PUBLISHED]).indexOf(name) >= 0) {
+    relectPropertyToAttribute: function(name) {
+      //if (Object.keys(this[PUBLISHED]).indexOf(name) >= 0) {
+        // TODO(sjmiles): consider memoizing this
         var inferredType = typeof this.__proto__[name];
+        // try to intelligently serialize property value
         var serializedValue = this.serializeValue(this[name], inferredType);
         // boolean properties must reflect as boolean attributes
         if (serializedValue !== undefined) {
           this.setAttribute(name, serializedValue);
-        // TODO(sorvell): we should remove attr for all properties 
-        // that have undefined serialization; however, we will need to 
-        // refine the attr reflection system to achieve this; pica, for example,
-        // relies on having inferredType object properties not removed as 
-        // attrs.
+          // TODO(sorvell): we should remove attr for all properties 
+          // that have undefined serialization; however, we will need to 
+          // refine the attr reflection system to achieve this; pica, for example,
+          // relies on having inferredType object properties not removed as 
+          // attrs.
         } else if (inferredType === 'boolean') {
           this.removeAttribute(name);
         }
-        
-      }
+      //}
     }
   };
 
-  var lowerCase = String.prototype.toLowerCase.call.bind(
-    String.prototype.toLowerCase);
-
   // exports
 
   scope.api.instance.attributes = attributes;
diff --git a/src/instance/base.js b/src/instance/base.js
index 1514fa0ae6..131975c5fe 100644
--- a/src/instance/base.js
+++ b/src/instance/base.js
@@ -138,7 +138,10 @@
       }
     },
     attributeChangedCallback: function(name, oldValue) {
-      this.attributeToProperty(name, this.getAttribute(name));
+      // TODO(sjmiles): adhoc filter
+      if (name !== 'class' && name !== 'style') {
+        this.attributeToProperty(name, this.getAttribute(name));
+      }
       if (this.attributeChanged) {
         this.attributeChanged.apply(this, arguments);
       }
diff --git a/src/instance/mdv.js b/src/instance/mdv.js
index 96df736d93..100b215954 100644
--- a/src/instance/mdv.js
+++ b/src/instance/mdv.js
@@ -35,7 +35,7 @@
         // reflect bound property to attribute when binding
         // to ensure binding is not left on attribute if property
         // does not update due to not changing.
-        this.propertyToAttribute(name);
+        this.relectPropertyToAttribute(name);
         return this.bindings[name] = observer;
       } else {
         return this.super(arguments);
diff --git a/src/instance/properties.js b/src/instance/properties.js
index 8e66158fcc..0871abeec1 100644
--- a/src/instance/properties.js
+++ b/src/instance/properties.js
@@ -4,50 +4,73 @@
  * license that can be found in the LICENSE file.
  */
 (function(scope) {
-  
+
   // imports
 
   var log = window.logFlags || {};
-  
+
   // magic words
 
   var OBSERVE_SUFFIX = 'Changed';
-  
-  var PUBLISHED = scope.api.instance.attributes.PUBLISHED;
 
   // element api
-  
+
   var empty = [];
 
   var properties = {
-    // set up property observers 
+    // set up property observers
     observeProperties: function() {
-      var names = this.getCustomPropertyNames();
-      for (var i=0, l=names.length, n; (i<l) && (n=names[i]); i++) {
-        this.observeProperty(n);
+      // TODO(sjmiles):
+      // we observe published properties so we can reflect them to attributes
+      // ~100% of our team's applications would work without this reflection,
+      // perhaps we can make it optional somehow
+      //
+      // add user's observers
+      var n$ = this._observeNames, v$ = this._observeValues;
+      if (n$) {
+        for (var i=0, l=n$.length, n; i<l; i++) {
+          n = n$[i];
+          if (this.publish && (this.publish[n] !== undefined)) {
+            this.observeBoth(n, v$[i]);
+          } else {
+            this.observeProperty(n, v$[i]);
+          }
+        }
+      }
+      // add observers for published properties
+      var n$ = this._publishNames, v$ = this._publishValues;
+      if (n$) {
+        for (var i=0, l=n$.length, n; i<l; i++) {
+          n = n$[i];
+          if (!this.observe || (this.observe[n] === undefined)) {
+            this.observeAttributeProperty(n, v$[i]);
+          }
+        }
       }
     },
-    // fetch an pre-constructor array of all property names in our prototype
-    // chain above PolymerBase
-    getCustomPropertyNames: function() {
-      return this.customPropertyNames;
+    _observe: function(name, cb) {
+      log.observe && console.log(LOG_OBSERVE, this.localName, name);
+      registerObserver(this, name, 
+        new PathObserver(this, name, cb));
     },
-    // observe property if shouldObserveProperty 
-    observeProperty: function(name) {
-      if (this.shouldObserveProperty(name)) {
-        log.watch && console.log(LOG_OBSERVE, this.localName, name);
-        var propertyChanged = function(neo, old) {
-            log.watch && console.log(LOG_OBSERVED, this.localName, this.id || '', name, this[name], old);
-            this.dispatchPropertyChange(name, old);
-          }.bind(this);
-        var observer = new PathObserver(this, name, propertyChanged);
-        registerObserver(this, name, observer);
-      }
+    observeAttributeProperty: function(name) {
+      var self = this;
+      this._observe(name, function() {
+        self.relectPropertyToAttribute(name);
+      });
+    },
+    observeProperty: function(name, methodName) {
+      var self = this;
+      this._observe(name, function(value, old) {
+        invoke.call(self, methodName, [old]);
+      });
     },
-    // property should be observed if it has an observation callback
-    // or if it is published
-    shouldObserveProperty: function(name) {
-      return Boolean(this[name + OBSERVE_SUFFIX] || this[PUBLISHED][name] !== undefined);
+    observeBoth: function(name, methodName) {
+      var self = this;
+      this._observe(name, function(value, old) {
+        self.relectPropertyToAttribute(name);
+        invoke.call(self, methodName, [old]);
+      });
     },
     bindProperty: function(property, model, path) {
       // apply Polymer two-way reference binding
@@ -58,13 +81,9 @@
     },
     unbindAllProperties: function() {
       unregisterObservers(this);
-    },
-    dispatchPropertyChange: function(name, oldValue) {
-      this.propertyToAttribute(name);
-      invoke.call(this, name + OBSERVE_SUFFIX, [oldValue]);
     }
   };
-  
+
   function invoke(method, args) {
     var fn = this[method] || method;
     if (typeof fn === 'function') {
@@ -73,12 +92,11 @@
   }
 
   // property binding
-  
+
   // bind a property in A to a path in B by converting A[property] to a
   // getter/setter pair that accesses B[...path...]
   function bindProperties(inA, inProperty, inB, inPath) {
-    log.bind && console.log(LOG_BIND_PROPS, inB.localName || 'object',
-        inPath, inA.localName, inProperty);
+    log.bind && console.log(LOG_BIND_PROPS, inB.localName || 'object', inPath, inA.localName, inProperty);
     // capture A's value if B's value is null or undefined,
     // otherwise use B's value
     var path = Path.get(inPath);
@@ -87,18 +105,18 @@
       path.setValueFrom(inB, inA[inProperty]);
     }
     return PathObserver.defineProperty(inA, inProperty,
-        {object: inB, path: inPath});
+      {object: inB, path: inPath});
   }
 
   // bookkeeping observers for memory management
 
   var observers = new SideTable();
-  
+
   function registerObserver(element, name, observer) {
     var o$ = getElementObservers(element);
     o$[name] = observer;
   }
-  
+
   function unregisterObserver(element, name) {
     var o$ = getElementObservers(element);
     if (o$ && o$[name]) {
@@ -107,7 +125,7 @@
       return true;
     }
   }
-  
+
   function unregisterObservers(element) {
     var $o = getElementObservers(element);
     Object.keys($o).forEach(function(key) {
@@ -115,7 +133,7 @@
       $o[key] = null;
     });
   }
-  
+
   function getElementObservers(element) {
     var b$ = observers.get(element);
     if (!b$) {
@@ -125,7 +143,7 @@
   }
 
   // logging
-  
+
   var LOG_OBSERVE = '[%s] watching [%s]';
   var LOG_OBSERVED = '[%s#%s] watch: [%s] now [%s] was [%s]';
   var LOG_CHANGED = '[%s#%s] propertyChanged: [%s] now [%s] was [%s]';
@@ -134,5 +152,5 @@
   // exports
 
   scope.api.instance.properties = properties;
-  
+
 })(Polymer);
diff --git a/src/lib/lang.js b/src/lib/lang.js
index 037db59569..a6042dc0fc 100644
--- a/src/lib/lang.js
+++ b/src/lib/lang.js
@@ -20,8 +20,8 @@
             // hint the 'super' engine
             prototype[n].nom = n;
           }
-          // TODO(sjmiles): sharing a function only works if the function 
-          // only ever has one name
+          // TODO(sjmiles): sharing a function only works if 
+          // the function only ever has one name
         }
       });
     }
diff --git a/src/lib/super.js b/src/lib/super.js
index d24bb5a26f..4eb2374969 100644
--- a/src/lib/super.js
+++ b/src/lib/super.js
@@ -29,18 +29,18 @@
       // memoized 'name of method' 
       var nom = caller.nom;
       // memoized next implementation prototype
-      if (!('_super' in caller)) {
+      var _super = caller._super;
+      if (!_super) {
         if (!nom) {
-          nom = nameInThis.call(this, caller);
+          nom = caller.nom = nameInThis.call(this, caller);
         }
         if (!nom) {
           console.warn('called super() on a method not installed declaratively (has no .nom property)');
         }
         // super prototype is either cached or we have to find it
         // by searching __proto__ (at the 'top')
-        memoizeSuper(caller, nom, getPrototypeOf(this));
+        _super = memoizeSuper(caller, nom, getPrototypeOf(this));
       }
-      var _super = caller._super;
       if (!_super) {
         // if _super is falsey, there is no super implementation
         //console.warn('called $super(' + nom + ') where there is no super implementation');
@@ -48,7 +48,7 @@
         // our super function
         var fn = _super[nom];
         // memoize information so 'fn' can call 'super'
-        if (!('_super' in fn)) {
+        if (!fn._super) {
           memoizeSuper(fn, nom, _super);
         }
         // invoke the inherited method
@@ -80,7 +80,7 @@
     };
 
     function nameInThis(value) {
-      console.warn('nameInThis called');
+      //console.warn('nameInThis called');
       var p = this;
       while (p && p !== HTMLElement.prototype) {
         var n$ = Object.getOwnPropertyNames(p);
diff --git a/test/html/attr-mustache.html b/test/html/attr-mustache.html
index fd3aa8ad86..31e1e50a4b 100644
--- a/test/html/attr-mustache.html
+++ b/test/html/attr-mustache.html
@@ -3,8 +3,8 @@
   <head>
     <title>attribute mustaches</title>
     <script src="../../polymer.js"></script>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
   </head>
   <body>
     <x-test id="test"></x-test>
diff --git a/test/html/bind-object-repeat.html b/test/html/bind-object-repeat.html
index e5e120b47d..00694e7094 100644
--- a/test/html/bind-object-repeat.html
+++ b/test/html/bind-object-repeat.html
@@ -3,8 +3,8 @@
   <head>
     <title>bind object + repeat</title>
     <script src="../../polymer.js"></script>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
   </head>
   <body>
     <polymer-element name="x-foo" attributes="obj">
diff --git a/test/html/bind.html b/test/html/bind.html
index 326c93d262..5fcd4d88ac 100644
--- a/test/html/bind.html
+++ b/test/html/bind.html
@@ -3,8 +3,8 @@
   <head>
     <title>bind simple</title>
     <script src="../../polymer.js"></script>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
   </head>
   <body>
     <x-foo></x-foo>
diff --git a/test/html/callbacks.html b/test/html/callbacks.html
index 2db7b3c1f3..6c3a4297c2 100644
--- a/test/html/callbacks.html
+++ b/test/html/callbacks.html
@@ -3,8 +3,8 @@
   <head>
     <title>callbacks</title>
     <script src="../../polymer.js"></script>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../tools/test/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
   </head>
   <body>
 
diff --git a/test/html/element-import.html b/test/html/element-import.html
index 656cdc1c60..40b35d72c5 100644
--- a/test/html/element-import.html
+++ b/test/html/element-import.html
@@ -3,8 +3,8 @@
 <head>
   <title>element script</title>
   <script src="../../polymer.js"></script>
-  <script src="../../tools/test/htmltest.js"></script>
-  <script src="../../node_modules/chai/chai.js"></script>
+  <script src="../../../tools/test/htmltest.js"></script>
+  <script src="../../../tools/test/chai/chai.js"></script>
   <link rel="import" href="element-import/import.html">
 </head>
 <body>
diff --git a/test/html/element-registration.html b/test/html/element-registration.html
index 08d9b40318..bfb43962ce 100644
--- a/test/html/element-registration.html
+++ b/test/html/element-registration.html
@@ -3,8 +3,8 @@
 <head>
   <title>element script</title>
   <script src="../../polymer.js"></script>
-  <script src="../../tools/test/htmltest.js"></script>
-  <script src="../../tools/test/chai/chai.js"></script>
+  <script src="../../../tools/test/htmltest.js"></script>
+  <script src="../../../tools/test/chai/chai.js"></script>
 </head>
 <body>
   <x-foo></x-foo>
@@ -30,6 +30,7 @@
 
   <x-blarg></x-blarg>
   <hr>
+  <li is="my-li"></li>
 
   <!-- script follows declaration -->
   <polymer-element name="x-foo">
@@ -128,6 +129,17 @@
     </script>
   </polymer-element>
 
+  <polymer-element name="my-li" extends="li">
+    <template>
+      Hello World
+    </template>
+    <script>
+      Polymer('my-li', {
+        custom: true
+      });
+    </script>
+  </polymer-element>
+
   <script>
     var assert = chai.assert;
     function test() {
@@ -143,6 +155,8 @@
       assert.equal(fizz.squid, 'fink');
       var zzif = document.querySelector('x-zzif');
       assert.equal(zzif.squid, 'zink');
+      var myLi = document.querySelector('[is=my-li]');
+      assert.equal(myLi.custom, true);
       done();
     }
   </script>
diff --git a/test/html/element-script.html b/test/html/element-script.html
index c2b2d6236a..4fc2a3ea9d 100644
--- a/test/html/element-script.html
+++ b/test/html/element-script.html
@@ -3,8 +3,8 @@
 <head>
   <title>element script</title>
   <script src="../../polymer.js"></script>
-  <script src="../../tools/test/htmltest.js"></script>
-  <script src="../../node_modules/chai/chai.js"></script>
+  <script src="../../../tools/test/htmltest.js"></script>
+  <script src="../../../tools/test/chai/chai.js"></script>
   <script src="element-script/elements.js"></script>
 </head>
 <body>
diff --git a/test/html/event-path-declarative.html b/test/html/event-path-declarative.html
index 9b26b0e954..a6684492aa 100644
--- a/test/html/event-path-declarative.html
+++ b/test/html/event-path-declarative.html
@@ -6,8 +6,8 @@
 <html>
   <head>
     <script src="../../polymer.js"></script>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
   </head>
   <body>
     <x-bar><div id="target">Test</div></x-bar>
diff --git a/test/html/event-path.html b/test/html/event-path.html
index 8ab12e9786..7e4f0b037e 100644
--- a/test/html/event-path.html
+++ b/test/html/event-path.html
@@ -3,8 +3,8 @@
   <head>
     <title>event path</title>
     <script src="../../polymer.js"></script>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
   </head>
   <body>
 
diff --git a/test/html/mdv-syntax.html b/test/html/mdv-syntax.html
index a464faa553..2b44c03e1a 100644
--- a/test/html/mdv-syntax.html
+++ b/test/html/mdv-syntax.html
@@ -9,8 +9,8 @@
   <meta charset="UTF-8">
   <title>mdv syntax</title>
   <script src="../../polymer.js"></script>
-  <script src="../../tools/test/htmltest.js"></script>
-  <script src="../../node_modules/chai/chai.js"></script>
+  <script src="../../../tools/test/htmltest.js"></script>
+  <script src="../../../tools/test/chai/chai.js"></script>
 </head>
 <body>
   <!-- bind -->
diff --git a/test/html/parser-rules-import.html b/test/html/parser-rules-import.html
index c3418ef411..eed7868580 100644
--- a/test/html/parser-rules-import.html
+++ b/test/html/parser-rules-import.html
@@ -2,8 +2,8 @@
 <html>
   <head>
     <title>HTML Imports Test</title>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
     <script src="../../custom-elements.js"></script>
   </head>
   <body>
diff --git a/test/html/parser-rules.html b/test/html/parser-rules.html
index ead81ff825..fab3994a86 100644
--- a/test/html/parser-rules.html
+++ b/test/html/parser-rules.html
@@ -2,8 +2,8 @@
 <html>
   <head>
     <title>HTML Imports Test</title>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
     <script src="../../polymer.js"></script>
   </head>
   <body>
diff --git a/test/html/prepare.html b/test/html/prepare.html
index 418e20f348..101607fce4 100644
--- a/test/html/prepare.html
+++ b/test/html/prepare.html
@@ -3,8 +3,8 @@
   <head>
     <title>prepare test</title>
     <script src="../../polymer.js"></script>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
   </head>
   <body>
 
diff --git a/test/html/prop-attr-reflection.html b/test/html/prop-attr-reflection.html
index 84cffd44d0..ce632537b0 100644
--- a/test/html/prop-attr-reflection.html
+++ b/test/html/prop-attr-reflection.html
@@ -3,8 +3,8 @@
   <head>
     <title>publish attributes</title>
     <script src="../../polymer.js"></script>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
   </head>
   <body>
 
diff --git a/test/html/prop-bind-oo.html b/test/html/prop-bind-oo.html
index 9a7a0b0eeb..9a59fa7fd5 100644
--- a/test/html/prop-bind-oo.html
+++ b/test/html/prop-bind-oo.html
@@ -3,8 +3,8 @@
   <head>
     <title>bind properties compatible with object observe</title>
     <script src="../../polymer.js"></script>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
   </head>
   <body>
     <x-test id="test"></x-test>
diff --git a/test/html/publish-attributes.html b/test/html/publish-attributes.html
index c38f055dbd..ebb55e1623 100644
--- a/test/html/publish-attributes.html
+++ b/test/html/publish-attributes.html
@@ -3,8 +3,8 @@
   <head>
     <title>publish attributes</title>
     <script src="../../polymer.js"></script>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
   </head>
   <body>
 
@@ -47,27 +47,11 @@
       document.addEventListener('WebComponentsReady', function() {
         //
         assert.deepEqual(
-            XFoo.prototype.__published, 
+            XFoo.prototype.publish, 
             {Foo: null, baz: null});
         assert.deepEqual(
-            XBar.prototype.__published, 
+            XBar.prototype.publish, 
             {Foo: null, baz: null, Bar: null});
-        /*assert.deepEqual(
-            XZot.prototype.__published, 
-            {Foo: null, baz: null, Bar: null, zot: 3});
-        assert.deepEqual(
-            XSquid.prototype.__published, 
-            {Foo: null, baz: 13, Bar: null, zot: 5, squid: 7});*/
-        //
-        /*
-        assert.equal(
-            Polymer.propertyForAttribute.call(XFoo.prototype, 'foo'), 
-            'Foo');
-        XFoo.prototype.baz = true;
-        assert.isUndefined(
-            Polymer.propertyForAttribute.call(XFoo.prototype, 'splat'));
-        */    
-        //
         done();
       });
     </script>
diff --git a/test/html/reflection.html b/test/html/reflection.html
new file mode 100644
index 0000000000..53685f1147
--- /dev/null
+++ b/test/html/reflection.html
@@ -0,0 +1,54 @@
+<!doctype html>
+<html>
+  <head>
+    <title>general reflection tests</title>
+    <script src="../../polymer.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
+  </head>
+  <body>
+
+  <x-one foo="squid"></x-one>
+
+  <polymer-element name="x-one" attributes="Foo bar baz">
+    <script>
+      Polymer('x-one', {
+        Foo: '1',
+        observe: {
+          blat: 'invalidate'
+        }
+      });
+    </script>
+  </polymer-element>
+
+  <polymer-element name="x-two" attributes="Foo bar baz">
+    <script>
+      Polymer('x-two', {
+        publish: {
+          zot: 3,
+          bar: 2
+        },
+        Foo: '1'
+      });
+    </script>
+  </polymer-element>
+
+  <x-three foo="3"></x-three>
+
+  <polymer-element name="x-three" extends="x-two" attributes="quux">
+    <script>
+      Polymer('x-three', {});
+    </script>
+  </polymer-element>
+
+  <script>
+    document.addEventListener('WebComponentsReady', function() {
+      var x1 = document.querySelector('x-one');
+      chai.assert.equal(x1.Foo, 'squid');
+      var x3 = document.querySelector('x-three');
+      chai.assert.equal(x3.Foo, '3');
+      done();
+    });
+  </script>
+  </body>
+</html>
diff --git a/test/html/styling/apply-reset-styles.html b/test/html/styling/apply-reset-styles.html
index aea8ce69f3..3834a38d52 100644
--- a/test/html/styling/apply-reset-styles.html
+++ b/test/html/styling/apply-reset-styles.html
@@ -8,8 +8,8 @@
 <head>
   <title>applyAuthorStyles / resetStyleInheirtance</title>
   <script src="../../../polymer.js"></script>
-  <script src="../../../tools/test/htmltest.js"></script>
-  <script src="../../../node_modules/chai/chai.js"></script>
+  <script src="../../../../tools/test/htmltest.js"></script>
+  <script src="../../../../tools/test/chai/chai.js"></script>
   <style>
     body {
       color: rgb(255, 0, 0);
diff --git a/test/html/styling/sheet-main-doc.html b/test/html/styling/sheet-main-doc.html
index 5edee1d26d..fe06ea96c5 100644
--- a/test/html/styling/sheet-main-doc.html
+++ b/test/html/styling/sheet-main-doc.html
@@ -9,8 +9,8 @@
   <meta name="viewport" content="initial-scale=1.0">
   <title>loading sheets in elements defined in main document</title>
   <script src="../../../polymer.js"></script>
-  <script src="../../../tools/test/htmltest.js"></script>
-  <script src="../../../node_modules/chai/chai.js"></script>
+  <script src="../../../../tools/test/htmltest.js"></script>
+  <script src="../../../../tools/test/chai/chai.js"></script>
   <link rel="import" href="x-sheet-main-doc.html">
 </head>
 <body>
diff --git a/test/html/styling/sheet-order.html b/test/html/styling/sheet-order.html
index c68c96c99f..ea10c99a1c 100644
--- a/test/html/styling/sheet-order.html
+++ b/test/html/styling/sheet-order.html
@@ -9,8 +9,8 @@
   <meta name="viewport" content="initial-scale=1.0">
   <title>Sheet order</title>
   <script src="../../../polymer.js"></script>
-  <script src="../../../tools/test/htmltest.js"></script>
-  <script src="../../../node_modules/chai/chai.js"></script>
+  <script src="../../../../tools/test/htmltest.js"></script>
+  <script src="../../../../tools/test/chai/chai.js"></script>
   <link rel="import" href="x-sheets.html">
   <style>
     div {
diff --git a/test/html/styling/sheet-scope.html b/test/html/styling/sheet-scope.html
index 9f97e9adc6..2b754057f4 100644
--- a/test/html/styling/sheet-scope.html
+++ b/test/html/styling/sheet-scope.html
@@ -8,8 +8,8 @@
 <head>
   <title>Sheet scope</title>
   <script src="../../../polymer.js"></script>
-  <script src="../../../tools/test/htmltest.js"></script>
-  <script src="../../../node_modules/chai/chai.js"></script>
+  <script src="../../../../tools/test/htmltest.js"></script>
+  <script src="../../../../tools/test/chai/chai.js"></script>
   <style>
   </style>
 </head>
diff --git a/test/html/take-attributes.html b/test/html/take-attributes.html
index 0378c8a80b..45dc7ac1c9 100644
--- a/test/html/take-attributes.html
+++ b/test/html/take-attributes.html
@@ -3,8 +3,8 @@
   <head>
     <title>take attributes</title>
     <script src="../../polymer.js"></script>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
   </head>
   <body>
 
diff --git a/test/html/template-distribute-dynamic.html b/test/html/template-distribute-dynamic.html
index 3f1f2844b5..385b020f61 100644
--- a/test/html/template-distribute-dynamic.html
+++ b/test/html/template-distribute-dynamic.html
@@ -3,8 +3,8 @@
   <head>
     <title>template distribute</title>
     <script src="../../polymer.js"></script>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
   </head>
   <body>
 
diff --git a/test/html/unbind.html b/test/html/unbind.html
index 4e4a61e937..025cde7990 100644
--- a/test/html/unbind.html
+++ b/test/html/unbind.html
@@ -3,8 +3,8 @@
   <head>
     <title>unbind</title>
     <script src="../../polymer.js"></script>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
   </head>
   <body>
 
diff --git a/test/runner.html b/test/runner.html
index c1af4de86d..33a098cfb5 100644
--- a/test/runner.html
+++ b/test/runner.html
@@ -9,10 +9,10 @@
     <title>Polymer Test Runner (Mocha)</title>
     <meta charset="UTF-8">
     <!-- -->
-    <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
-    <script src="../node_modules/mocha/mocha.js"></script>
-    <script src="../node_modules/chai/chai.js"></script>
-    <script src="../tools/test/mocha-htmltest.js"></script>
+    <link rel="stylesheet" href="../../tools/test/mocha/mocha.css" />
+    <script src="../../tools/test/mocha/mocha.js"></script>
+    <script src="../../tools/test/chai/chai.js"></script>
+    <script src="../../tools/test/mocha-htmltest.js"></script>
     <!-- -->
     <script src="../polymer.js" debug></script>
   </head>
diff --git a/tools b/tools
deleted file mode 160000
index 93f21ac3de..0000000000
--- a/tools
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 93f21ac3de9e71e054a8d4875a5d77852f4f769d