diff --git a/.babelrc b/.babelrc
index 3bff21e7..b550b51e 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,3 +1,4 @@
 {
-  "presets": [ "es2015-rollup" ]
+  "presets": [ "es2015-rollup" ],
+  "plugins": ["transform-class-properties"]
 }
diff --git a/README.md b/README.md
index a72e0f48..9d911eef 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ You can download the compiled javascript directly [here](/build/postmate.min.js)
 * Child exposes a `model`, an object literal whose values consist of serializable values, functions and promises, that the parent can retrieve.
 * Child can emit events that the parent can listen to.
 * *Zero* dependencies. Provide your own polyfill or abstraction for the `Promise` API if needed
-* Lightweight, weighing in at ~ <span class="size">`4.6kb`</span>
+* Lightweight, weighing in at ~ <span class="size">`4.7kb`</span>
 
 ## Installing
 Postmate can be installed via NPM or Bower.
@@ -49,10 +49,10 @@ $ bower i postmate # Install via Bower
 * **`Parent`**: The **top level** page that will embed an `iFrame`, creating a `Child`
 * **`Child`**: The **bottom level** page loaded within the `iFrame`
 * **`Model`**: The object that the `Child` exposes to the `Parent`
+* **Handshake**: The process in which the parent frame identifies itself to the child, and vice versa. When a handshake is complete, the two contexts have bound their event listeners and identified one another.
 
 ## Usage
-1. The `Parent` begins communication with the `Child`. A handshake is sent, the `Child` responds with
-a handshake reply, finishing `Parent`/`Child` initialization. The two are bound and ready to communicate securely.
+1. The `Parent` begins communication with the `Child`. A handshake is sent, the `Child` responds with a handshake reply, finishing `Parent`/`Child` initialization. The two are bound and ready to communicate securely.
 
 2. The `Parent` fetches values from the `Child` by property name. The `Child` can emit messages to the parent.
 
@@ -104,7 +104,19 @@ new Postmate(options);
 
 Name | Type | Description | Default
 :--- | :--- | :--- | :---
-`debug` | `Boolean` | _Set to `true` to enable logging of additional information_ | `undefined`
+`debug` | `Boolean` | _Set to `true` to enable logging of additional information_ | `false`
+
+***
+> ## `Postmate.Promise`
+```javascript
+// parent.com or child.com
+Postmate.Promise = RSVP.Promise;
+new Postmate(options);
+```
+
+Name | Type | Description | Default
+:--- | :--- | :--- | :---
+`Promise` | `Object` | _Replace the Promise API that Postmate uses_ | `window.Promise`
 
 ***
 
diff --git a/build/postmate.min.js b/build/postmate.min.js
index 26c76439..26a78cc6 100644
--- a/build/postmate.min.js
+++ b/build/postmate.min.js
@@ -1,7 +1,7 @@
 /**
  * postmate - A powerful, simple, promise-based postMessage library
- * @version v1.0.1
+ * @version v1.0.2
  * @link https://github.com/dollarshaveclub/postmate
  * @author Jacob Kelley <jakie8@gmail.com>
  * @license MIT */
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.Postmate=t()}(this,function(){"use strict";function e(){var e;l.debug&&(e=console).log.apply(e,arguments)}function t(e){var t=document.createElement("a");return t.href=e,t.origin}function n(e,t){return e.origin===t&&("object"===a(e.data)&&("postmate"in e.data&&e.data.type===o))}function i(e,t){var n="function"==typeof e[t]?e[t]():e[t];return Promise.resolve(n)}var a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol?"symbol":typeof e},r=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},s=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),o="application/x-postmate-v1+json",d=function(){function t(n){var i=this;r(this,t),this.parent=n.parent,this.frame=n.frame,this.child=n.child,this.childOrigin=n.childOrigin,this.events={},e("Parent: Registering API"),e("Parent: Awaiting messages..."),this.listener=function(t){var n=((t||{}).data||{}).value||{},a=n.data,r=n.name;"emit"===t.data.postmate&&(e("Parent: Received event emission: "+r),r in i.events&&i.events[r].call(i,a))},this.parent.addEventListener("message",this.listener,!1),e("Parent: Awaiting event emissions from Child")}return s(t,[{key:"get",value:function(e){var t=this;return new Promise(function(n){var i=(new Date).getTime(),a=function e(a){a.data.uid===i&&"reply"===a.data.postmate&&(t.parent.removeEventListener("message",e,!1),n(a.data.value))};parent.addEventListener("message",a,!1),t.child.postMessage({postmate:"request",type:o,property:e,uid:i},t.childOrigin)})}},{key:"on",value:function(e,t){this.events[e]=t}},{key:"destroy",value:function(){e("Parent: Destroying Postmate instance"),window.removeEventListener("message",this.listener,!1),this.frame.parentNode.removeChild(this.frame)}}]),t}(),h=function(){function t(a){var s=this;r(this,t),this.model=a.model,this.parent=a.parent,this.parentOrigin=a.parentOrigin,this.child=a.child,e("Child: Registering API"),e("Child: Awaiting messages..."),this.child.addEventListener("message",function(t){if(n(t,s.parentOrigin)){e("Child: Received request",t.data);var a=t.data,r=a.property,d=a.uid;i(s.model,r).then(function(e){return t.source.postMessage({property:r,postmate:"reply",type:o,uid:d,value:e},t.origin)})}})}return s(t,[{key:"emit",value:function(t,n){e('Child: Emitting Event "'+t+'"',n),this.parent.postMessage({postmate:"emit",type:o,value:{name:t,data:n}},this.parentOrigin)}}]),t}(),l=function(){function i(e){r(this,i);var t=e.container,n=e.url,a=e.model;return this.parent=window,this.frame=document.createElement("iframe"),(t||document.body).appendChild(this.frame),this.child=this.frame.contentWindow,this.model=a||{},this.sendHandshake(n)}return s(i,[{key:"sendHandshake",value:function(i){var a=this,r=t(i);return new Promise(function(t,s){var h=function i(o){return!!n(o,r)&&("handshake-reply"===o.data.postmate?(e("Parent: Received handshake reply from Child"),a.parent.removeEventListener("message",i,!1),a.childOrigin=o.origin,e("Parent: Saving Child origin",a.childOrigin),t(new d(a))):(e("Parent: Invalid handshake reply"),s("Failed handshake")))};a.parent.addEventListener("message",h,!1),a.frame.onload=function(){e("Parent: Sending handshake"),a.child.postMessage({postmate:"handshake",type:o,model:a.model},r)},e("Parent: Loading frame"),a.frame.src=i})}}]),i}();return l.Model=function(){function t(e){return r(this,t),this.child=window,this.model=e,this.parent=this.child.parent,this.sendHandshakeReply()}return s(t,[{key:"sendHandshakeReply",value:function(){var t=this;return new Promise(function(n,i){var a=function a(r){if("handshake"===r.data.postmate){e("Child: Received handshake from Parent"),t.child.removeEventListener("message",a,!1),e("Child: Sending handshake reply to Parent"),r.source.postMessage({postmate:"handshake-reply",type:o},r.origin),t.parentOrigin=r.origin;var s=r.data.model;if(s){for(var d=Object.keys(s),l=0;l<d.length;l++)s.hasOwnProperty(d[l])&&(t.model[d[l]]=s[d[l]]);e("Child: Inherited and extended model from Parent")}return e("Child: Saving Parent origin",t.parentOrigin),n(new h(t))}return i("Handshake Reply Failed")};t.child.addEventListener("message",a,!1)})}}]),t}(),l});
\ No newline at end of file
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.Postmate=t()}(this,function(){"use strict";function e(){var e;l.debug&&(e=console).log.apply(e,arguments)}function t(e){var t=document.createElement("a");return t.href=e,t.origin}function n(e,t){return e.origin===t&&("object"===a(e.data)&&("postmate"in e.data&&e.data.type===o))}function i(e,t){var n="function"==typeof e[t]?e[t]():e[t];return l.Promise.resolve(n)}var a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol?"symbol":typeof e},r=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},s=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),o="application/x-postmate-v1+json",d=function(){function t(n){var i=this;r(this,t),this.parent=n.parent,this.frame=n.frame,this.child=n.child,this.childOrigin=n.childOrigin,this.events={},e("Parent: Registering API"),e("Parent: Awaiting messages..."),this.listener=function(t){var n=((t||{}).data||{}).value||{},a=n.data,r=n.name;"emit"===t.data.postmate&&(e("Parent: Received event emission: "+r),r in i.events&&i.events[r].call(i,a))},this.parent.addEventListener("message",this.listener,!1),e("Parent: Awaiting event emissions from Child")}return s(t,[{key:"get",value:function(e){var t=this;return new l.Promise(function(n){var i=(new Date).getTime(),a=function e(a){a.data.uid===i&&"reply"===a.data.postmate&&(t.parent.removeEventListener("message",e,!1),n(a.data.value))};parent.addEventListener("message",a,!1),t.child.postMessage({postmate:"request",type:o,property:e,uid:i},t.childOrigin)})}},{key:"on",value:function(e,t){this.events[e]=t}},{key:"destroy",value:function(){e("Parent: Destroying Postmate instance"),window.removeEventListener("message",this.listener,!1),this.frame.parentNode.removeChild(this.frame)}}]),t}(),h=function(){function t(a){var s=this;r(this,t),this.model=a.model,this.parent=a.parent,this.parentOrigin=a.parentOrigin,this.child=a.child,e("Child: Registering API"),e("Child: Awaiting messages..."),this.child.addEventListener("message",function(t){if(n(t,s.parentOrigin)){e("Child: Received request",t.data);var a=t.data,r=a.property,d=a.uid;i(s.model,r).then(function(e){return t.source.postMessage({property:r,postmate:"reply",type:o,uid:d,value:e},t.origin)})}})}return s(t,[{key:"emit",value:function(t,n){e('Child: Emitting Event "'+t+'"',n),this.parent.postMessage({postmate:"emit",type:o,value:{name:t,data:n}},this.parentOrigin)}}]),t}(),l=function(){function i(e){r(this,i);var t=e.container,n=e.url,a=e.model;return this.parent=window,this.frame=document.createElement("iframe"),(t||document.body).appendChild(this.frame),this.child=this.frame.contentWindow,this.model=a||{},this.sendHandshake(n)}return s(i,[{key:"sendHandshake",value:function(a){var r=this,s=t(a);return new i.Promise(function(t,i){var h=function a(o){return!!n(o,s)&&("handshake-reply"===o.data.postmate?(e("Parent: Received handshake reply from Child"),r.parent.removeEventListener("message",a,!1),r.childOrigin=o.origin,e("Parent: Saving Child origin",r.childOrigin),t(new d(r))):(e("Parent: Invalid handshake reply"),i("Failed handshake")))};r.parent.addEventListener("message",h,!1),r.frame.onload=function(){e("Parent: Sending handshake"),r.child.postMessage({postmate:"handshake",type:o,model:r.model},s)},e("Parent: Loading frame"),r.frame.src=a})}}]),i}();return l.debug=!1,l.Promise=window.Promise,l.Model=function(){function t(e){return r(this,t),this.child=window,this.model=e,this.parent=this.child.parent,this.sendHandshakeReply()}return s(t,[{key:"sendHandshakeReply",value:function(){var t=this;return new l.Promise(function(n,i){var a=function a(r){if("handshake"===r.data.postmate){e("Child: Received handshake from Parent"),t.child.removeEventListener("message",a,!1),e("Child: Sending handshake reply to Parent"),r.source.postMessage({postmate:"handshake-reply",type:o},r.origin),t.parentOrigin=r.origin;var s=r.data.model;if(s){for(var d=Object.keys(s),l=0;l<d.length;l++)s.hasOwnProperty(d[l])&&(t.model[d[l]]=s[d[l]]);e("Child: Inherited and extended model from Parent")}return e("Child: Saving Parent origin",t.parentOrigin),n(new h(t))}return i("Handshake Reply Failed")};t.child.addEventListener("message",a,!1)})}}]),t}(),l});
\ No newline at end of file
diff --git a/package.json b/package.json
index c151b45d..42a156fb 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,10 @@
 {
   "name": "postmate",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A powerful, simple, promise-based postMessage library",
   "main": "src/postmate.js",
   "devDependencies": {
+    "babel-plugin-transform-class-properties": "^6.11.5",
     "babel-preset-es2015-rollup": "^1.1.1",
     "chai": "^3.5.0",
     "connect": "^3.4.1",
diff --git a/src/postmate.js b/src/postmate.js
index 26d503d3..806fd6fa 100644
--- a/src/postmate.js
+++ b/src/postmate.js
@@ -50,7 +50,7 @@ function sanitize(message, allowedOrigin) {
 function resolveValue(model, property) {
   const unwrappedContext = typeof model[property] === 'function'
     ? model[property]() : model[property];
-  return Promise.resolve(unwrappedContext);
+  return Postmate.Promise.resolve(unwrappedContext);
 }
 
 /**
@@ -86,7 +86,7 @@ class ParentAPI {
 
 
   get(property) {
-    return new Promise(resolve => {
+    return new Postmate.Promise(resolve => {
       // Extract data from response and kill listeners
       const uid = new Date().getTime();
       const transact = e => {
@@ -171,6 +171,9 @@ class ChildAPI {
  */
 class Postmate {
 
+  static debug = false;
+  static Promise = window.Promise;
+
   /**
    * Sets options related to the Parent
    * @param {Object} userOptions The element to inject the frame into, and the url
@@ -195,7 +198,7 @@ class Postmate {
    */
   sendHandshake(url) {
     const childOrigin = resolveOrigin(url);
-    return new Promise((resolve, reject) => {
+    return new Postmate.Promise((resolve, reject) => {
       const reply = e => {
         if (!sanitize(e, childOrigin)) return false;
         if (e.data.postmate === 'handshake-reply') {
@@ -251,7 +254,7 @@ Postmate.Model = class Model {
    * @return {Promise} Resolves an object that exposes an API for the Child
    */
   sendHandshakeReply() {
-    return new Promise((resolve, reject) => {
+    return new Postmate.Promise((resolve, reject) => {
       const shake = e => {
         if (e.data.postmate === 'handshake') {
           log('Child: Received handshake from Parent');
diff --git a/test/fixtures/child.html b/test/fixtures/child.html
index 2c338930..98643882 100644
--- a/test/fixtures/child.html
+++ b/test/fixtures/child.html
@@ -15,8 +15,8 @@
       window.onerror = function () { console.log.apply(console, arguments); };
     </script>
     <script src="../node_modules/rsvp/dist/rsvp.min.js"></script>
-    <script>window.Promise = RSVP.Promise;</script>
     <script type="text/javascript" src="../build/postmate.min.js"></script>
+    <script>Postmate.Promise = RSVP.Promise;</script>
     <script type="text/javascript">
       var parentAPI = null;
       var height = function () { return document.height || document.body.offsetHeight; };
diff --git a/test/runner.html b/test/runner.html
index c663f514..896ee4e8 100644
--- a/test/runner.html
+++ b/test/runner.html
@@ -9,10 +9,10 @@
         <div id="mocha"></div>
         <script src="../node_modules/mocha/mocha.js"></script>
         <script src="../node_modules/chai/chai.js"></script>
-        <script src="../node_modules/rsvp/dist/rsvp.min.js"></script>
-        <script>window.Promise = RSVP.Promise;</script>
         <script>mocha.setup('bdd')</script>
+        <script src="../node_modules/rsvp/dist/rsvp.min.js"></script>
         <script src="../build/postmate.min.js"></script>
+        <script>Postmate.Promise = RSVP.Promise;</script>
         <script src="./test.js"></script>
         <div id="frame"></div>
         <script>