diff --git a/terminatorlib/factory.py b/terminatorlib/factory.py
new file mode 100755
index 00000000..7c54f370
--- /dev/null
+++ b/terminatorlib/factory.py
@@ -0,0 +1,81 @@
+#!/usr/bin/python
+# Terminator by Chris Jones <cmsj@tenshu.net>
+# GPL v2 only
+"""factory.py - Maker of objects"""
+
+from borg import Borg
+from util import dbg, err
+
+class Factory(Borg):
+    """Definition of a class that makes other classes"""
+    def __init__(self):
+        """Class initialiser"""
+        Borg.__init__(self)
+        self.prepare_attributes()
+
+    def prepare_attributes(self):
+        """Required by the borg, but a no-op here"""
+        pass
+
+    def make(self, product, *args):
+        """Make the requested product"""
+        try:
+            func = getattr(self, 'make_%s' % product.lower())
+        except AttributeError:
+            err('Factory::make: requested object does not exist: %s' % product)
+            return(None)
+
+        dbg('Factory::make: created a %s' % product)
+        return(func(args))
+
+    def make_terminal(self, *args):
+        """Make a Terminal"""
+        import terminal
+        return(terminal.Terminal())
+
+    def make_hpaned(self, *args):
+        """Make an HPaned"""
+        import paned
+        return(paned.HPaned())
+
+    def make_vpaned(self, *args):
+        """Make a VPaned"""
+        import paned
+        return(paned.VPaned())
+
+    def make_notebook(self, *args):
+        """Make a Notebook"""
+        import notebook
+        return(notebook.Notebook(args[0][0]))
+
+if __name__ == '__main__':
+    # Do some testing
+
+    fact = Factory()
+    objects = []
+
+    # Test making a Terminal
+    terminal = fact.make('terminal')
+    objects.append(terminal)
+
+    # Test making a Notebook
+    import gtk
+    win = gtk.Window()
+    win.add(terminal)
+    notebook = fact.make('notebook', win)
+    objects.append(notebook)
+
+    # Test making an HPaned
+    hpaned = fact.make('hpaned')
+    objects.append(hpaned)
+
+    # Test making a VPaned
+    vpaned = fact.make('vpaned')
+    objects.append(vpaned)
+
+    for item in objects:
+        print item.__class__.__name__
+
+    # Test making something fake
+    fail = fact.make('counterfeit')
+