diff --git a/bower.json b/bower.json
index 6df4f47..80ae9c8 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "i18n-msg",
-  "version": "1.0.1",
+  "version": "1.0.0",
   "authors": [
     "Eric Bidelman <ebidel@>"
   ],
@@ -22,10 +22,11 @@
     "/tests/"
   ],
   "dependencies": {
-    "polymer": "Polymer/polymer#^1.0.0",
+    "polymer": "Polymer/polymer#^1.0.3",
     "observe-js": "Polymer/observe-js"
   },
   "devDependencies": {
+    "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
     "web-component-tester": "Polymer/web-component-tester#master"
   }
 }
diff --git a/demo.html b/demo/index.html
similarity index 94%
rename from demo.html
rename to demo/index.html
index 0e0ea64..90880ef 100644
--- a/demo.html
+++ b/demo/index.html
@@ -5,8 +5,8 @@
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
   <title>i18n-msg element Demo</title>
 
-  <script src="../webcomponentsjs/webcomponents.min.js"></script>
-  <link rel="import" href="i18n-msg.html">
+  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+  <link rel="import" href="../i18n-msg.html">
 
 </head>
 <body>
diff --git a/locales/en.json b/demo/locales/en.json
similarity index 100%
rename from locales/en.json
rename to demo/locales/en.json
diff --git a/locales/es.json b/demo/locales/es.json
similarity index 100%
rename from locales/es.json
rename to demo/locales/es.json
diff --git a/locales/fr.json b/demo/locales/fr.json
similarity index 100%
rename from locales/fr.json
rename to demo/locales/fr.json
diff --git a/locales/pt-br.json b/demo/locales/pt-br.json
similarity index 100%
rename from locales/pt-br.json
rename to demo/locales/pt-br.json
diff --git a/i18n-msg.html b/i18n-msg.html
index 9f7b568..0a7c786 100644
--- a/i18n-msg.html
+++ b/i18n-msg.html
@@ -23,7 +23,7 @@
 file on your server. For example, `I18nMsg.lang = 'es'` will use `locales/es.json`.
 `I18nMsg.lang = 'fr'` would use message strings from `locales/fr.json`.
 
-The directory name can be configured by using the `messagesUrl` attribute, but the file
+The directory name can be configured by using the `messagesUrl` property, but the file
 cannot. `<i18n-msg>` will always attempt to use messages from `<messagesUrl>/<LANG_YOU_SET>.json`.
 
 <b>Note:</b> - message files are read once and reused for all instances of `<i18n-msg>`.
@@ -40,7 +40,6 @@
       ...
       <body>
         <p>"Days" in Spanish is <i18n-msg msgid="days">days</i18n-msg>!</p>
-
         <script>
           I18nMsg.lang = document.documentElement.lang || 'en';
         </script>
@@ -50,224 +49,208 @@
 ### Getting a message:
 
     // No argument returns the instance's message:
-    document.querySelector('i18n-msg').getMessage();
+    document.querySelector('i18n-msg').getMsg();
 
     // Get a message by an id:
-    document.querySelector('i18n-msg').getMessage('days');
+    document.querySelector('i18n-msg').getMsg('days');
 
 @element i18n-msg
 @homepage https://ebidel.github.io/i18n-msg
 -->
-<!--
-Fired when the set language is ready.
-
-@event i18n-language-ready
-@param {Object} detail
-@param {string} detail.language Object full of messages for the set language.
--->
 <dom-module id="i18n-msg">
 </dom-module>
 <script>
-  (function () {
-
-    window.I18nMsg = window.I18nMsg || {
-      lang: null,
-      url: 'locales',
-      locales: {}
-    };
-
-    var _instances = []; /* Holds all i18n-msg elements to have them easily updated with translation messages. */
-
-    var _fetching = false; /* If if there's an outstanding XHR fetching a locale file. */
-
-    var _numInstancesUpdated = 0;
-
-    Polymer({
-      is: 'i18n-msg',
-
-      properties: {
-        /**
-         * The message id (key) for this message.
-         *
-         * @attribute msgid
-         * @type string
-         * @default null
-         */
-        msgid: {
-          type: String,
-          value: null
-        },
-
-        /**
-         * The language being used.
-         *
-         * @property language
-         * @type string
-         * @default null
-         * @readonly
-         */
-        language: {
-          type: String,
-          value: null,
-          observer: 'languageChanged',
-          readOnly: true
-        },
-
-        /**
-         * The folder name where the localized `<lang>.json` files are located.
-         * Overrides `window.I18nMsg` if not `null`.
-         *
-         * @property messagesUrl
-         * @type string
-         * @default null
-         */
-        messagesUrl: {
-          type: String,
-          value: null
-        }
-      },
+(function () {
+
+  window.I18nMsg = window.I18nMsg || {
+    lang: null,
+    url: 'locales',
+    locales: {}
+  };
+
+  var _instances = []; // Holds all i18n-msg elements to have them easily updated with translation messages.
+  var _fetching = false; // True if there's an outstanding XHR fetching a locale file.
+  var _numInstancesUpdated = 0;
+
+  Polymer({
+    is: 'i18n-msg',
+
+    /**
+     * The `i18n-language-ready` is fired after the locale was fetched and all `<i18n-msg>` elements were updated.
+     *
+     * @event i18n-language-ready
+     * @detail {{language: String}}
+     */
 
+    properties: {
       /**
-       * An object containing the set of known language locales that have been loaded.
-       *
-       * @property locales
-       * @type object
-       * @default {}
+       * The message id (key) for this message.
        */
-      locales: I18nMsg.locales, // static
-
-      ready: function() {
-        this._setLanguage(I18nMsg.lang);
-        this.messagesUrl = I18nMsg.url;
-
-        // Have instances observe window.I18nMsg.lang changes
-        // and go fetch the localized messages.json file.
-        var observerLang = new PathObserver(window.I18nMsg, 'lang');
-        observerLang.open(function (newValue, oldValue) {
-          _numInstancesUpdated = 0;
-          this._setLanguage(newValue);
-        }.bind(this));
-
-        // Have instances observe window.I18nMsg.lang changes
-        // and go fetch the localized messages.json file.
-        var observerUrl = new PathObserver(window.I18nMsg, 'url');
-        observerUrl.open(function (newValue, oldValue) {
-          _numInstancesUpdated = 0;
-          this.messagesUrl = newValue;
-
-          if (!this.language || _fetching) {
-            return;
-          }
-
-          this.fetchLanguage();
-        }.bind(this));
-
-        _instances.push(this);
+      msgid: {
+        type: String,
+        value: null
       },
 
-      attached: function() {
-        var msg = this.locales[this.language] && this.locales[this.language][this.msgid];
-        if (msg && msg.message) {
-          this.innerHTML = msg.message;
-        }
+      /**
+       * The language being used.
+       */
+      language: {
+        type: String,
+        value: null,
+        observer: '_languageChanged',
+        readOnly: true
       },
 
       /**
-       * The `i18n-language-ready` is fired after the locale was fetched and all `<i18n-msg>` elements were updated.
-       *
-       * @event i18n-language-ready
-       * @detail {{language: String}}
+       * The folder name where the localized `<lang>.json` files are located.
+       * Overrides `window.I18nMsg` if not `null`.
        */
+      messagesUrl: {
+        type: String,
+        value: 'locales'
+      }
+    },
+
+    /**
+     * An object containing the set of known language locales that have been loaded.
+     */
+    locales: {
+      type: Object,
+      value: I18nMsg.locales // static
+    },
+
+    ready: function() {
+      this._setLanguage(I18nMsg.lang);
+      this.messagesUrl = I18nMsg.url;
+
+      // Have instances observe window.I18nMsg.lang changes
+      // and go fetch the localized messages.json file.
+      var observerLang = new PathObserver(window.I18nMsg, 'lang');
+      observerLang.open(function(newValue, oldValue) {
+        _numInstancesUpdated = 0;
+        this._setLanguage(newValue);
+      }.bind(this));
+
+      // Have instances observe window.I18nMsg.lang changes
+      // and go fetch the localized messages.json file.
+      var observerUrl = new PathObserver(window.I18nMsg, 'url');
+      observerUrl.open(function(newValue, oldValue) {
+        _numInstancesUpdated = 0;
+        this.messagesUrl = newValue;
+
+        // TODO: this will xhr the json file for each instance.
+        // if (!this.language || _fetching) {
+        //   return;
+        // }
+
+        this._fetchLanguage();
+      }.bind(this));
+
+      _instances.push(this);
+    },
+
+    attached: function() {
+      var msg = this.getMsg(this.msgid)
+      if (msg && msg.message) {
+        this.innerHTML = msg.message;
+      }
+    },
+
+    /**
+     * Returns a message in the current locale (set by `window.I18nMsg.lang`).
+     * @method getMsg
+     * @param {string=} opt_msgId Optional message id to lookup. If left off,
+     * the instance's `msgid` property is used.
+     * @return {string|null} Translated message or `null` if not found.
+     */
+    getMsg: function(opt_msgId) {
+      var msgId = opt_msgId || this.msgid;
+      var lang = this.locales[this.language];
+      if (lang && lang[msgId]) {
+        return lang[msgId].message;
+      }
+      return null;
+    },
+
+    _languageChanged: function() {
+      // Don't fetch .json file if it has already been
+      // fetched or another instance is already trying to.
+      if (this.language && this.locales[this.language] && !_fetching) {
+        // Send one signal that language changed to outside.
+        if (_numInstancesUpdated == _instances.length - 1) {
+          this.fire('i18n-language-ready', {language: this.language});
+        }
 
-      languageChanged: function() {
-        // Don't fetch .json file if it has already been
-        // fetched or another instance is already trying to.
-        if (this.language && this.locales[this.language] && !_fetching) {
-          // Send one signal that language changed to outside.
-          if (_numInstancesUpdated == _instances.length - 1) {
-            this.fire('i18n-language-ready', {language: this.language});
-          }
-
-          this.updateElementMessage();
-          _numInstancesUpdated++;
+        this._updateElementMessage();
+        _numInstancesUpdated++;
 
-          return;
-        } else if (!this.language || this.locales[this.language] || _fetching) {
-          return;
-        }
+        return;
+      } else if (!this.language || this.locales[this.language] || _fetching) {
+        return;
+      }
 
-        this.fetchLanguage();
-      },
+      this._fetchLanguage();
+    },
 
-      fetchLanguage: function() {
-        _fetching = true;
+    _fetchLanguage: function() {
+      // if (_fetching) {
+      //   return;
+      // }
 
-        var url = this.messagesUrl + '/' + this.language + '.json';
+      _fetching = true;
 
-        var xhr = new XMLHttpRequest();
-        xhr.open('GET', url);
-        xhr.onload = function(e) {
-          if (e.target.status != 200) {
-            _fetching = false;
-            return;
-          }
+      var url = /*this.baseURI + */this.messagesUrl + '/' + this.language + '.json';
 
-          var resp = JSON.parse(e.target.response);
-          if (!this.msgid in resp) {
-            console.warn(this.localName + ': "' + this.msgid + '" message id was not found in ' + url);
-            return;
-          }
+      var xhr = new XMLHttpRequest();
+      xhr.open('GET', url);
+      xhr.onload = function(e) {
+        _fetching = false;
 
-          this.locales[this.language] = resp; // cache this locale.
+        if (e.target.status !== 200) {
+          return;
+        }
 
-          this.notifyInstances();
+        var resp = JSON.parse(e.target.response);
+        if (!this.msgid in resp) {
+          console.warn(this.localName + ': "' + this.msgid + '" message id was not found in ' + url);
+          return;
+        }
 
-          _fetching = false;
+        this.locales[this.language] = resp; // cache this locale.
 
-          this.fire('i18n-language-ready', {language: this.language});
-        }.bind(this);
-        xhr.send();
-      },
+        this._notifyInstances();
 
-      updateElementMessage: function(opt_instance) {
-        var instance = opt_instance || this;
+        this.fire('i18n-language-ready', {language: this.language});
+      }.bind(this);
+      xhr.onerror = function(e) {
+        _fetching = false;
+      };
+      xhr.send();
+    },
 
-        var msg = instance.locales[instance.language][instance.msgid];
-        if (msg && msg.message) {
-          instance.innerHTML = msg.message;
-        }
-      },
+    _updateElementMessage: function(opt_instance) {
+      var instance = opt_instance || this;
 
-      notifyInstances: function() {
-        for (var i = 0, instance; instance = _instances[i]; ++i) {
-          instance.language = I18nMsg.lang;
+      var msg = instance.locales[instance.language][instance.msgid];
+      if (msg && msg.message) {
+        instance.innerHTML = msg.message;
+      }
+    },
 
-          if (!instance.locales[instance.language][instance.msgid]) {
-            console.warn(this.localName + ': "' + instance.msgid + '" message id was not found');
-            continue;
-          }
+    _notifyInstances: function() {
+      for (var i = 0, instance; instance = _instances[i]; ++i) {
+        instance.language = I18nMsg.lang;
 
-          this.updateElementMessage(instance);
+        if (!instance.locales[instance.language][instance.msgid]) {
+          console.warn(this.localName + ': "' + instance.msgid + '" message id was not found');
+          continue;
         }
-      },
 
-      /**
-       * Returns a message in the current locale (set by `window.I18nMsg.lang`).
-       * @method getMsg
-       * @param {string=} opt_msgId Optional message id to lookup. If left off,
-       * the instance's `msgid` property is used.
-       * @return {string|null} Translated message or `null` if not found.
-       */
-      getMsg: function(opt_msgId) {
-        var msgId = opt_msgId || this.msgid;
-        var lang = this.locales[this.language];
-        if (lang && lang[msgId]) {
-          return lang[msgId].message;
-        }
-        return null;
+        this._updateElementMessage(instance);
       }
+    }
 
-    });
+  });
 
-  })();
+})();
 </script>
diff --git a/index.html b/index.html
index b5e7287..ee99513 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+Copyright (c) 2015 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
 The complete set of authors may be found at http://polymer.github.io/AUTHORS
 The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS
@@ -10,13 +10,12 @@
 <html>
 <head>
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
-  <script src="../webcomponentsjs/webcomponents.min.js"></script>
-  <link rel="import" href="../core-component-page/core-component-page.html">
-
+  <script src="../webcomponentsjs/webcomponents-lite.min.js"></script>
+  <link rel="import" href="../iron-component-page/iron-component-page.html">
 </head>
 <body unresolved>
 
-  <core-component-page moduleName="i18n-msg"></core-component-page>
+  <iron-component-page></iron-component-page>
 
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
