diff --git a/.eric4project/openlp.org 2.0.e4q b/.eric4project/openlp.org 2.0.e4q
index 84e7cb899..35a823663 100644
--- a/.eric4project/openlp.org 2.0.e4q	
+++ b/.eric4project/openlp.org 2.0.e4q	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE UserProject SYSTEM "UserProject-4.0.dtd">
 <!-- eric4 user project file for project openlp.org 2.0 -->
-<!-- Saved: 2008-11-22, 17:14:47 -->
+<!-- Saved: 2008-11-22, 23:40:11 -->
 <!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org -->
 <UserProject version="4.0">
 </UserProject>
\ No newline at end of file
diff --git a/.eric4project/openlp.org 2.0.e4t b/.eric4project/openlp.org 2.0.e4t
index b49f3dcb4..b22e6a5cb 100644
--- a/.eric4project/openlp.org 2.0.e4t	
+++ b/.eric4project/openlp.org 2.0.e4t	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Tasks SYSTEM "Tasks-4.2.dtd">
 <!-- eric4 tasks file for project openlp.org 2.0 -->
-<!-- Saved: 2008-11-22, 17:14:47 -->
+<!-- Saved: 2008-11-22, 23:40:11 -->
 <Tasks version="4.2">
 </Tasks>
\ No newline at end of file
diff --git a/openlp/core/mediamanageritem.py b/openlp/core/mediamanageritem.py
index 354b62afa..d548b4976 100644
--- a/openlp/core/mediamanageritem.py
+++ b/openlp/core/mediamanageritem.py
@@ -39,3 +39,26 @@ class MediaManagerItem(QtGui.QWidget):
             self.Title = title
         else:
             self.Title = ''
+        self.Toolbar = None
+
+    def addToolbar(self):
+        """
+        A method to help developers easily add a toolbar to the media manager
+        item.
+        """
+        if self.Toolbar is None:
+            self.PageLayout = QtGui.QVBoxLayout(self)
+            self.PageLayout.setSpacing(0)
+            self.PageLayout.setMargin(0)
+            self.PageLayout.setObjectName('PageLayout')
+            self.Toolbar = QtGui.QWidget(self)
+            self.Toolbar.setObjectName('Toolbar')
+            self.ToolbarLayout = QtGui.QHBoxLayout(self.Toolbar)
+            self.ToolbarLayout.setSpacing(0)
+            self.ToolbarLayout.setMargin(0)
+            self.ToolbarLayout.setObjectName('ToolbarLayout')
+
+    def addToolbarItem(self, item):
+        if self.Toolbar is None:
+            self.addToolbar()
+        self.ToolbarLayout.addWidget(item)
diff --git a/openlp/ui/forms/mainwindow.py b/openlp/ui/forms/mainwindow.py
index e9d05f43c..0986d0d5e 100644
--- a/openlp/ui/forms/mainwindow.py
+++ b/openlp/ui/forms/mainwindow.py
@@ -174,6 +174,8 @@ class MainWindow(object):
         self.MediaToolBox = QtGui.QToolBox(self.MediaManagerContents)
         #self.MediaToolBox.setTabSpacing(0)
         self.MediaToolBox.setObjectName("MediaToolBox")
+        # This is where we will eventually get the Plugin Manager to pull in
+        # the media manager items.
         self.SongPage = QtGui.QWidget()
         self.SongPage.setGeometry(QtCore.QRect(0, 0, 267, 609))
         self.SongPage.setObjectName("SongPage")