diff --git a/terminatorlib/plugins/custom_commands.py b/terminatorlib/plugins/custom_commands.py
new file mode 100644
index 00000000..15439012
--- /dev/null
+++ b/terminatorlib/plugins/custom_commands.py
@@ -0,0 +1,442 @@
+# Terminator by Chris Jones <cmsj@tenshu.net?
+# GPL v2 only
+"""terminal_menu.py - Default plugins for the terminal menu"""
+import sys
+import os
+# only ran when testing plugin
+if __name__ == '__main__':
+  sys.path.append( os.path.join(os.path.dirname(__file__), "../.."))
+import gtk
+import terminatorlib.plugin as plugin
+from terminatorlib.translation import _
+from terminatorlib.util import get_config_dir
+import ConfigParser
+
+(CC_COL_ENABLED, CC_COL_NAME, CC_COL_COMMAND) = range(0,3)
+
+# Every plugin you want Terminator to load *must* be listed in 'available'
+
+# This is commented out because we don't want any menu item plugins by default
+#available = ['MyFirstMenuItem']
+available = ['CustomCommandsMenu']
+
+class MenuItem(plugin.Plugin):
+    """Base class for menu items"""
+    capabilities = ['terminal_menu']
+
+    def callback(self, menuitems, menu, terminal):
+        """Callback to transform the enclosed URL"""
+        raise NotImplementedError
+
+class CustomCommandsMenu(MenuItem):
+    """Simple proof of concept"""
+    capabilities = ['terminal_menu']
+    cmd_list = []
+    conf_file = os.path.join(get_config_dir(),"custom_commands")
+
+    def __init__( self):
+      config = ConfigParser.ConfigParser()
+      config.read(self.conf_file)
+      sections = config.sections()
+      for s in sections:
+        if not (config.has_option(s, "name") and config.has_option(s, "command")):
+          print "CustomCommandsMenu: Ignoring section %s" % s
+          continue
+        name = config.get(s, "name")
+        command = config.get(s, "command")
+        enabled = config.has_option(s, "enabled") and config.getboolean(s, "enabled") or False
+        self.cmd_list.append(
+                              {'enabled' : enabled,
+                                'name' : name,
+                                'command' : command
+                              }
+                            )
+    def callback(self, menuitems, menu, terminal):
+        """Add our menu items to the menu"""
+        item = gtk.MenuItem(_('Custom Commands'))
+        menuitems.append(item)
+
+        submenu = gtk.Menu()
+        item.set_submenu(submenu)
+
+        menuitem = gtk.ImageMenuItem(gtk.STOCK_PREFERENCES)
+        menuitem.connect("activate", self.configure)
+        submenu.append(menuitem)
+
+        menuitem = gtk.SeparatorMenuItem()
+        submenu.append(menuitem)
+
+        theme = gtk.IconTheme()
+        for command in self.cmd_list:
+          if not command['enabled']:
+            continue
+          exe = command['command'].split(' ')[0]
+          iconinfo = theme.choose_icon([exe], gtk.ICON_SIZE_MENU, gtk.ICON_LOOKUP_USE_BUILTIN)
+          if iconinfo:
+            image = gtk.Image()
+            image.set_from_icon_name(exe, gtk.ICON_SIZE_MENU)
+            menuitem = gtk.ImageMenuItem(command['name'])
+            menuitem.set_image(image)
+          else:
+            menuitem = gtk.MenuItem(command["name"])
+          menuitem.connect("activate", self._execute, {'terminal' : terminal, 'command' : command['command'] })
+          submenu.append(menuitem)
+        
+    def _save_config(self):
+      config = ConfigParser.ConfigParser()
+      i = 0
+      length = len(self.cmd_list)
+      while i < length:
+        enabled = self.cmd_list[i]['enabled']
+        name = self.cmd_list[i]['name']
+        command = self.cmd_list[i]['command']
+        
+        config.add_section(name)
+        config.set(name,'enabled', enabled)
+        config.set(name,'name', name)
+        config.set(name,'command', command)
+        i = i + 1
+
+      with open(self.conf_file, 'wb') as configfile:
+        config.write(configfile)
+        configfile.close()
+
+ 
+    def _execute(self, widget, data):
+      command = data['command']
+      if command[len(command)-1] != '\n':
+        command = command + '\n'
+      data['terminal'].vte.feed_child(command)
+
+    def configure(self, widget, data = None):
+      ui = {}
+      dbox = gtk.Dialog(
+                      _("Custom Commands Configuration"),
+                      None,
+                      gtk.DIALOG_MODAL,
+                      (
+                        gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
+                        gtk.STOCK_OK, gtk.RESPONSE_ACCEPT
+                      )
+                    )
+      store = gtk.ListStore(bool, str, str)
+
+      for command in self.cmd_list:
+        store.append([command['enabled'], command['name'], command['command']])
+ 
+      treeview = gtk.TreeView(store)
+      #treeview.connect("cursor-changed", self.on_cursor_changed, ui)
+      selection = treeview.get_selection()
+      selection.set_mode(gtk.SELECTION_SINGLE)
+      selection.connect("changed", self.on_selection_changed, ui)
+      ui['treeview'] = treeview
+
+      renderer = gtk.CellRendererToggle()
+      renderer.connect('toggled', self.on_toggled, ui)
+      column = gtk.TreeViewColumn("Enabled", renderer, active=CC_COL_ENABLED)
+      treeview.append_column(column)
+
+      renderer = gtk.CellRendererText()
+      column = gtk.TreeViewColumn("Name", renderer, text=CC_COL_NAME)
+      treeview.append_column(column)
+
+      renderer = gtk.CellRendererText()
+      column = gtk.TreeViewColumn("Command", renderer, text=CC_COL_COMMAND)
+      treeview.append_column(column)
+
+      hbox = gtk.HBox()
+      hbox.pack_start(treeview)
+      dbox.vbox.pack_start(hbox)
+
+      button_box = gtk.VBox()
+
+      button = gtk.Button(stock=gtk.STOCK_GOTO_TOP)
+      button_box.pack_start(button, False, True)
+      button.connect("clicked", self.on_goto_top, ui) 
+      button.set_sensitive(False)
+      ui['button_top'] = button
+
+      button = gtk.Button(stock=gtk.STOCK_GO_UP)
+      button_box.pack_start(button, False, True)
+      button.connect("clicked", self.on_go_up, ui)
+      button.set_sensitive(False)
+      ui['button_up'] = button
+
+      button = gtk.Button(stock=gtk.STOCK_GO_DOWN)
+      button_box.pack_start(button, False, True)
+      button.connect("clicked", self.on_go_down, ui) 
+      button.set_sensitive(False)
+      ui['button_down'] = button
+
+      button = gtk.Button(stock=gtk.STOCK_GOTO_LAST)
+      button_box.pack_start(button, False, True)
+      button.connect("clicked", self.on_goto_last, ui) 
+      button.set_sensitive(False)
+      ui['button_last'] = button
+
+      button = gtk.Button(stock=gtk.STOCK_NEW)
+      button_box.pack_start(button, False, True)
+      button.connect("clicked", self.on_new, ui) 
+      ui['button_new'] = button
+
+      button = gtk.Button(stock=gtk.STOCK_EDIT)
+      button_box.pack_start(button, False, True)
+      button.set_sensitive(False)
+      button.connect("clicked", self.on_edit, ui) 
+      ui['button_edit'] = button
+
+      button = gtk.Button(stock=gtk.STOCK_DELETE)
+      button_box.pack_start(button, False, True)
+      button.connect("clicked", self.on_delete, ui) 
+      button.set_sensitive(False)
+      ui['button_delete'] = button
+
+
+
+      hbox.pack_start(button_box)
+      dbox.show_all()
+      res = dbox.run()
+      if res == gtk.RESPONSE_ACCEPT:
+        #we save the config
+        iter = store.get_iter_first()
+        self.cmd_list = []
+        while iter:
+          (enabled, name, command) = store.get(iter,
+                                              CC_COL_ENABLED,
+                                              CC_COL_NAME,
+                                              CC_COL_COMMAND)
+          self.cmd_list.append(
+                            {'enabled' : enabled,
+                            'name': name,
+                            'command' : command}
+                              )
+          iter = store.iter_next(iter)
+        self._save_config()
+      
+      dbox.destroy()
+      return
+
+    def on_toggled(self, widget, path, data):
+      treeview = data['treeview']
+      store = treeview.get_model()
+      iter = store.get_iter(path)
+      (enabled, name, command) = store.get(iter,
+                                    CC_COL_ENABLED,
+                                    CC_COL_NAME,
+                                    CC_COL_COMMAND
+                                        )
+      store.set_value(iter, CC_COL_ENABLED, not enabled)
+      for cmd in self.cmd_list:
+        if cmd['name'] == name:
+          cmd['enabled'] = not enabled
+          break
+
+    def on_selection_changed(self,selection, data=None):
+      treeview = selection.get_tree_view()
+      (model, iter) = selection.get_selected()
+      data['button_top'].set_sensitive(iter is not None)
+      data['button_up'].set_sensitive(iter is not None)
+      data['button_down'].set_sensitive(iter is not None)
+      data['button_last'].set_sensitive(iter is not None)
+      data['button_edit'].set_sensitive(iter is not None)
+      data['button_delete'].set_sensitive(iter is not None)
+
+    def _create_command_dialog(self, enabled_var = False, name_var = "", command_var = ""):
+      dialog = gtk.Dialog(
+                        _("New Command"),
+                        None,
+                        gtk.DIALOG_MODAL,
+                        (
+                          gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
+                          gtk.STOCK_OK, gtk.RESPONSE_ACCEPT
+                        )
+                      )
+      table = gtk.Table(3, 2)
+
+      label = gtk.Label(_("Enabled:"))
+      table.attach(label, 0, 1, 0, 1)
+      enabled = gtk.CheckButton()
+      enabled.set_active(enabled_var)
+      table.attach(enabled, 1, 2, 0, 1)
+
+      label = gtk.Label(_("Name:"))
+      table.attach(label, 0, 1, 1, 2)
+      name = gtk.Entry()
+      name.set_text(name_var)
+      table.attach(name, 1, 2, 1, 2)
+      
+      label = gtk.Label(_("Command:"))
+      table.attach(label, 0, 1, 2, 3)
+      command = gtk.Entry()
+      command.set_text(command_var)
+      table.attach(command, 1, 2, 2, 3)
+
+      dialog.vbox.pack_start(table)
+      dialog.show_all()
+      return (dialog,enabled,name,command)
+
+    def _error(self, msg):
+      err = gtk.MessageDialog(dialog,
+                              gtk.DIALOG_MODAL,
+                              gtk.MESSAGE_ERROR,
+                              gtk.BUTTONS_CLOSE,
+                              msg
+                            )
+      err.run()
+      err.destroy()
+
+      
+
+
+    def on_new(self, button, data):
+      (dialog,enabled,name,command) = self._create_command_dialog()
+      res = dialog.run()
+      item = {}
+      if res == gtk.RESPONSE_ACCEPT:
+        item['enabled'] = enabled.get_active()
+        item['name'] = name.get_text()
+        item['command'] = command.get_text()
+        if item['name'] == '' or item['command'] == '':
+          err = gtk.MessageDialog(dialog,
+                                  gtk.DIALOG_MODAL,
+                                  gtk.MESSAGE_ERROR,
+                                  gtk.BUTTONS_CLOSE,
+                                  _("You need to define a name and command")
+                                )
+          err.run()
+          err.destroy()
+        else:
+          # we have a new command
+          store = data['treeview'].get_model()
+          iter = store.get_iter_first()
+          name_exist = False
+          while iter != None:
+            if store.get_value(iter,CC_COL_NAME) == item['name']:
+              name_exist = True
+              break
+            iter = store.iter_next(iter)
+          if not name_exist:
+            store.append((item['enabled'], item['name'], item['command']))
+          else:
+            self._err(_("Name *%s* already exist") % item['name'])
+      dialog.destroy()
+
+    def on_goto_top(self, button, data):
+      treeview = data['treeview']
+      selection = treeview.get_selection()
+      (store, iter) = selection.get_selected()
+      
+      if not iter:
+        return
+      firstiter = store.get_iter_first()
+      store.move_before(iter, firstiter)
+
+    def on_go_up(self, button, data):
+      treeview = data['treeview']
+      selection = treeview.get_selection()
+      (store, iter) = selection.get_selected()
+       
+      if not iter:
+        return
+
+      tmpiter = store.get_iter_first()
+
+      if(store.get_path(tmpiter) == store.get_path(iter)):
+        return
+
+      while tmpiter:
+        next = store.iter_next(tmpiter)
+        if(store.get_path(next) == store.get_path(iter)):
+          store.swap(iter, tmpiter)
+          break
+        tmpiter = next
+
+    def on_go_down(self, button, data):
+      treeview = data['treeview']
+      selection = treeview.get_selection()
+      (store, iter) = selection.get_selected()
+      
+      if not iter:
+        return
+      next = store.iter_next(iter)
+      if next:
+        store.swap(iter, next)
+
+    def on_goto_last(self, button, data):
+      treeview = data['treeview']
+      selection = treeview.get_selection()
+      (store, iter) = selection.get_selected()
+      
+      if not iter:
+        return
+      lastiter = iter
+      tmpiter = store.get_iter_first()
+      while tmpiter:
+        lastiter = tmpiter
+        tmpiter = store.iter_next(tmpiter)
+      
+      store.move_after(iter, lastiter)
+
+ 
+    def on_delete(self, button, data):
+      treeview = data['treeview']
+      selection = treeview.get_selection()
+      (store, iter) = selection.get_selected()
+      if iter:
+        store.remove(iter)
+      
+      return
+ 
+    def on_edit(self, button, data):
+      treeview = data['treeview']
+      selection = treeview.get_selection()
+      (store, iter) = selection.get_selected()
+      
+      if not iter:
+        return
+       
+      (dialog,enabled,name,command) = self._create_command_dialog(
+                                                enabled_var = store.get_value(iter, CC_COL_ENABLED),
+                                                name_var = store.get_value(iter, CC_COL_NAME),
+                                                command_var = store.get_value(iter, CC_COL_COMMAND)
+                                                                  )
+      res = dialog.run()
+      item = {}
+      if res == gtk.RESPONSE_ACCEPT:
+        item['enabled'] = enabled.get_active()
+        item['name'] = name.get_text()
+        item['command'] = command.get_text()
+        if item['name'] == '' or item['command'] == '':
+          err = gtk.MessageDialog(dialog,
+                                  gtk.DIALOG_MODAL,
+                                  gtk.MESSAGE_ERROR,
+                                  gtk.BUTTONS_CLOSE,
+                                  _("You need to define a name and command")
+                                )
+          err.run()
+          err.destroy()
+        else:
+          tmpiter = store.get_iter_first()
+          name_exist = False
+          while tmpiter != None:
+            if store.get_path(tmpiter) != store.get_path(iter) and store.get_value(tmpiter,CC_COL_NAME) == item['name']:
+              name_exist = True
+              break
+            tmpiter = store.iter_next(tmpiter)
+          if not name_exist:
+            store.set(iter,
+                      CC_COL_ENABLED,item['enabled'],
+                      CC_COL_NAME, item['name'],
+                      CC_COL_COMMAND, item['command']
+                      )
+          else:
+            self._err(_("Name *%s* already exist") % item['name'])
+
+      dialog.destroy()
+ 
+      
+if __name__ == '__main__':
+  c = CustomCommandsMenu()
+  c.configure(None, None)
+  gtk.main()
+