diff --git a/polymer-simplex.html b/polymer-simplex.html
index e3a3230bb8..1adafa3a66 100644
--- a/polymer-simplex.html
+++ b/polymer-simplex.html
@@ -11,8 +11,8 @@
 
 <link rel="import" href="src/features/base/mixins.html">
 <link rel="import" href="src/features/base/extends.html">
-<link rel="import" href="src/features/base/ready.html">
 <link rel="import" href="src/features/base/template.html">
+<link rel="import" href="src/features/base/ready.html">
 <link rel="import" href="src/features/base/content.html">
 
 <script>
@@ -39,6 +39,15 @@
       _simplexInit: function() {
         this.poolContent();
         this.stampTemplate();
+        this._finishInit();
+      },
+
+      _finishInit: function() {
+        this._finishSimplexInit();
+      },
+
+      _finishSimplexInit: function() {
+        this._checkReady();
       }
   
     });
diff --git a/polymer.html b/polymer.html
index 06672986d1..36280eccc3 100644
--- a/polymer.html
+++ b/polymer.html
@@ -37,12 +37,11 @@
         this._bootBindEffects();
       },
 
-      initFeatures: function() {
-        this._standardInit();
-      },
+      // initFeatures: function() {
+      //   this._standardInit();
+      // },
 
-      _standardInit: function() {
-        this._simplexInit();
+      _finishInit: function() {
         if (this._template) {
           this._marshalIdNodes();
           this._marshalAnnotatedNodes();
@@ -54,6 +53,7 @@
         this._installHostAttributes();
         this._listenListeners();
         this._listenKeyPresses();
+        this._finishSimplexInit();
       }
 
     });
diff --git a/src/features/base/content.html b/src/features/base/content.html
index 7e58b39668..c4521a63cc 100644
--- a/src/features/base/content.html
+++ b/src/features/base/content.html
@@ -33,37 +33,41 @@
         if (this._useContent) {
           // capture lightChildren to help reify dom scoping
           saveLightChildrenIfNeeded(this);
-          // create our lite ShadowRoot document fragment
-          // this is where the <template> contents will be stamped
-          var root = document.createDocumentFragment();
-          // add a pointer back from the lite ShadowRoot to this node.
-          root.host = this;
-          // initialize the `root` pointers: `root` is guarenteed to always be
-          // available, and be either `this` or `this.contentRoot`. By contrast,
-          // `contentRoot` is only set if _useContent is true. 
-          this.contentRoot = root;
-          this.root = root;
-          // TODO(jmesserly): ad-hoc signal for `ShadowDOM-lite-enhanced` root
-          root.isShadowRoot = true;
+          // TODO(sorvell): ad-hoc signal for `ShadowDOM-lite-enhanced` root
+          this.hasShadyRoot = true;
         }
       },
 
       distributeContent: function() {
-        // sanity check to guard against uninitialized state
-        if (!this.contentRoot) {
-          throw Error('poolContent() must be called before distributeContent()');
+        // logically distribute self
+        if (this._useContent) {
+          // NOTE: contentRoot is primarily available to enable testing
+          if (!this.contentRoot) {
+            this.contentRoot = this.root;
+            this.root = this;
+          }
+          // reset distributions
+          // NOTE: `contentRoot` is populated only for the first 
+          // distribution. After that dom should be in the composed tree and
+          // distribution info should not be reset.
+          this._resetDistribution(this.contentRoot);
+          // compute which nodes should be distributed where
+          // TODO(jmesserly): this is simplified because we assume a single
+          // ShadowRoot per host and no `<shadow>`.
+          this._distributePool(this.contentRoot, this._collectPool());
+        }
+        // now fully distribute/compose "clients"
+        var l = this._clients.length;
+        for (var i=0, c; (i<l) && (c=this._clients[i]); i++) {
+          c.distributeContent();
+        }
+        // compose self
+        if (this._useContent) {
+          this._composeTree(this);
+        } else if (this.root !== this) {
+          this.appendChild(this.root);
+          this.root = this;
         }
-        // NOTE: `contentRoot` is populated only for the first 
-        // distribution. After that dom should be in the composed tree and
-        // distribution info should not be reset.
-        // reset distributions
-        this._resetDistribution(this.contentRoot);
-        // compute which nodes should be distributed where
-        // TODO(jmesserly): this is simplified because we assume a single
-        // ShadowRoot per host and no `<shadow>`.
-        this._distributePool(this.contentRoot, this._collectPool());
-        // update the real DOM to be the composed tree
-        this._composeTree(this);
       },
 
       // TODO(jmesserly): these methods will perform in O(N^2) where N is the
@@ -175,7 +179,7 @@
         for (var i = 0; i < children.length; i++) {
           var child = children[i];
           // If the child has a content root, let it compose itself.
-          if (!child.contentRoot) {
+          if (!child.hasShadyRoot) {
             this._composeTree(child);
           }
         }
diff --git a/src/features/base/ready.html b/src/features/base/ready.html
index 85a09717c5..646f70c56a 100644
--- a/src/features/base/ready.html
+++ b/src/features/base/ready.html
@@ -31,82 +31,65 @@
     
     */
 
+    var hostStack = [];
+
     Base.addFeature({
 
       // for overriding
       ready: function() {
       },
 
-      originalAttachedCallback: Base.attachedCallback,
-      
-      // Checks if this element is inside another Polymer element. If so,
-      // then pushes this element into an array of `_readyListeners`; if
-      // not, starts the notify cascade.
-      attachedCallback: function() {
-        this.originalAttachedCallback();
-        this._checkReady();
+      queryHost: function() {
+        return this.host;
       },
 
-      _checkReady: function() {
-        if (!this._readied) {
-          var host = this.queryHost();
-          if (host && !host._readied) {
-            host._listenReady(this);
-          } else {
-            this._notifyReady();
-          }
+      // 1. set this element's `host` and push this element onto the `host`'s
+      // list of `client` elements
+      // 2. establish this element as the current hosting element (allows 
+      // any elements we stamp to easily set host to us).
+      _prepareStamping: function() {
+        this.host = hostStack[hostStack.length-1];
+        if (this.host) {
+          this.host._clients.push(this);
         }
+        if (!this._clients) {
+          this._clients = [];
+        }
+        hostStack.push(this);
       },
 
-      queryHost: function(node) {
-        return this.host || this._queryHost(this);
-      },
-
-      _queryHost: function(node) {
-        return node && 
-          (node.host || (node.host = this._queryHost(node.parentNode)));
-      },
-
-      _listenReady: function(element) {
-        if (!this._readyListeners) {
-          this._readyListeners = [];
+      // 1. this element is no longer the current hosting element
+      // 2. if necessary, perform dom composition.
+      _finishStamping: function() {
+        hostStack.pop();
+        if (this._readied || !this.host || this.host._readied) {
+          this.distributeContent();
         }
-        this._readyListeners.push(element);
       },
 
-      // TODO(sorvell): this will need more modification.
-      // We want distribution to run to completion prior to any user `ready`
-      // methods running. Therefore we have 2 ready passes, one for distribution
-      // and one for user methods.
-      _notifyReady: function() {
-        this._broadcast('_ready');
-        this._broadcast('ready', true);
+      _checkReady: function() {
+        if (!this.host || this.host._readied) {
+          this._ready();
+        }
       },
 
-      _broadcast: function(method, cleanup) {
-        // console.group(method, '[' + this.tag + '#' + this.id + ']', 'ready');
-        this[method]();
-        var n$ = this._readyListeners;
-        if (n$) {
+      // call `ready` if necessary ensuring host -> client ordering.
+      _ready: function() {
+        if (!this._readied) {
+          // ready myself
+          this._readied = true;
+          this.ready();
+          // ready my clients...
+          var n$ = this._clients;
           for (var i=0, l=n$.length, n; (i<l) && (n=n$[i]); i++) {
-            n._broadcast(method, cleanup);
+            n._ready();
           }
+          // TODO(sorvell): this leaks if we don't clean it up here, but
+          // it's currently needed for dynamic shadyDOM distribution... =(
+          //this._clients = [];
         }
-        if (cleanup) {
-          this._readyListeners = null;
-        }
-        // console.groupEnd(method, '[' + this.tag + '#' + this.id + ']', 'ready');
       },
 
-      _ready: function() {
-        this._readied = true;
-        // TODO(jmesserly): this is a hook to allow content.html to be called
-        // before "ready". This needs to be factored better.
-        if (this._useContent) {
-          this.distributeContent();
-        }
-      }
-
     });
 
   });
diff --git a/src/features/base/template.html b/src/features/base/template.html
index c7a6c9b76c..c31d80fc88 100644
--- a/src/features/base/template.html
+++ b/src/features/base/template.html
@@ -22,24 +22,22 @@
       },
 
       stampTemplate: function() {
+        // establishes this element as the current `host` 
+        // so stamped elements can lookup host
+        this._prepareStamping();
         if (this._template) {
-          this._stampTemplate(this._template, this.root);
+          // note: root is now a fragment which can be manipulated
+          // while not attached to the element.
+          this.root = this.instanceTemplate(this._template);
           // TODO(sjmiles): hello prollyfill
           if (window.CustomElements && CustomElements.upgradeSubtree) {
             CustomElements.upgradeSubtree(this.root);
           }
         }
-      },
-
-      _stampTemplate: function(template, target) {
-        var instance = this.instanceTemplate(template);
-        // identify host 
-        // NOTE: must use node tree, not element tree because Safari doesn't have
-        // a concept of elements in fragments 
-        for (var e = instance.firstChild; e; e=e.nextSibling) {
-          e.host = this;
-        }
-        target.insertBefore(instance, target.firstChild);
+        // ensures dom is fully composed and attached to the element;
+        // removes this element as the current `host`
+        // after this, `this.root` points to the element itself.
+        this._finishStamping();
       },
 
       instanceTemplate: function(template) {
diff --git a/test/unit/content.html b/test/unit/content.html
index 884e82a705..4e15afc1b7 100644
--- a/test/unit/content.html
+++ b/test/unit/content.html
@@ -16,15 +16,18 @@
   <link rel="import" href="../../polymer.html">
 </head>
 <body>
+<template></template>
 <script>
 
 // TODO(sorvell): cannot register element in main document under polyfill.
 var registered = false;
 function registerTestElement() {
   if (registered) return;
+  var template = document.querySelector('template');
   Polymer({
-    tag: 'x-content-test', 
-    _useContent: true
+    tag: 'x-content-test',
+    _useContent: true,
+    _template: template
   });
   registered = true;
 }
@@ -51,7 +54,7 @@
     host.innerHTML = hostInnerHtml;
     syncLightDOM(host);
     // Pretend we're stamping the template contents.
-    setInnerHTML(host.root, shadowRootHtml);
+    setInnerHTML(host.contentRoot, shadowRootHtml);
     // Invoke distribution and verify the resulting tree.
     host.distributeContent();
     assert.strictEqual(host.innerHTML, expectedHtml);
@@ -93,14 +96,15 @@
 
 
 test('Reproject', function() {
+  registerTestElement();
   var host = document.createElement('x-content-test');
   host.innerHTML = '<a></a>';
   var a = host.firstChild;
   syncLightDOM(host);
-  setInnerHTML(host.root, '<x-content-test id="p">' +
-      '<b></b><content></content></x-content-test>');
-
-  var p = host.root.firstChild;
+  setInnerHTML(host.contentRoot, '<x-content-test id="p"></x-content-test>');
+  var p = host.contentRoot.firstChild;
+  host._clients.push(p);
+  p.innerHTML = '<b></b><content></content>';
   var b = p.firstChild;
   var content = p.lastChild;
 
@@ -108,12 +112,12 @@
   CustomElements.upgrade(p);
 
   syncLightDOM(p);
-  setInnerHTML(p.root,
+  setInnerHTML(p.contentRoot,
       'a: <content select=a></content>b: <content select=b></content>');
-  var textNodeA = p.root.firstChild;
-  var contentA = p.root.childNodes[1];
-  var textNodeB = p.root.childNodes[2]
-  var contentB = p.root.childNodes[3];
+  var textNodeA = p.contentRoot.firstChild;
+  var contentA = p.contentRoot.childNodes[1];
+  var textNodeB = p.contentRoot.childNodes[2]
+  var contentB = p.contentRoot.childNodes[3];
 
   function testRender() {
     // Simulate the correct ordering as "ready" would fire.
@@ -125,12 +129,12 @@
 
     assertArrayEqual(host.lightChildren, [a]);
     assert.strictEqual(a.lightParent, host);
-    assertArrayEqual(host.root.lightChildren, [p]);
-    assert.strictEqual(p.lightParent, host.root);
+    assertArrayEqual(host.contentRoot.lightChildren, [p]);
+    assert.strictEqual(p.lightParent, host.contentRoot);
     assertArrayEqual(p.lightChildren, [b, content]);
     assert.strictEqual(b.lightParent, p);
     assert.strictEqual(content.lightParent, p);
-    assertArrayEqual(p.root.lightChildren,
+    assertArrayEqual(p.contentRoot.lightChildren,
         [textNodeA, contentA, textNodeB, contentB]);
   }
 
@@ -145,7 +149,7 @@
     host.innerHTML = '<a>Hello</a>';
 
     syncLightDOM(host);
-    setInnerHTML(host.root, '<content>fallback</content>');
+    setInnerHTML(host.contentRoot, '<content>fallback</content>');
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a>Hello</a>');
 
@@ -164,15 +168,15 @@
     host.innerHTML = '<a>Hello</a>';
 
     syncLightDOM(host);
-    setInnerHTML(host.root, '<content></content><b>after</b>');
+    setInnerHTML(host.contentRoot, '<content></content><b>after</b>');
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a>Hello</a><b>after</b>');
 
-    host.root.lightChildren[1].textContent = '';
+    host.contentRoot.lightChildren[1].textContent = '';
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a>Hello</a><b></b>');
 
-    host.root.lightChildren = [];
+    host.contentRoot.lightChildren = [];
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '');
   });
@@ -182,8 +186,8 @@
     host.innerHTML = '<a>Hello</a>';
 
     syncLightDOM(host);
-    setInnerHTML(host.root, '<content select="xxx"><b>fallback</b></content>');
-    var b = host.root.firstChild.firstChild;
+    setInnerHTML(host.contentRoot, '<content select="xxx"><b>fallback</b></content>');
+    var b = host.contentRoot.firstChild.firstChild;
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<b>fallback</b>');
 
@@ -191,11 +195,11 @@
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<b></b>');
 
-    host.root.firstChild.lightChildren = [];
+    host.contentRoot.firstChild.lightChildren = [];
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '');
 
-    host.root.lightChildren = [];
+    host.contentRoot.lightChildren = [];
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '');
   });
@@ -205,7 +209,7 @@
     host.innerHTML = '<a>Hello</a>';
 
     syncLightDOM(host);
-    setInnerHTML(host.root, '<content>fallback</content>');
+    setInnerHTML(host.contentRoot, '<content>fallback</content>');
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a>Hello</a>');
 
@@ -225,7 +229,7 @@
     var b = a.nextSibling;
 
     syncLightDOM(host);
-    setInnerHTML(host.root, '<content>fallback</content>');
+    setInnerHTML(host.contentRoot, '<content>fallback</content>');
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a></a><b></b>');
 
@@ -241,8 +245,8 @@
     host.innerHTML = '<a>Hello</a>';
 
     syncLightDOM(host);
-    setInnerHTML(host.root, '<content></content><b>after</b>');
-    var b = host.root.lastChild;
+    setInnerHTML(host.contentRoot, '<content></content><b>after</b>');
+    var b = host.contentRoot.lastChild;
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a>Hello</a><b>after</b>');
 
@@ -250,11 +254,11 @@
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a>Hello</a><b></b>');
 
-    host.root.lightChildren.splice(1, 1); // remove b
+    host.contentRoot.lightChildren.splice(1, 1); // remove b
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a>Hello</a>');
 
-    host.root.lightChildren = []; // remove a
+    host.contentRoot.lightChildren = []; // remove a
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '');
   });
@@ -265,16 +269,16 @@
     host.innerHTML = '<a>Hello</a><b>World</b>';
 
     syncLightDOM(host);
-    setInnerHTML(host.root, '<content select="b">fallback b</content>' +
+    setInnerHTML(host.contentRoot, '<content select="b">fallback b</content>' +
                             '<content select="a">fallback a</content>');
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<b>World</b><a>Hello</a>');
 
-    host.root.firstChild.setAttribute('select', 'xxx');
+    host.contentRoot.firstChild.setAttribute('select', 'xxx');
     host.distributeContent();
     assert.strictEqual(host.innerHTML, 'fallback b<a>Hello</a>');
 
-    host.root.firstChild.setAttribute('select', '');
+    host.contentRoot.firstChild.setAttribute('select', '');
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a>Hello</a><b>World</b>fallback a');
   });
@@ -284,7 +288,7 @@
     host.innerHTML = '<a>Hello</a>';
 
     syncLightDOM(host);
-    setInnerHTML(host.root, '<content></content>');
+    setInnerHTML(host.contentRoot, '<content></content>');
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a>Hello</a>');
 
@@ -298,12 +302,12 @@
     host.innerHTML = '<a>Hello</a>';
 
     syncLightDOM(host);
-    setInnerHTML(host.root, '<content></content>');
+    setInnerHTML(host.contentRoot, '<content></content>');
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a>Hello</a>');
 
     var b = document.createElement('b');
-    host.root.appendChild(b);
+    host.contentRoot.appendChild(b);
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a>Hello</a><b></b>');
   });
@@ -314,7 +318,7 @@
     var a = host.firstChild;
 
     syncLightDOM(host);
-    setInnerHTML(host.root, '<content></content>');
+    setInnerHTML(host.contentRoot, '<content></content>');
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a>Hello</a>');
 
@@ -328,13 +332,13 @@
     host.innerHTML = '<a>Hello</a>';
 
     syncLightDOM(host);
-    setInnerHTML(host.root, '<content></content>');
-    var content = host.root.firstChild;
+    setInnerHTML(host.contentRoot, '<content></content>');
+    var content = host.contentRoot.firstChild;
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a>Hello</a>');
 
     var b = document.createElement('b');
-    host.root.insertBefore(b, content);
+    host.contentRoot.insertBefore(b, content);
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<b></b><a>Hello</a>');
   });
@@ -345,7 +349,7 @@
     var a = host.firstChild;
 
     syncLightDOM(host);
-    setInnerHTML(host.root, '<content></content>');
+    setInnerHTML(host.contentRoot, '<content></content>');
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a>Hello</a>');
 
@@ -360,13 +364,13 @@
     host.innerHTML = '<a>Hello</a>';
 
     syncLightDOM(host);
-    setInnerHTML(host.root, '<content></content>');
-    var content = host.root.firstChild;
+    setInnerHTML(host.contentRoot, '<content></content>');
+    var content = host.contentRoot.firstChild;
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<a>Hello</a>');
 
     var b = document.createElement('b');
-    host.root.replaceChild(b, content);
+    host.contentRoot.replaceChild(b, content);
     host.distributeContent();
     assert.strictEqual(host.innerHTML, '<b></b>');
   });