diff --git a/lib/MethodWrapperFactory.js b/lib/MethodWrapperFactory.js
new file mode 100644
index 0000000..fc35b1a
--- /dev/null
+++ b/lib/MethodWrapperFactory.js
@@ -0,0 +1,63 @@
+/**
+ * Builds method wrappers
+ *
+ *  Copyright (C) 2010 Mike Gerwitz
+ *
+ *  This file is part of ease.js.
+ *
+ *  ease.js is free software: you can redistribute it and/or modify it under the
+ *  terms of the GNU Lesser General Public License as published by the Free
+ *  Software Foundation, either version 3 of the License, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author  Mike Gerwitz
+ * @package core
+ */
+
+
+/**
+ * Initializes factory to wrap methods
+ *
+ * @param  {function()}  getInst  function to determine instance and return
+ *                                associated visibility object
+ *
+ * @param  {function(function(),function(),number)}  factory  function that will
+ *                                                            perform the actual
+ *                                                            wrapping
+ */
+module.exports = exports = function MethodWrapperFactory( getInst, factory )
+{
+    // permit omission of the 'new' keyword for instantiation
+    if ( !( this instanceof exports ) )
+    {
+        return new exports( getInst, factory );
+    }
+
+    this._getInst = getInst;
+    this._factory = factory;
+};
+
+
+/**
+ * Wraps the provided method
+ *
+ * The returned function is determined by the factory function provided when the
+ * MethodWrapperFactory was instantiated.
+ *
+ * @param  {function()}  method        method to wrap
+ * @param  {function()}  super_method  super method, if overriding
+ * @param  {number}      cid           class id that method is associated with
+ */
+exports.prototype.wrapMethod = function( method, super_method, cid )
+{
+    return this._factory( method, super_method, cid, this._getInst );
+};
+
diff --git a/test/MethodWrapperFactoryTest.js b/test/MethodWrapperFactoryTest.js
new file mode 100644
index 0000000..d22c367
--- /dev/null
+++ b/test/MethodWrapperFactoryTest.js
@@ -0,0 +1,127 @@
+/**
+ * Tests MethodWrapperFactory prototype
+ *
+ *  Copyright (C) 2010 Mike Gerwitz
+ *
+ *  This file is part of ease.js.
+ *
+ *  ease.js is free software: you can redistribute it and/or modify it under the
+ *  terms of the GNU Lesser General Public License as published by the Free
+ *  Software Foundation, either version 3 of the License, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author  Mike Gerwitz
+ * @package test
+ */
+
+
+var common = require( './common' ),
+    assert = require( 'assert' ),
+
+    Sut = common.require( 'MethodWrapperFactory' )
+;
+
+
+/**
+ * To keep with the spirit of ease.js, we should be able to instantiate
+ * MethodWrapperFactory both with and without the 'new' keyword
+ *
+ * Consistency is key with these sorts of things.
+ */
+( function testCanInstantiateWithAndWithoutNewKeyword()
+{
+    // with 'new' keyword
+    assert.ok(
+        ( new Sut() )
+            instanceof Sut,
+        "Should be able to instantiate MethodWrapperFactory with " +
+            "'new' keyword"
+    );
+
+    // without 'new' keyword
+    assert.ok( ( Sut() instanceof Sut ),
+        "Should be able to instantiate MethodWrapperFactory " +
+            "without 'new' keyword"
+    );
+} )();
+
+
+/**
+ * The factory itself is rather simple. The class should accept a factory
+ * function which should return the wrapped method.
+ */
+( function testProvidedFactoryFunctionIsProperlyCalled()
+{
+    var called       = false,
+        method       = function() {},
+        super_method = function() {},
+        cid          = 55,
+        retval       = 'foobar';
+
+    var result = Sut(
+        function() {},
+        function( given_method, given_super, given_cid )
+        {
+            called = true;
+
+            assert.equal( given_method, method,
+                "Factory method should be provided with method to wrap"
+            );
+
+            assert.equal( given_super, super_method,
+                "Factory method should be provided with super method"
+            );
+
+            assert.equal( given_cid, cid,
+                "Factory method should be provided with cid"
+            );
+
+            return retval;
+        }
+    ).wrapMethod( method, super_method, cid );
+
+    // we'll include this in addition to the following assertion (which is
+    // redundant) to make debugging more clear
+    assert.equal( called, true,
+        "Given factory method should be called"
+    );
+
+    assert.equal( result, retval,
+        "Should return value from factory function"
+    );
+} )();
+
+
+/**
+ * The instance function, which should be made available to the factory
+ * function, is used to retrieve the visibility object associated with the
+ * instance that the context is associated with.
+ */
+( function testProvidedFactoryFunctionIsCalledWithInstanceFunction()
+{
+    var called = false;
+
+    Sut(
+        function()
+        {
+            called = true;
+        },
+        function( _, __, ___, inst )
+        {
+            inst();
+        }
+    ).wrapMethod( null, null, 0 );
+
+    assert.equal( called, true,
+        "Instance callback should be provided to factory function"
+    );
+} )();
+