diff --git a/src/lib/dom-api-classlist.html b/src/lib/dom-api-classlist.html
new file mode 100644
index 0000000000..7b405ad186
--- /dev/null
+++ b/src/lib/dom-api-classlist.html
@@ -0,0 +1,54 @@
+<!--
+@license
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<script>
+
+(function() {
+  'use strict';
+
+  var DomApi = Polymer.DomApi.ctor;
+
+  Object.defineProperty(DomApi.prototype, 'classList', {
+    get: function() {
+      if (!this._classList) {
+        this._classList = new DomApi.ClassList(this);
+      }
+      return this._classList;
+    },
+    configurable: true
+  });
+
+  DomApi.ClassList = function(host) {
+    this.domApi = host;
+    this.node = host.node;
+  }
+
+  DomApi.ClassList.prototype = {
+    add: function() {
+      this.node.classList.add.apply(this.node.classList, arguments);
+      this.domApi._distributeParent();
+    },
+
+    remove: function() {
+      this.node.classList.remove.apply(this.node.classList, arguments);
+      this.domApi._distributeParent();
+    },
+
+    toggle: function() {
+      this.node.classList.toggle.apply(this.node.classList, arguments);
+      this.domApi._distributeParent();
+    },
+    contains: function() {
+      return this.node.classList.contains.apply(this.node.classList,
+        arguments);
+    }
+  }
+
+})();
+</script>
\ No newline at end of file
diff --git a/src/lib/dom-api-event.html b/src/lib/dom-api-event.html
new file mode 100644
index 0000000000..fff14f980a
--- /dev/null
+++ b/src/lib/dom-api-event.html
@@ -0,0 +1,93 @@
+<!--
+@license
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<link rel="import" href="settings.html">
+<script>
+Polymer.EventApi = (function() {
+  'use strict';
+
+  var DomApi = Polymer.DomApi.ctor;
+  var Settings = Polymer.Settings;
+
+  DomApi.Event = function(event) {
+    this.event = event;
+  };
+
+  if (Settings.useShadow) {
+
+    DomApi.Event.prototype = {
+      
+      get rootTarget() {
+        return this.event.path[0];
+      },
+
+      get localTarget() {
+        return this.event.target;
+      },
+
+      get path() {
+        return this.event.path;
+      }
+
+    };
+
+  } else {
+
+    DomApi.Event.prototype = {
+    
+      get rootTarget() {
+        return this.event.target;
+      },
+
+      get localTarget() {
+        var current = this.event.currentTarget;
+        var currentRoot = current && Polymer.dom(current).getOwnerRoot();
+        var p$ = this.path;
+        for (var i=0; i < p$.length; i++) {
+          if (Polymer.dom(p$[i]).getOwnerRoot() === currentRoot) {
+            return p$[i];
+          }
+        }
+      },
+
+      // TODO(sorvell): simulate event.path. This probably incorrect for
+      // non-bubbling events.
+      get path() {
+        if (!this.event._path) {
+          var path = [];
+          var o = this.rootTarget;
+          while (o) {
+            path.push(o);
+            o = Polymer.dom(o).parentNode || o.host;
+          }
+          // event path includes window in most recent native implementations
+          path.push(window);
+          this.event._path = path;
+        }
+        return this.event._path;
+      }
+
+    };
+
+  }
+
+  var factory = function(event) {
+    if (!event.__eventApi) {
+      event.__eventApi = new DomApi.Event(event);
+    }
+    return event.__eventApi;
+  };
+
+  return {
+    factory: factory
+  };
+
+})();
+
+</script>
diff --git a/src/lib/dom-api-flush.html b/src/lib/dom-api-flush.html
new file mode 100644
index 0000000000..8c0ae43b53
--- /dev/null
+++ b/src/lib/dom-api-flush.html
@@ -0,0 +1,68 @@
+<!--
+@license
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<script>
+
+  // add Polymer.dom flush api...
+  Polymer.Base.extend(Polymer.dom, {
+    
+    _flushGuard: 0,
+    _FLUSH_MAX: 100,
+    _needsTakeRecords: !Polymer.Settings.useNativeCustomElements,
+    _debouncers: [],
+    _finishDebouncer: null,
+
+    // flush and debounce exposed as statics on Polymer.dom
+    flush: function() {
+      // flush debouncers
+      for (var i=0; i < this._debouncers.length; i++) {
+        this._debouncers[i].complete();
+      }
+      // clear the list of debouncers
+      if (this._finishDebouncer) {
+        this._finishDebouncer.complete();
+      }
+      // again make any pending CE mutations that might trigger debouncer
+      // additions go...
+      this._flushPolyfills();
+      // flush again if there are now any debouncers to process
+      if (this._debouncers.length && this._flushGuard < this._FLUSH_MAX) {
+        this._flushGuard++;
+        this.flush();
+      } else {
+        if (this._flushGuard >= this._FLUSH_MAX) {
+          console.warn('Polymer.dom.flush aborted. Flush may not be complete.')
+        }
+        this._flushGuard = 0;
+      }
+    },
+
+    // TODO(sorvell): There is currently not a good way 
+    // to process all custom elements mutations under SD polyfill because
+    // these mutations may be inside shadowRoots. 
+    _flushPolyfills: function() {
+      if (this._needsTakeRecords) {
+        CustomElements.takeRecords();
+      }
+    },
+
+    addDebouncer: function(debouncer) {
+      this._debouncers.push(debouncer);
+      // ensure the list of active debouncers is cleared when done.
+      this._finishDebouncer = Polymer.Debounce(this._finishDebouncer, 
+        this._finishFlush);
+    },
+
+    _finishFlush: function() {
+      Polymer.dom._debouncers = [];
+    }
+
+  });
+
+</script>
\ No newline at end of file
diff --git a/src/lib/dom-api-mutation-content.html b/src/lib/dom-api-mutation-content.html
new file mode 100644
index 0000000000..438f5fc9b7
--- /dev/null
+++ b/src/lib/dom-api-mutation-content.html
@@ -0,0 +1,129 @@
+<!--
+@license
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<link rel="import" href="settings.html">
+<script>
+(function() {
+  'use strict';
+
+    var DomApi = Polymer.DomApi.ctor;
+    var Settings = Polymer.Settings;
+
+    DomApi.prototype.observeDistributedNodes = function(callback) {
+      if (!this._observer) {
+        this._observer = new DomApi.Mutation(this);
+      }
+      return this._observer.addObserver(callback);
+    };
+
+    DomApi.prototype.unobserveDistributedNodes = function(handle) {
+      if (this._observer) {
+        this._observer.removeObserver(handle);
+      }
+    }
+
+    DomApi.MutationContent = function(domApi) {
+      this.domApi = domApi;
+      this.node = this.domApi.node;
+      this._observers = [];
+      this._addedNodes = [];
+      this._removedNodes = [];
+    };
+
+    DomApi.MutationContent.prototype = {
+
+      // addObserver: function(callback) {
+      //   return this._observers.push(callback);
+      // },
+
+      // removeObserver: function(handle) {
+      //   this._observers.splice(handle - 1, 1);
+      // },
+
+      // hasObservers: function() {
+      //   return Boolean(this._observers.length);
+      // },
+
+      // _scheduleMutationNotify: function() {
+      //   this._mutationDebouncer = Polymer.Debounce(this._mutationDebouncer, 
+      //     this._notifyObservers);
+      //   this._mutationDebouncer.context = this;
+      //   Polymer.dom.addDebouncer(this._mutationDebouncer);
+      // },
+
+      // _notifyObservers: function(mxns) {
+      //   var info = {
+      //     target: this.node,
+      //     addedNodes: this._addedNodes,
+      //     removedNodes: this._removedNodes
+      //   }
+      //   var o$ = this._observers;
+      //   for (var i=0, o; (i < o$.length) && (o=o$[i]); i++) {
+      //     o.call(null, info);
+      //   }
+      //   this._addedNodes = [];
+      //   this._removedNodes = [];
+      // }
+
+      // observeDistributedNodes: function(callback) {
+      //   if (this.node.localName !== 'content') {
+      //     console.warn('Must call `observeDistributedNodes` on a <content> element.');
+      //     return;
+      //   }
+      //   // setup <content>.getDistributedNodes observation
+      //   if (!this.hasObservers()) {
+      //     this._startObserveDistributedNodes();
+      //   }
+      //   this._addObserver(callback);
+      // },
+
+      // unobserveDistributedNodes: function(handle) {
+      //   if (this.node.localName !== 'content') {
+      //     return;
+      //   }
+      //   this._removeObserver(handle);
+      //   if (!this.hasObservers()) {
+      //     this._stopObservingDistributedNodes();
+      //   }
+      // },
+
+      // _startObservingDistributedNodes: function() {
+      //   this._distributedObservers = [];
+      //   var root = this.getOwnerRoot();
+      //   var host = root && root.host;
+      //   if (host) {
+      //     var h = Polymer.dom(host)
+      //       .observeChildren(this._scheduleDistributedNodesNotify);
+      //     this._distributedObservers.push(h);
+      //   }
+      // },
+
+      // _stopObservingDistributedNodes: function() {
+        
+      // },
+
+      // _scheduleDistributedNodesNotify: function() {
+      //   this._distributedNodesDebouncer = 
+      //     Polymer.Debounce(this._distributedNodesDebouncer, 
+      //     this._notifyObservers);
+      //   this._distributedNodesDebouncer.context = this.node;
+      //   Polymer.dom.addDebouncer(this._distributedNodesDebouncer);
+      // },
+
+    };
+
+    if (Settings.useShadow) {
+
+    
+
+    }
+
+})();
+
+</script>
\ No newline at end of file
diff --git a/src/lib/dom-api-mutation.html b/src/lib/dom-api-mutation.html
new file mode 100644
index 0000000000..cd8e825c27
--- /dev/null
+++ b/src/lib/dom-api-mutation.html
@@ -0,0 +1,215 @@
+<!--
+@license
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<link rel="import" href="settings.html">
+<script>
+(function() {
+  'use strict';
+
+    var DomApi = Polymer.DomApi.ctor;
+    var Settings = Polymer.Settings;
+
+    DomApi.prototype.observeChildren = function(callback) {
+      if (!this._observer) {
+        this._observer = new DomApi.Mutation(this);
+      }
+      return this._observer.addObserver(callback);
+    };
+
+    DomApi.prototype.unobserveChildren = function(handle) {
+      if (this._observer) {
+        this._observer.removeObserver(handle);
+      }
+    }
+
+    DomApi.Mutation = function(domApi) {
+      this.domApi = domApi;
+      this.node = this.domApi.node;
+      this._observers = [];
+      this._addedNodes = [];
+      this._removedNodes = [];
+    };
+
+    DomApi.Mutation.prototype = {
+
+      addObserver: function(callback) {
+        return this._observers.push(callback);
+      },
+
+      removeObserver: function(handle) {
+        this._observers.splice(handle - 1, 1);
+      },
+
+      hasObservers: function() {
+        return Boolean(this._observers.length);
+      },
+
+      addNode: function(node) {
+        if (this.hasObservers()) {
+          this._addedNodes.push(node);
+          this._scheduleMutationNotify();
+        }
+      },
+
+      removeNode: function(node) {
+        if (this.hasObservers()) {
+          this._removedNodes.push(node);
+          this._scheduleMutationNotify();
+        }
+      },
+
+      addAllNodes: function() {
+        if (this.hasObservers()) {
+          var c$ = this.domApi.childNodes;
+          for (var i=0, c; (i < c$.length) && (c=c$[i]); i++) {
+            this.addNode(c);
+          }
+        }
+      },
+
+      _scheduleMutationNotify: function() {
+        this._mutationDebouncer = Polymer.Debounce(this._mutationDebouncer, 
+          this._notifyObservers);
+        this._mutationDebouncer.context = this;
+        Polymer.dom.addDebouncer(this._mutationDebouncer);
+      },
+
+      _notifyObservers: function(mxns) {
+        var info = {
+          target: this.node,
+          addedNodes: this._addedNodes,
+          removedNodes: this._removedNodes
+        }
+        var o$ = this._observers;
+        for (var i=0, o; (i < o$.length) && (o=o$[i]); i++) {
+          o.call(null, info);
+        }
+        this._addedNodes = [];
+        this._removedNodes = [];
+      }
+
+      // observeDistributedNodes: function(callback) {
+      //   if (this.node.localName !== 'content') {
+      //     console.warn('Must call `observeDistributedNodes` on a <content> element.');
+      //     return;
+      //   }
+      //   // setup <content>.getDistributedNodes observation
+      //   if (!this.hasObservers()) {
+      //     this._startObserveDistributedNodes();
+      //   }
+      //   this._addObserver(callback);
+      // },
+
+      // unobserveDistributedNodes: function(handle) {
+      //   if (this.node.localName !== 'content') {
+      //     return;
+      //   }
+      //   this._removeObserver(handle);
+      //   if (!this.hasObservers()) {
+      //     this._stopObservingDistributedNodes();
+      //   }
+      // },
+
+      // _startObservingDistributedNodes: function() {
+      //   this._distributedObservers = [];
+      //   var root = this.getOwnerRoot();
+      //   var host = root && root.host;
+      //   if (host) {
+      //     var h = Polymer.dom(host)
+      //       .observeChildren(this._scheduleDistributedNodesNotify);
+      //     this._distributedObservers.push(h);
+      //   }
+      // },
+
+      // _stopObservingDistributedNodes: function() {
+        
+      // },
+
+      // _scheduleDistributedNodesNotify: function() {
+      //   this._distributedNodesDebouncer = 
+      //     Polymer.Debounce(this._distributedNodesDebouncer, 
+      //     this._notifyObservers);
+      //   this._distributedNodesDebouncer.context = this.node;
+      //   Polymer.dom.addDebouncer(this._distributedNodesDebouncer);
+      // },
+
+    };
+
+    if (Settings.useShadow) {
+
+      Polymer.Base.extend(DomApi.Mutation.prototype, {
+        
+        addObserver: function(callback) {
+          this._ensureObserver();
+          return this._observers.push(callback);
+        },
+
+        _ensureObserver: function() {
+          if (!this._observer) {
+            this._observer = 
+              new MutationObserver(this._notifyObservers.bind(this));
+            this._observer.observe(this.node, {childList: true});
+            // make sure to notify initial state...
+            this._mutationDebouncer = Polymer.Debounce(this._mutationDebouncer, 
+              function() {
+                this._notifyObservers([{
+                  target: this.node, 
+                  addedNodes: this.domApi.childNodes.slice()
+                }]);
+              }
+            );
+            this._mutationDebouncer.context = this;
+            Polymer.dom.addDebouncer(this._mutationDebouncer);
+          }
+        },
+
+        _notifyObservers: function(mxns) {
+          var info = {
+            target: this.node,
+            addedNodes: [],
+            removedNodes: []
+          };
+          mxns.forEach(function(m) {
+            if (m.addedNodes) {
+              for (var i=0; i < m.addedNodes.length; i++) {
+                info.addedNodes.push(m.addedNodes[i]);
+              }
+            }
+            if (m.removedNodes) {
+              for (var i=0; i < m.removedNodes.length; i++) {
+                info.removedNodes.push(m.removedNodes[i]);
+              }
+            }
+          });
+          if (info.addedNodes.length || info.removedNodes.length) {
+            var o$ = this._observers;
+            for (var i=0, o; (i < o$.length) && (o=o$[i]); i++) {
+              o.call(null, info);
+            }
+          }
+        },
+
+        _flush: function() {
+          this._notifyObservers(this._observer.takeRecords());
+        }
+
+      });
+
+      DomApi.prototype.flush = function() {
+        if (this._observer) {
+          this._observer._flush();
+        }
+        Polymer.dom.flush();
+      }
+
+    }
+
+})();
+
+</script>
\ No newline at end of file
diff --git a/src/lib/dom-api.html b/src/lib/dom-api.html
index dd4443b2ae..9439668a43 100644
--- a/src/lib/dom-api.html
+++ b/src/lib/dom-api.html
@@ -8,7 +8,6 @@
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <link rel="import" href="settings.html">
-<link rel="import" href="event-api.html">
 <link rel="import" href="dom-innerHTML.html">
 <script>
 
@@ -26,9 +25,6 @@
 
     var DomApi = function(node) {
       this.node = node;
-      this._observers = [];
-      this._addedNodes = [];
-      this._removedNodes = []
       if (this.patch) {
         this.patch();
       }
@@ -68,8 +64,7 @@
       // 3. node is <content> (host of container needs distribution)
       appendChild: function(node) {
         var handled;
-        this._recordMutationRemoveFromParent(node);
-        this._removeNodeFromHost(node, true);
+        this._removeNodeFromParent(node);
         if (this._nodeIsInLogicalTree(this.node)) {
           this._addLogicalInfo(node, this.node);
           this._addNodeToHost(node);
@@ -82,7 +77,9 @@
           addToComposedParent(container, node);
           nativeAppendChild.call(container, node);
         }
-        this._recordMutationAdd(node);
+        if (this._observer) {
+          this._observer.addNode(node);
+        }
         return node;
       },
 
@@ -91,8 +88,7 @@
           return this.appendChild(node);
         }
         var handled;
-        this._recordMutationRemoveFromParent(node);
-        this._removeNodeFromHost(node, true);
+        this._removeNodeFromParent(node);
         if (this._nodeIsInLogicalTree(this.node)) {
           saveLightChildrenIfNeeded(this.node);
           var children = this.childNodes;
@@ -115,7 +111,9 @@
           addToComposedParent(container, node, ref_node);
           nativeInsertBefore.call(container, node, ref_node);
         }
-        this._recordMutationAdd(node);
+        if (this._observer) {
+          this._observer.addNode(node);
+        }
         return node;
       },
 
@@ -143,7 +141,9 @@
             nativeRemoveChild.call(container, node);
           }
         }
-        this._recordMutationRemove(node);
+        if (this._observer) {
+          this._observer.removeNode(node);
+        }
         return node;
       },
 
@@ -247,6 +247,17 @@
         return parent && parent.shadyRoot && hasInsertionPoint(parent.shadyRoot);
       },
 
+      _removeNodeFromParent: function(node) {
+        var parent = node._lightParent;
+        if (parent && hasDomApi(parent)) {
+          var d =  factory(parent);
+          if (d._observer) {
+            d._observer.removeNode(node);
+          }
+        }
+        this._removeNodeFromHost(node, true);
+      },
+
       // NOTE: if `ensureComposedRemoval` is true then the node should be
       // removed from its composed parent.
       _removeNodeFromHost: function(node, ensureComposedRemoval) {
@@ -486,109 +497,10 @@
           }
         }
         return n;
-      },
-
-      observeChildren: function(callback) {
-        return this._observers.push(callback);
-      },
-
-      unobserveChildren: function(handle) {
-        this._observers.splice(handle - 1, 1);
-      },
-
-      _hasObservers: function() {
-        return Boolean(this._observers.length);
-      },
-
-      _recordMutationAdd: function(node) {
-        if (this._hasObservers()) {
-          this._addedNodes.push(node);
-          this._scheduleMutationNotify();
-        }
-      },
-
-      _recordMutationRemove: function(node) {
-        if (this._hasObservers()) {
-          this._removedNodes.push(node);
-          this._scheduleMutationNotify();
-        }
-      },
-
-      _recordMutationAddAll: function() {
-        if (this._hasObservers()) {
-          var c$ = this.childNodes;
-          for (var i=0, c; (i < c$.length) && (c=c$[i]); i++) {
-            this._recordMutationAdd(c);
-          }
-        }
-      },
-
-      _recordMutationRemoveFromParent: function(node) {
-        var parent = node._lightParent;
-        if (parent) {
-          factory(parent)._recordMutationRemove(node);
-        }
-      },
-
-      _scheduleMutationNotify: function() {
-        this._mutationDebouncer = Polymer.Debounce(this._mutationDebouncer, 
-          this._notifyObservers);
-        this._mutationDebouncer.context = this;
-        Polymer.dom.addDebouncer(this._mutationDebouncer);
-      },
-
-      _notifyObservers: function(mxns) {
-        var info = {
-          target: this.node,
-          addedNodes: this._addedNodes,
-          removedNodes: this._removedNodes
-        }
-        var o$ = this._observers;
-        for (var i=0, o; (i < o$.length) && (o=o$[i]); i++) {
-          o.call(null, info);
-        }
-        this._addedNodes = [];
-        this._removedNodes = [];
       }
 
     };
 
-    Object.defineProperty(DomApi.prototype, 'classList', {
-      get: function() {
-        if (!this._classList) {
-          this._classList = new DomApi.ClassList(this);
-        }
-        return this._classList;
-      },
-      configurable: true
-    });
-
-    DomApi.ClassList = function(host) {
-      this.domApi = host;
-      this.node = host.node;
-    }
-
-    DomApi.ClassList.prototype = {
-      add: function() {
-        this.node.classList.add.apply(this.node.classList, arguments);
-        this.domApi._distributeParent();
-      },
-
-      remove: function() {
-        this.node.classList.remove.apply(this.node.classList, arguments);
-        this.domApi._distributeParent();
-      },
-
-      toggle: function() {
-        this.node.classList.toggle.apply(this.node.classList, arguments);
-        this.domApi._distributeParent();
-      },
-      contains: function() {
-        return this.node.classList.contains.apply(this.node.classList,
-          arguments);
-      }
-    }
-
     // changes and accessors...
     if (!Settings.useShadow) {
 
@@ -928,62 +840,6 @@
       }
     };
 
-    // add flush api...
-    Polymer.Base.extend(Polymer.dom, {
-      
-      _flushGuard: 0,
-      _FLUSH_MAX: 100,
-      _needsTakeRecords: !Polymer.Settings.useNativeCustomElements,
-      _debouncers: [],
-      _finishDebouncer: null,
-
-      // flush and debounce exposed as statics on Polymer.dom
-      flush: function() {
-        // flush debouncers
-        for (var i=0; i < this._debouncers.length; i++) {
-          this._debouncers[i].complete();
-        }
-        // clear the list of debouncers
-        if (this._finishDebouncer) {
-          this._finishDebouncer.complete();
-        }
-        // again make any pending CE mutations that might trigger debouncer
-        // additions go...
-        this._flushPolyfills();
-        // flush again if there are now any debouncers to process
-        if (this._debouncers.length && this._flushGuard < this._FLUSH_MAX) {
-          this._flushGuard++;
-          this.flush();
-        } else {
-          if (this._flushGuard >= this._FLUSH_MAX) {
-            console.warn('Polymer.dom.flush aborted. Flush may not be complete.')
-          }
-          this._flushGuard = 0;
-        }
-      },
-
-      // TODO(sorvell): There is currently not a good way 
-      // to process all custom elements mutations under SD polyfill because
-      // these mutations may be inside shadowRoots. 
-      _flushPolyfills: function() {
-        if (this._needsTakeRecords) {
-          CustomElements.takeRecords();
-        }
-      },
-
-      addDebouncer: function(debouncer) {
-        this._debouncers.push(debouncer);
-        // ensure the list of active debouncers is cleared when done.
-        this._finishDebouncer = Polymer.Debounce(this._finishDebouncer, 
-          this._finishFlush);
-      },
-
-      _finishFlush: function() {
-        Polymer.dom._debouncers = [];
-      }
-
-    });
-
     function getLightChildren(node) {
       var children = node._lightChildren;
       // TODO(sorvell): it's more correct to use _composedChildren instead of
diff --git a/src/lib/event-api.html b/src/lib/event-api.html
deleted file mode 100644
index 1d76fa082c..0000000000
--- a/src/lib/event-api.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!--
-@license
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-<link rel="import" href="settings.html">
-<script>
-
-  Polymer.EventApi = (function() {
-
-    var Settings = Polymer.Settings;
-
-    var EventApi = function(event) {
-      this.event = event;
-    };
-
-    if (Settings.useShadow) {
-
-      EventApi.prototype = {
-        
-        get rootTarget() {
-          return this.event.path[0];
-        },
-
-        get localTarget() {
-          return this.event.target;
-        },
-
-        get path() {
-          return this.event.path;
-        }
-
-      };
-
-    } else {
-
-      EventApi.prototype = {
-      
-        get rootTarget() {
-          return this.event.target;
-        },
-
-        get localTarget() {
-          var current = this.event.currentTarget;
-          var currentRoot = current && Polymer.dom(current).getOwnerRoot();
-          var p$ = this.path;
-          for (var i=0; i < p$.length; i++) {
-            if (Polymer.dom(p$[i]).getOwnerRoot() === currentRoot) {
-              return p$[i];
-            }
-          }
-        },
-
-        // TODO(sorvell): simulate event.path. This probably incorrect for
-        // non-bubbling events.
-        get path() {
-          if (!this.event._path) {
-            var path = [];
-            var o = this.rootTarget;
-            while (o) {
-              path.push(o);
-              o = Polymer.dom(o).parentNode || o.host;
-            }
-            // event path includes window in most recent native implementations
-            path.push(window);
-            this.event._path = path;
-          }
-          return this.event._path;
-        }
-
-      };
-
-    }
-
-    var factory = function(event) {
-      if (!event.__eventApi) {
-        event.__eventApi = new EventApi(event);
-      }
-      return event.__eventApi;
-    };
-
-    return {
-      factory: factory
-    };
-
-  })();
-
-</script>
diff --git a/src/mini/shady.html b/src/mini/shady.html
index fff1b31951..daa2357b86 100644
--- a/src/mini/shady.html
+++ b/src/mini/shady.html
@@ -9,6 +9,10 @@
 -->
 <link rel="import" href="../lib/array-splice.html">
 <link rel="import" href="../lib/dom-api.html">
+<link rel="import" href="../lib/dom-api-flush.html">
+<link rel="import" href="../lib/dom-api-event.html">
+<link rel="import" href="../lib/dom-api-classlist.html">
+<link rel="import" href="../lib/dom-api-mutation.html">
 <script>
 
   (function() {
@@ -154,8 +158,8 @@
           }
           var hasDistributed = this.shadyRoot._hasDistributed;
           this.shadyRoot._hasDistributed = true;
-          if (!hasDistributed && hasDomApi(this)) {
-            Polymer.dom(this)._recordMutationAddAll();
+          if (!hasDistributed && hasDomApi(this) && Polymer.dom(this)._observer) {
+            Polymer.dom(this)._observer.addAllNodes();
           }
         }
       },