diff --git a/bower.json b/bower.json
index 26e396b..5cb97a7 100644
--- a/bower.json
+++ b/bower.json
@@ -8,7 +8,8 @@
   "dependencies": {
     "get-size": "desandro/get-size",
     "matches-selector": "desandro/matches-selector",
-    "outlayer": "metafizzy/outlayer#>=1.1 <2"
+    "outlayer": "metafizzy/outlayer#>=1.1 <2",
+    "masonry": ">=3.1"
   },
   "devDependencies": {
     "doc-ready": "desandro/doc-ready",
diff --git a/examples/masonry.html b/examples/masonry.html
index 55f88a4..1dc0316 100644
--- a/examples/masonry.html
+++ b/examples/masonry.html
@@ -153,6 +153,7 @@
 <script src="../bower_components/matches-selector/matches-selector.js"></script>
 <script src="../bower_components/outlayer/item.js"></script>
 <script src="../bower_components/outlayer/outlayer.js"></script>
+<script src="../bower_components/masonry/masonry.js"></script>
 
 <script src="../item.js"></script>
 <script src="../layout-mode.js"></script>
@@ -165,7 +166,7 @@ docReady( function() {
   var iso = window.iso = new Isotope( container, {
     layoutMode: 'masonry',
     masonry: {
-      columnWidth: 120
+      columnWidth: 90
     },
     getSortData: {
 
diff --git a/layout-mode.js b/layout-mode.js
index 4e701c6..f93c801 100644
--- a/layout-mode.js
+++ b/layout-mode.js
@@ -17,7 +17,6 @@ layoutMode.create = function( namespace, options ) {
     // link properties
     if ( isotope ) {
       this.options = isotope.options[ this.namespace ];
-      console.log( this.options );
       this._getMeasurement = isotope._getMeasurement;
       this.element = isotope.element;
       this.items = isotope.items;
diff --git a/layout-modes/masonry.js b/layout-modes/masonry.js
index b2738c7..db7852d 100644
--- a/layout-modes/masonry.js
+++ b/layout-modes/masonry.js
@@ -1,130 +1,37 @@
 /*!
- * Masonry v3.1.1
- * Cascading grid layout library
+ * Masonry layout mode
+ * sub-classes Masonry
  * http://masonry.desandro.com
- * MIT License
- * by David DeSandro
  */
 
 ( function( window ) {
 
 'use strict';
 
-// vars
-// var document = window.document;
-
 // -------------------------- helpers -------------------------- //
 
-var indexOf = Array.prototype.indexOf ?
-  function( items, value ) {
-    return items.indexOf( value );
-  } :
-  function ( items, value ) {
-    for ( var i=0, len = items.length; i < len; i++ ) {
-      var item = items[i];
-      if ( item === value ) {
-        return i;
-      }
-    }
-    return -1;
-  };
+// extend objects
+function extend( a, b ) {
+  for ( var prop in b ) {
+    a[ prop ] = b[ prop ];
+  }
+  return a;
+}
 
 // -------------------------- masonryDefinition -------------------------- //
 
 // used for AMD definition and requires
-function masonryDefinition( layoutMode, getSize ) {
+function masonryDefinition( layoutMode, Masonry, getSize ) {
   // create an Outlayer layout class
-  var Masonry = layoutMode.create('masonry');
+  var MasonryMode = layoutMode.create('masonry');
+  // sub-class Masonry
+  extend( MasonryMode.prototype, Masonry.prototype );
 
-  Masonry.prototype._resetLayout = function() {
+  MasonryMode.prototype.getSize = function() {
     this.isotope.getSize();
-    this._getMeasurement( 'columnWidth', 'outerWidth' );
-    this._getMeasurement( 'gutter', 'outerWidth' );
-    this.measureColumns();
-
-    // reset column Y
-    var i = this.cols;
-    this.colYs = [];
-    while (i--) {
-      this.colYs.push( 0 );
-    }
-
-    this.maxY = 0;
-  };
-
-  Masonry.prototype.measureColumns = function() {
-    var container = this._getSizingContainer();
-    // if columnWidth is 0, default to outerWidth of first item
-    var firstItem = this.items[0];
-    var firstItemElem = firstItem && firstItem.element;
-    if ( !this.columnWidth ) {
-      // columnWidth fall back to item of first element
-      this.columnWidth = firstItemElem ? getSize( firstItemElem ).outerWidth :
-        // or size of container
-        this.size.innerWidth;
-    }
-    this.columnWidth += this.gutter;
-
-    this._containerWidth = getSize( container ).innerWidth;
-    this.cols = Math.floor( ( this._containerWidth + this.gutter ) / this.columnWidth );
-    this.cols = Math.max( this.cols, 1 );
-  };
-
-  Masonry.prototype._getSizingContainer = function() {
-    return this.options.isFitWidth ? this.element.parentNode : this.element;
-  };
-
-  Masonry.prototype._getItemLayoutPosition = function( item ) {
-    item.getSize();
-    // how many columns does this brick span
-    var colSpan = Math.ceil( item.size.outerWidth / this.columnWidth );
-    colSpan = Math.min( colSpan, this.cols );
-
-    var colGroup = this._getColGroup( colSpan );
-    // get the minimum Y value from the columns
-    var minimumY = Math.min.apply( Math, colGroup );
-    var shortColIndex = indexOf( colGroup, minimumY );
-
-    // position the brick
-    var position = {
-      x: this.columnWidth * shortColIndex,
-      y: minimumY
-    };
-
-    // apply setHeight to necessary columns
-    var setHeight = minimumY + item.size.outerHeight;
-    var setSpan = this.cols + 1 - colGroup.length;
-    for ( var i = 0; i < setSpan; i++ ) {
-      this.colYs[ shortColIndex + i ] = setHeight;
-    }
-
-    return position;
-  };
-
-  /**
-   * @param {Number} colSpan - number of columns the element spans
-   * @returns {Array} colGroup
-   */
-  Masonry.prototype._getColGroup = function( colSpan ) {
-    if ( colSpan === 1 ) {
-      // if brick spans only one column, use all the column Ys
-      return this.colYs;
-    }
-
-    var colGroup = [];
-    // how many different places could this brick fit horizontally
-    var groupCount = this.cols + 1 - colSpan;
-    // for each group potential horizontal position
-    for ( var i = 0; i < groupCount; i++ ) {
-      // make an array of colY values for that one group
-      var groupColYs = this.colYs.slice( i, i + colSpan );
-      // and get the max value of the array
-      colGroup[i] = Math.max.apply( Math, groupColYs );
-    }
-    return colGroup;
   };
 
-  Masonry.prototype._manageStamp = function( stamp ) {
+  MasonryMode.prototype._manageStamp = function( stamp ) {
     var stampSize = getSize( stamp );
     var offset = this.isotope._getElementOffset( stamp );
     // get the columns that this stamp affects
@@ -142,37 +49,10 @@ function masonryDefinition( layoutMode, getSize ) {
     }
   };
 
-  Masonry.prototype._getContainerSize = function() {
-    this.maxY = Math.max.apply( Math, this.colYs );
-    var size = {
-      height: this.maxY
-    };
-
-    if ( this.options.isFitWidth ) {
-      size.width = this._getContainerFitWidth();
-    }
-
-    return size;
-  };
-
-  Masonry.prototype._getContainerFitWidth = function() {
-    var unusedCols = 0;
-    // count unused columns
-    var i = this.cols;
-    while ( --i ) {
-      if ( this.colYs[i] !== 0 ) {
-        break;
-      }
-      unusedCols++;
-    }
-    // fit container to columns that have been used
-    return ( this.cols - unusedCols ) * this.columnWidth - this.gutter;
-  };
-
   // debounced, layout on resize
   // HEADS UP this overwrites Outlayer.resize
   // Any changes in Outlayer.resize need to be manually added here
-  Masonry.prototype.resize = function() {
+  MasonryMode.prototype.resize = function() {
     // don't trigger if size did not change
     var container = this._getSizingContainer();
     var size = getSize( container );
@@ -188,7 +68,7 @@ function masonryDefinition( layoutMode, getSize ) {
     delete this.isotope.resizeTimeout;
   };
 
-  return Masonry;
+  return MasonryMode;
 }
 
 // -------------------------- transport -------------------------- //
@@ -197,6 +77,7 @@ if ( typeof define === 'function' && define.amd ) {
   // AMD
   define( [
       '../isotope',
+      'masonry/masonry',
       'get-size/get-size'
     ],
     masonryDefinition );
@@ -204,6 +85,7 @@ if ( typeof define === 'function' && define.amd ) {
   // browser global
   masonryDefinition(
     window.Isotope.layoutMode,
+    window.Masonry,
     window.getSize
   );
 }