diff --git a/openlp.org 2.0.e4p b/openlp.org 2.0.e4p
index 8096e629a..8aaae61e5 100644
--- a/openlp.org 2.0.e4p	
+++ b/openlp.org 2.0.e4p	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-4.4.dtd">
 <!-- eric4 project file for project openlp.org 2.0 -->
-<!-- Saved: 2008-11-20, 22:11:22 -->
+<!-- Saved: 2008-11-21, 20:51:04 -->
 <!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org -->
 <Project version="4.4">
   <ProgLanguage mixed="0">Python</ProgLanguage>
@@ -83,8 +83,8 @@
     <Form>openlp/resources/forms/opensongimportform.ui</Form>
     <Form>openlp/resources/forms/opensongexportform.ui</Form>
     <Form>openlp/resources/forms/splashscreen.ui</Form>
-    <Form>openlp/resources/forms/BibleCSVImportWizard.ui</Form>
-    <Form>openlp/resources/forms/bibleimportform.ui</Form>
+    <Form>openlp/resources/forms/bibleImport.ui</Form>
+    <Form>openlp/resources/forms/songexport.ui</Form>
   </Forms>
   <Translations>
   </Translations>
diff --git a/openlp.org 2.0.e4q b/openlp.org 2.0.e4q
deleted file mode 100644
index d10a2b4ff..000000000
--- a/openlp.org 2.0.e4q	
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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-03, 23:03:11 -->
-<!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org -->
-<UserProject version="4.0">
-</UserProject>
\ No newline at end of file
diff --git a/openlp.org 2.0.e4s b/openlp.org 2.0.e4s
deleted file mode 100644
index ac5031bac..000000000
--- a/openlp.org 2.0.e4s	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Session SYSTEM "Session-4.0.dtd">
-<!-- eric4 session file for project openlp.org 2.0 -->
-<!-- This file was generated automatically, do not edit. -->
-<!-- Saved: 2008-11-03, 22:49:15 -->
-<Session version="4.0">
-  <Filenames>
-    <Filename cline="24" cindex="13">/home/raoul/Projects/openlp-2/openlp.pyw</Filename>
-    <Filename cline="30" cindex="0">/home/raoul/Projects/openlp-2/openlp/ui/forms/splashscreen.py</Filename>
-    <Filename cline="31" cindex="30">/home/raoul/Projects/openlp-2/openlp/ui/forms/mainwindow.py</Filename>
-    <Filename cline="22" cindex="53">/home/raoul/Projects/openlp-2/openlp/ui/forms/__init__.py</Filename>
-  </Filenames>
-  <ActiveWindow cline="24" cindex="13">/home/raoul/Projects/openlp-2/openlp.pyw</ActiveWindow>
-  <Breakpoints>
-  </Breakpoints>
-  <Watchpoints>
-  </Watchpoints>
-  <DebugInfo>
-    <CommandLine></CommandLine>
-    <WorkingDirectory></WorkingDirectory>
-    <Environment></Environment>
-    <ReportExceptions value="True" />
-    <Exceptions>
-    </Exceptions>
-    <AutoClearShell value="True" />
-    <TracePython value="False" />
-    <AutoContinue value="True" />
-    <CovexcPattern></CovexcPattern>
-  </DebugInfo>
-  <Bookmarks>
-  </Bookmarks>
-</Session>
\ No newline at end of file
diff --git a/openlp.org 2.0.e4t b/openlp.org 2.0.e4t
deleted file mode 100644
index 49950a8db..000000000
--- a/openlp.org 2.0.e4t	
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Tasks SYSTEM "Tasks-4.1.dtd">
-<!-- eric4 tasks file for project openlp.org 2.0 -->
-<!-- Saved: 2008-11-03, 23:03:11 -->
-<Tasks version="4.1">
-</Tasks>
\ No newline at end of file
diff --git a/openlp/resources/forms/songexport.ui b/openlp/resources/forms/songexport.ui
new file mode 100644
index 000000000..9830db3ef
--- /dev/null
+++ b/openlp/resources/forms/songexport.ui
@@ -0,0 +1,241 @@
+<ui version="4.0" >
+ <class>SongExportDialog</class>
+ <widget class="QDialog" name="SongExportDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>641</width>
+    <height>607</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="SongExportLayout" >
+   <property name="spacing" >
+    <number>8</number>
+   </property>
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <item>
+    <widget class="QWidget" native="1" name="SongListsWidget" >
+     <layout class="QHBoxLayout" name="SongListsLayout" >
+      <property name="spacing" >
+       <number>8</number>
+      </property>
+      <property name="margin" >
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QGroupBox" name="AvailableGroupBox" >
+        <property name="title" >
+         <string>Available Songs</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout" >
+         <item>
+          <widget class="QListWidget" name="AvailableListWidget" />
+         </item>
+         <item>
+          <widget class="QToolButton" name="AvailableAllToolButton" >
+           <property name="text" >
+            <string>Select All</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QWidget" native="1" name="SelectionWidget" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize" >
+         <size>
+          <width>30</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <layout class="QVBoxLayout" name="SelectionLayout" >
+         <property name="spacing" >
+          <number>8</number>
+         </property>
+         <property name="sizeConstraint" >
+          <enum>QLayout::SetMinimumSize</enum>
+         </property>
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <item>
+          <spacer name="TopVerticalSpacer" >
+           <property name="orientation" >
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeType" >
+            <enum>QSizePolicy::MinimumExpanding</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>20</width>
+             <height>132</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QToolButton" name="SelectToolButton" >
+           <property name="text" >
+            <string>Select Songs</string>
+           </property>
+           <property name="icon" >
+            <iconset resource="../images/openlp-2.qrc" >
+             <normaloff>:/exports/export_move_to_list.png</normaloff>:/exports/export_move_to_list.png</iconset>
+           </property>
+           <property name="iconSize" >
+            <size>
+             <width>20</width>
+             <height>20</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="DeselectToolButton" >
+           <property name="text" >
+            <string>Deselect Songs</string>
+           </property>
+           <property name="icon" >
+            <iconset resource="../images/openlp-2.qrc" >
+             <normaloff>:/exports/export_remove.png</normaloff>:/exports/export_remove.png</iconset>
+           </property>
+           <property name="iconSize" >
+            <size>
+             <width>20</width>
+             <height>20</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="BottomVerticalSpacer" >
+           <property name="orientation" >
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeType" >
+            <enum>QSizePolicy::MinimumExpanding</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>20</width>
+             <height>131</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="SelectedGroupBox" >
+        <property name="title" >
+         <string>Selected Songs</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_2" >
+         <item>
+          <widget class="QListWidget" name="SelectedListWidget" />
+         </item>
+         <item>
+          <widget class="QToolButton" name="SelectedAllToolButton" >
+           <property name="text" >
+            <string>Select All</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTabWidget" name="ExportTabWidget" >
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="OpenLyricTab" >
+      <attribute name="title" >
+       <string>OpenLyric Format</string>
+      </attribute>
+     </widget>
+     <widget class="QWidget" name="TextFileTab" >
+      <attribute name="title" >
+       <string>Text File</string>
+      </attribute>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="SongExportButtonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>SongExportButtonBox</tabstop>
+  <tabstop>AvailableListWidget</tabstop>
+  <tabstop>AvailableAllToolButton</tabstop>
+  <tabstop>SelectToolButton</tabstop>
+  <tabstop>DeselectToolButton</tabstop>
+  <tabstop>SelectedListWidget</tabstop>
+  <tabstop>SelectedAllToolButton</tabstop>
+  <tabstop>ExportTabWidget</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../images/openlp-2.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>SongExportButtonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>SongExportDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>SongExportButtonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>SongExportDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>