diff --git a/.gitmodules b/.gitmodules
index 8024368..05095de 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "deps/node-canvas"]
 	path = deps/node-canvas
 	url = https://github.com/LearnBoost/node-canvas.git
+[submodule "deps/node-overload"]
+	path = deps/node-overload
+	url = https://github.com/bmeck/node-overload.git
diff --git a/deps/node-overload b/deps/node-overload
new file mode 160000
index 0000000..f51beb2
--- /dev/null
+++ b/deps/node-overload
@@ -0,0 +1 @@
+Subproject commit f51beb2e1479cfe591e8bcd3346da884d89dd454
diff --git a/lib/canvas-svg/patch.js b/lib/canvas-svg/patch.js
index 633fb2c..20891aa 100644
--- a/lib/canvas-svg/patch.js
+++ b/lib/canvas-svg/patch.js
@@ -1,53 +1,27 @@
 
 
-// hack hack hack
-var DOMPatch = exports.DOM = function DOMPatch(elem, rules) {
-    var that = this;
-    rules = rules || {};
-    this.__children = [];
-    for(var key in elem) {
-        if (rules.hasOwnProperty(key)) {
-            rules[key](this, key, elem);
-
-        } else if (key === "childNodes") {
-            this.__defineGetter__(key, function () {
-                return that.__children;
-            });
-            var children = elem.childNodes;
-            for(var n=0,l=children.length;n<l;n++) {
-                this.__children.push(new DOMPatch(children[n], rules));
-            }
-
-        } else if (key && key[0] !== "_") {
-            if (typeof elem[key] === 'function')
-                this[key] = (function (k) {
-                    return function () {
-                        return elem[k].apply(elem, arguments);
-                    };
-                })(key);
-            else
-                this.__defineSetter__(key, (function (k) {
-                    return function (val) {
-                        return elem[k] = val;
-                    };
-                })(key));
-                this.__defineGetter__(key, (function (k) {
-                    return function () {
-                        return elem[k];
-                    };
-                })(key));
-        }
-    }
-};
+module.exports = function (overload) {
+
+    var result = {};
+
+    // hack hack hack
+    var patch = result.nodeName = function (elem) {
+        return overload.Watchable(function get(info) {
+            var key = info.property;
+            if (key === "nodeName") {
+                return elem.nodeName.toLowerCase(); // thats the reason
 
+            } else if (key === "childNodes") {
+                var res = [];
+                for(var i=0,l=elem.childNodes.length;i<l;i++)
+                    res.push(patch(elem.childNodes[i]));
+                return res;
 
-exports.nodeName = function (elem) {
-    return new DOMPatch(elem, {
-        nodeName : function (that, k, e) {
-            that.__defineGetter__(k, function () {
-                return e.nodeName.toLowerCase(); // thats the reason
-            });
-        },
-    });
+            } else return elem[key];
+        });
+    };
+
+    return result;
 };
 
+
diff --git a/lib/node-canvas-svg.js b/lib/node-canvas-svg.js
index 401e67b..99d9884 100644
--- a/lib/node-canvas-svg.js
+++ b/lib/node-canvas-svg.js
@@ -1,14 +1,17 @@
 // FIXME htmlparser
 
 var depdir = __dirname + "/../deps",
-    _require = require('./canvas-svg/require')(depdir),
+    _require = require('./canvas-svg/require')(depdir);
 
-   patch = require('./canvas-svg/patch');
 
 var jsdom = _require('jsdom', 'jsdom/lib/jsdom'),
     vargs = _require('vargs', 'vargs/lib/vargs'),
+    overload = _require('node-overload', 'overload', 'lib/overload',
+                        'node-overload/lib/overload'),
     Canvas = _require('node-canvas', 'canvas', 'node-canvas/lib/canvas',
                       'canvas/lib/canvas'),
+
+    patch = require('./canvas-svg/patch')(overload),
     Vargs = vargs.Constructor;