diff --git a/analysis.json b/analysis.json
new file mode 100644
index 0000000..83c9c7d
--- /dev/null
+++ b/analysis.json
@@ -0,0 +1,597 @@
+{
+  "schema_version": "1.0.0",
+  "elements": [
+    {
+      "description": "`impetus-scroller`\nMomentum scroller using impetus",
+      "summary": "",
+      "path": "impetus-scroller.html",
+      "properties": [
+        {
+          "name": "spacing",
+          "type": "number",
+          "description": "spacing (in px) between elements",
+          "privacy": "public",
+          "sourceRange": {
+            "start": {
+              "line": 58,
+              "column": 8
+            },
+            "end": {
+              "line": 61,
+              "column": 9
+            }
+          },
+          "metadata": {
+            "polymer": {}
+          },
+          "defaultValue": "1"
+        },
+        {
+          "name": "friction",
+          "type": "number",
+          "description": "impetus friction",
+          "privacy": "public",
+          "sourceRange": {
+            "start": {
+              "line": 64,
+              "column": 8
+            },
+            "end": {
+              "line": 67,
+              "column": 9
+            }
+          },
+          "metadata": {
+            "polymer": {}
+          },
+          "defaultValue": "0.96"
+        },
+        {
+          "name": "loading",
+          "type": "boolean",
+          "description": "loading flag for initial render",
+          "privacy": "public",
+          "sourceRange": {
+            "start": {
+              "line": 70,
+              "column": 8
+            },
+            "end": {
+              "line": 75,
+              "column": 9
+            }
+          },
+          "metadata": {
+            "polymer": {
+              "notify": true
+            }
+          },
+          "defaultValue": "true"
+        },
+        {
+          "name": "x",
+          "type": "number",
+          "description": "current position",
+          "privacy": "public",
+          "sourceRange": {
+            "start": {
+              "line": 78,
+              "column": 8
+            },
+            "end": {
+              "line": 81,
+              "column": 9
+            }
+          },
+          "metadata": {
+            "polymer": {}
+          },
+          "defaultValue": "0"
+        },
+        {
+          "name": "selectedIndex",
+          "type": "number",
+          "description": "Index of selected item",
+          "privacy": "public",
+          "sourceRange": {
+            "start": {
+              "line": 84,
+              "column": 8
+            },
+            "end": {
+              "line": 87,
+              "column": 9
+            }
+          },
+          "metadata": {
+            "polymer": {
+              "observer": "\"_selectedIndexChanged\""
+            }
+          }
+        },
+        {
+          "name": "_width",
+          "type": "number",
+          "description": "",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 89,
+              "column": 8
+            },
+            "end": {
+              "line": 91,
+              "column": 9
+            }
+          },
+          "metadata": {
+            "polymer": {}
+          }
+        },
+        {
+          "name": "_height",
+          "type": "number",
+          "description": "",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 93,
+              "column": 8
+            },
+            "end": {
+              "line": 95,
+              "column": 9
+            }
+          },
+          "metadata": {
+            "polymer": {}
+          }
+        },
+        {
+          "name": "_elements",
+          "type": "Array",
+          "description": "",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 97,
+              "column": 8
+            },
+            "end": {
+              "line": 99,
+              "column": 9
+            }
+          },
+          "metadata": {
+            "polymer": {}
+          }
+        },
+        {
+          "name": "_dimensions",
+          "type": "Array",
+          "description": "",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 101,
+              "column": 8
+            },
+            "end": {
+              "line": 104,
+              "column": 9
+            }
+          },
+          "metadata": {
+            "polymer": {
+              "readOnly": true
+            }
+          }
+        },
+        {
+          "name": "_layout",
+          "type": "Array",
+          "description": "",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 106,
+              "column": 8
+            },
+            "end": {
+              "line": 109,
+              "column": 9
+            }
+          },
+          "metadata": {
+            "polymer": {
+              "readOnly": true
+            }
+          }
+        }
+      ],
+      "methods": [
+        {
+          "name": "selectIndex",
+          "description": "",
+          "privacy": "public",
+          "sourceRange": {
+            "start": {
+              "line": 118,
+              "column": 6
+            },
+            "end": {
+              "line": 122,
+              "column": 7
+            }
+          },
+          "metadata": {},
+          "params": [
+            {
+              "name": "index"
+            }
+          ]
+        },
+        {
+          "name": "_selectedIndexChanged",
+          "description": "",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 124,
+              "column": 6
+            },
+            "end": {
+              "line": 137,
+              "column": 7
+            }
+          },
+          "metadata": {},
+          "params": [
+            {
+              "name": "val"
+            }
+          ]
+        },
+        {
+          "name": "connectedCallback",
+          "description": "",
+          "privacy": "public",
+          "sourceRange": {
+            "start": {
+              "line": 139,
+              "column": 6
+            },
+            "end": {
+              "line": 147,
+              "column": 7
+            }
+          },
+          "metadata": {},
+          "params": []
+        },
+        {
+          "name": "disconnectedCallback",
+          "description": "",
+          "privacy": "public",
+          "sourceRange": {
+            "start": {
+              "line": 149,
+              "column": 6
+            },
+            "end": {
+              "line": 154,
+              "column": 7
+            }
+          },
+          "metadata": {},
+          "params": []
+        },
+        {
+          "name": "_childNodesChanged",
+          "description": "",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 156,
+              "column": 6
+            },
+            "end": {
+              "line": 160,
+              "column": 7
+            }
+          },
+          "metadata": {},
+          "params": [
+            {
+              "name": "e"
+            }
+          ]
+        },
+        {
+          "name": "_onIronResize",
+          "description": "",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 169,
+              "column": 6
+            },
+            "end": {
+              "line": 178,
+              "column": 7
+            }
+          },
+          "metadata": {},
+          "params": []
+        },
+        {
+          "name": "_computeDimensions",
+          "description": "get the dimensions from the elements",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 181,
+              "column": 6
+            },
+            "end": {
+              "line": 183,
+              "column": 7
+            }
+          },
+          "metadata": {},
+          "params": [
+            {
+              "name": "elements"
+            }
+          ]
+        },
+        {
+          "name": "_computeLayout",
+          "description": "",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 185,
+              "column": 6
+            },
+            "end": {
+              "line": 195,
+              "column": 7
+            }
+          },
+          "metadata": {},
+          "params": [
+            {
+              "name": "dimensions"
+            },
+            {
+              "name": "height"
+            },
+            {
+              "name": "spacing"
+            }
+          ]
+        },
+        {
+          "name": "_widthChanged",
+          "description": "",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 197,
+              "column": 6
+            },
+            "end": {
+              "line": 224,
+              "column": 7
+            }
+          },
+          "metadata": {},
+          "params": [
+            {
+              "name": "width"
+            },
+            {
+              "name": "totalWidth"
+            }
+          ]
+        },
+        {
+          "name": "_layoutChanged",
+          "description": "",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 226,
+              "column": 6
+            },
+            "end": {
+              "line": 261,
+              "column": 7
+            }
+          },
+          "metadata": {},
+          "params": [
+            {
+              "name": "layout"
+            }
+          ]
+        },
+        {
+          "name": "_positionForIndex",
+          "description": "",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 263,
+              "column": 6
+            },
+            "end": {
+              "line": 272,
+              "column": 7
+            }
+          },
+          "metadata": {},
+          "params": []
+        },
+        {
+          "name": "_positionChanged",
+          "description": "",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 274,
+              "column": 6
+            },
+            "end": {
+              "line": 279,
+              "column": 7
+            }
+          },
+          "metadata": {},
+          "params": [
+            {
+              "name": "x"
+            },
+            {
+              "name": "y"
+            }
+          ]
+        }
+      ],
+      "staticMethods": [],
+      "demos": [
+        {
+          "url": "demo/index.html",
+          "description": ""
+        }
+      ],
+      "metadata": {},
+      "sourceRange": {
+        "start": {
+          "line": 46,
+          "column": 4
+        },
+        "end": {
+          "line": 280,
+          "column": 5
+        }
+      },
+      "privacy": "public",
+      "superclass": "HTMLElement",
+      "name": "ImpetusScroller",
+      "attributes": [
+        {
+          "name": "spacing",
+          "description": "spacing (in px) between elements",
+          "sourceRange": {
+            "start": {
+              "line": 58,
+              "column": 8
+            },
+            "end": {
+              "line": 61,
+              "column": 9
+            }
+          },
+          "metadata": {},
+          "type": "number"
+        },
+        {
+          "name": "friction",
+          "description": "impetus friction",
+          "sourceRange": {
+            "start": {
+              "line": 64,
+              "column": 8
+            },
+            "end": {
+              "line": 67,
+              "column": 9
+            }
+          },
+          "metadata": {},
+          "type": "number"
+        },
+        {
+          "name": "loading",
+          "description": "loading flag for initial render",
+          "sourceRange": {
+            "start": {
+              "line": 70,
+              "column": 8
+            },
+            "end": {
+              "line": 75,
+              "column": 9
+            }
+          },
+          "metadata": {},
+          "type": "boolean"
+        },
+        {
+          "name": "x",
+          "description": "current position",
+          "sourceRange": {
+            "start": {
+              "line": 78,
+              "column": 8
+            },
+            "end": {
+              "line": 81,
+              "column": 9
+            }
+          },
+          "metadata": {},
+          "type": "number"
+        },
+        {
+          "name": "selected-index",
+          "description": "Index of selected item",
+          "sourceRange": {
+            "start": {
+              "line": 84,
+              "column": 8
+            },
+            "end": {
+              "line": 87,
+              "column": 9
+            }
+          },
+          "metadata": {},
+          "type": "number"
+        }
+      ],
+      "events": [
+        {
+          "type": "CustomEvent",
+          "name": "loading-changed",
+          "description": "Fired when the `loading` property changes.",
+          "metadata": {}
+        }
+      ],
+      "styling": {
+        "cssVariables": [],
+        "selectors": []
+      },
+      "slots": [
+        {
+          "description": "",
+          "name": "",
+          "range": {
+            "file": "impetus-scroller.html",
+            "start": {
+              "line": 42,
+              "column": 24
+            },
+            "end": {
+              "line": 42,
+              "column": 50
+            }
+          }
+        }
+      ],
+      "tagname": "impetus-scroller"
+    }
+  ]
+}
diff --git a/bower.json b/bower.json
index 5021f84..5a54698 100644
--- a/bower.json
+++ b/bower.json
@@ -20,14 +20,15 @@
     "touch"
   ],
   "dependencies": {
-    "polymer": "Polymer/polymer#^1.4.0",
-    "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^1.0.5"
+    "polymer": "Polymer/polymer#^2.0.0",
+    "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^2.0.0"
   },
   "devDependencies": {
-    "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
-    "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0",
+    "iron-component-page": "PolymerElements/iron-component-page#^3.0.0",
+    "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^2.0.0",
+    "paper-icon-button": "PolymerElements/paper-icon-button#^2.0.0",
     "web-component-tester": "^4.0.0",
-    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0",
     "lazy-img": "captaincodeman/lazy-img#^0.0.7",
     "TouchEmulator": "hammer-touchemulator#^0.0.2"
   },
diff --git a/demo/index.html b/demo/index.html
index 06f3faa..36e9471 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -17,8 +17,10 @@
     </script>
     <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
 
+    <link rel="import" href="../../polymer/lib/elements/dom-bind.html">
     <link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">
     <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+    <link rel="import" href="../../iron-icons/iron-icons.html">
     <link rel="import" href="../../paper-icon-button/paper-icon-button.html">
     <link rel="import" href="../../lazy-img/lazy-img.html">
     <link rel="import" href="../impetus-scroller.html">
@@ -44,6 +46,7 @@
   </head>
   <body>
     <div class="vertical-section-container">
+
       <h3>Scroller with &lt;img&gt; elements</h3>
       <demo-snippet>
         <template>
@@ -70,28 +73,32 @@ <h3>Scroller with &lt;img&gt; elements</h3>
       <h3>Scroller with &lt;lazy-img&gt; elements</h3>
       <p>selected-index used to set initial position and allow programmatic positioning.</p>
       <demo-snippet>
-        <template is="dom-bind" id="nav">
-          <impetus-scroller style="height:160px;" selected-index="[[selected]]">
-            <lazy-img src="14117348070_bbf190b521_m.jpg" style="width:240px;height:163px;" observe="impetus-scroller"></lazy-img>
-            <lazy-img src="28738913666_d7f288ae25_m.jpg" style="width:240px;height:180px;" observe="impetus-scroller"></lazy-img>
-            <lazy-img src="28808871375_dc652d8972_m.jpg" style="width:160px;height:240px;" observe="impetus-scroller"></lazy-img>
-            <lazy-img src="31782510030_579cb5119a_m.jpg" style="width:240px;height:179px;" observe="impetus-scroller"></lazy-img>
-            <lazy-img src="32039394161_2cfc04b72a_m.jpg" style="width:180px;height:240px;" observe="impetus-scroller"></lazy-img>
-            <lazy-img src="32061810663_2249492d02_m.jpg" style="width:240px;height:162px;" observe="impetus-scroller"></lazy-img>
-            <lazy-img src="32357716254_42aa3b0663_m.jpg" style="width:240px;height:159px;" observe="impetus-scroller"></lazy-img>
-            <lazy-img src="28686254682_185a028e2e_m.jpg" style="width:159px;height:240px;" observe="impetus-scroller"></lazy-img>
-            <lazy-img src="32260967565_7f88cb6a4c_m.jpg" style="width:240px;height:171px;" observe="impetus-scroller"></lazy-img>
-            <lazy-img src="32186892504_d99b0ffc1e_m.jpg" style="width:240px;height:159px;" observe="impetus-scroller"></lazy-img>
-            <lazy-img src="32363556052_87007c3440_m.jpg" style="width:240px;height:158px;" observe="impetus-scroller"></lazy-img>
-            <lazy-img src="32400954515_cdb6b12bf2_m.jpg" style="width:158px;height:240px;" observe="impetus-scroller"></lazy-img>
-            <lazy-img src="32873865786_1c825895f3_m.jpg" style="width:240px;height:145px;" observe="impetus-scroller"></lazy-img>
-            <lazy-img src="33001221391_6afee89be5_m.jpg" style="width:240px;height:159px;" observe="impetus-scroller"></lazy-img>
-            <lazy-img src="33186065675_95b54548da_m.jpg" style="width:240px;height:120px;" observe="impetus-scroller"></lazy-img>
-          </impetus-scroller>
-          <div class="nav">
-            <paper-icon-button icon="chevron-left" noink on-click="prev"></paper-icon-button>
-            <paper-icon-button icon="chevron-right" noink on-click="next"></paper-icon-button>
-          </div>
+        <template>
+          <dom-bind id="nav">
+            <template>
+              <impetus-scroller id="lazy" style="height:160px;" selected-index="[[selected]]">
+                <lazy-img src="14117348070_bbf190b521_m.jpg" style="width:240px;height:163px;" observe="impetus-scroller"></lazy-img>
+                <lazy-img src="28738913666_d7f288ae25_m.jpg" style="width:240px;height:180px;" observe="impetus-scroller"></lazy-img>
+                <lazy-img src="28808871375_dc652d8972_m.jpg" style="width:160px;height:240px;" observe="impetus-scroller"></lazy-img>
+                <lazy-img src="31782510030_579cb5119a_m.jpg" style="width:240px;height:179px;" observe="impetus-scroller"></lazy-img>
+                <lazy-img src="32039394161_2cfc04b72a_m.jpg" style="width:180px;height:240px;" observe="impetus-scroller"></lazy-img>
+                <lazy-img src="32061810663_2249492d02_m.jpg" style="width:240px;height:162px;" observe="impetus-scroller"></lazy-img>
+                <lazy-img src="32357716254_42aa3b0663_m.jpg" style="width:240px;height:159px;" observe="impetus-scroller"></lazy-img>
+                <lazy-img src="28686254682_185a028e2e_m.jpg" style="width:159px;height:240px;" observe="impetus-scroller"></lazy-img>
+                <lazy-img src="32260967565_7f88cb6a4c_m.jpg" style="width:240px;height:171px;" observe="impetus-scroller"></lazy-img>
+                <lazy-img src="32186892504_d99b0ffc1e_m.jpg" style="width:240px;height:159px;" observe="impetus-scroller"></lazy-img>
+                <lazy-img src="32363556052_87007c3440_m.jpg" style="width:240px;height:158px;" observe="impetus-scroller"></lazy-img>
+                <lazy-img src="32400954515_cdb6b12bf2_m.jpg" style="width:158px;height:240px;" observe="impetus-scroller"></lazy-img>
+                <lazy-img src="32873865786_1c825895f3_m.jpg" style="width:240px;height:145px;" observe="impetus-scroller"></lazy-img>
+                <lazy-img src="33001221391_6afee89be5_m.jpg" style="width:240px;height:159px;" observe="impetus-scroller"></lazy-img>
+                <lazy-img src="33186065675_95b54548da_m.jpg" style="width:240px;height:120px;" observe="impetus-scroller"></lazy-img>
+              </impetus-scroller>
+              <div class="nav">
+                <paper-icon-button icon="chevron-left" noink on-click="prev"></paper-icon-button>
+                <paper-icon-button icon="chevron-right" noink on-click="next"></paper-icon-button>
+              </div>
+            </template>
+          </dom-bind>
         </template>
         <script>
           document.addEventListener('WebComponentsReady', function() {
diff --git a/impetus-scroller.html b/impetus-scroller.html
index ce3af79..13cf212 100644
--- a/impetus-scroller.html
+++ b/impetus-scroller.html
@@ -1,4 +1,6 @@
 <link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../polymer/polymer-element.html">
+<link rel="import" href="../polymer/lib/legacy/class.html">
 <link rel="import" href="../iron-resizable-behavior/iron-resizable-behavior.html">
 
 <script src="impetus.min.js"></script>
@@ -38,19 +40,21 @@
         will-change: transform;
       }
     </style>
-    <div id="container"><content id="content"></content></div>
+    <div id="container"><slot id="content"></slot></div>
   </template>
 
   <script>
-    Polymer({
+    class ImpetusScroller extends Polymer.mixinBehaviors([Polymer.IronResizableBehavior], Polymer.Element) {
 
-      is: 'impetus-scroller',
+      constructor() {
+        super();
+        this._ironResizeListener = this._onIronResize.bind(this);
+        this._domChangeListener = this._childNodesChanged.bind(this);
+      }
 
-      behaviors: [
-        Polymer.IronResizableBehavior
-      ],
+      static get is() { return 'impetus-scroller'; }
 
-      properties: {
+      static get properties() { return {
         /** spacing (in px) between elements */
         spacing: {
           type: Number,
@@ -104,27 +108,22 @@
           type: Array,
           computed: '_computeLayout(_dimensions, _height, spacing)'
         }
-      },
-
-      observers: [
-        '_layoutChanged(_layout)',
-        '_widthChanged(_width, _totalWidth)'
-      ],
+      }}
 
-      listeners: {
-        'iron-resize': '_onIronResize',
-        'dom-change': '_childNodesChanged'
-      },
+      static get observers() { return [
+            '_layoutChanged(_layout)',
+            '_widthChanged(_width, _totalWidth)'
+          ];
+      }
 
-      selectIndex: function(index) {
+      selectIndex(index) {
         if (index < this._dimensions.length) {
           this.selectedIndex = index;
         }
-      },
+      }
 
-      _selectedIndexChanged: function(val) {
+      _selectedIndexChanged(val) {
         if (this.loading) return;
-
         var x = this._positionForIndex();
         this._positionChanged(x, 0);
 
@@ -136,32 +135,39 @@
           el.style.transition = '';
           el.removeEventListener("transitionend", this);
         }, false);
-      },
+      }
 
-      attached: function() {
+      connectedCallback() {
+        super.connectedCallback();
         var boundHandler = this._childNodesChanged.bind(this);
         this._observer = Polymer.dom(this.$.content).observeNodes(boundHandler);
-        this.async(this.notifyResize, 1);
-      },
+        this._observer = new Polymer.FlattenedNodesObserver(this.$.content, boundHandler);
+        this.addEventListener('iron-resize', this._ironResizeListener);
+        this.addEventListener('dom-change', this._domChangeListener);
+        Polymer.Async.microTask.run(() => this.notifyResize());
+      }
 
-      detached: function() {
-        Polymer.dom(this.$.content).unobserveNodes(this._observer);
-      },
+      disconnectedCallback() {
+        super.disconnectedCallback();
+        this._observer.disconnect();
+        this.removeEventListener('iron-resize', this._ironResizeListener);
+        this.removeEventListener('dom-change', this._domChangeListener);
+      }
 
-      _childNodesChanged: function(e) {
+      _childNodesChanged(e) {
         this._height = this.clientHeight;
-        var nodes = this.getEffectiveChildren();
+        var nodes = Polymer.FlattenedNodesObserver.getFlattenedNodes(this).filter(n => n.nodeType === Node.ELEMENT_NODE);
         this._elements = nodes.filter(function(node) { return node.nodeType == Node.ELEMENT_NODE && node.tagName !== "TEMPLATE" });
-      },
+      }
 
       get parent() {
         if (this.parentNode.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
           return this.parentNode.host;
         }
         return this.parentNode;
-      },
+      }
 
-      _onIronResize: function() {
+      _onIronResize() {
         if (this._width) {
           // throttle layout calculations after first one
           this.debounce('resize', function(){
@@ -170,21 +176,24 @@
         } else {
           this._width = this.clientWidth;
         }
-      },
+      }
 
       // get the dimensions from the elements
       _computeDimensions(elements) {
         return elements.map(function(node) { return { width: node.clientWidth, height: node.clientHeight, aspect: node.clientWidth / node.clientHeight }});
-      },
+      }
 
       _computeLayout(dimensions, height, spacing) {
+        if (!dimensions) {
+            return;
+        }
         var left = 0;
         return dimensions.map(function(dim) {
           var result = { left: left, width: Math.round(height * dim.aspect), height: height }
           left += result.width + spacing;
           return result;
         });
-      },
+      }
 
       _widthChanged(width, totalWidth) {
         if (this._impetus) {
@@ -213,9 +222,12 @@
         } else {
           this.x = 0;
         }
-      },
+      }
 
       _layoutChanged(layout) {
+        if (!layout || (layout.length === 0)) {
+            return;
+        }
         requestAnimationFrame(function() {
           layout.forEach(function(position, i) {
             var scaleX, scaleY, style;
@@ -241,15 +253,15 @@
 
             // remove loading style override which prevented
             // animation of the initial layout
-            this.async(function() { this.loading = false }, 1);
+            Polymer.Async.microTask.run(() => {this.loading = false;});
           }
 
           this.fire('rendered');
 
         }.bind(this));
-      },
+      }
 
-      _positionForIndex: function() {
+      _positionForIndex() {
         if (this.selectedIndex >= this._layout.length) {
           this.selectedIndex = this._layout.length - 1;
         }
@@ -258,14 +270,16 @@
         if (x < 0) x = 0;
         if (x > (this._totalWidth - this._width)) x = this._totalWidth - this._width;
         return -x;
-      },
+      }
 
-      _positionChanged: function(x, y) {
+      _positionChanged(x, y) {
         if (this.x != x) {
           this.x = x;
           this.$.container.style.transform = 'translateX(' + x + 'px)';
         }
       }
-    });
+    }
+
+    customElements.define(ImpetusScroller.is, ImpetusScroller);
   </script>
 </dom-module>
diff --git a/test/impetus-scroller_test.html b/test/impetus-scroller_test.html
index 3ced913..a45b934 100644
--- a/test/impetus-scroller_test.html
+++ b/test/impetus-scroller_test.html
@@ -21,8 +21,8 @@
     <script>
       suite('impetus-scroller', function() {
         test('instantiating the element works', function() {
-          var element = fixture('basic');
-          assert.equal(element.is, 'impetus-scroller');
+          const element = fixture('basic');
+          assert.equal(element.localName, 'impetus-scroller');
         });
       });
     </script>