diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index 3a41d1b662..7b7489c404 100644
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -64,11 +64,7 @@ using namespace Gtk;
 void
 Editor::export_audio ()
 {
-	if (1) {
-	WavesExportDialog export_dialog (_("Export"), _session, ExportProfileManager::RegularExport);
-	export_dialog.run();
-	}
-	ExportDialog dialog (*this, _("Export"), ExportProfileManager::RegularExport);
+	WavesExportDialog dialog (*this, _("Export"), ExportProfileManager::RegularExport);
 	dialog.set_session (_session);
 	dialog.run();
 }
diff --git a/gtk2_ardour/ui/waves_export_dialog.xml b/gtk2_ardour/ui/waves_export_dialog.xml
index 11053def46..1338e8e36c 100644
--- a/gtk2_ardour/ui/waves_export_dialog.xml
+++ b/gtk2_ardour/ui/waves_export_dialog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Dialog title="Tracks Live" resizeable="False" CACHEIT="false">
+<Dialog title="Tracks Live" CACHEIT="false">
   <style name="generic_control"
          winfont ="Arial Bold 12"
          macfont ="Helvetica Bold 12"
@@ -9,7 +9,7 @@
          bgactive="#454545"
          fghover="#CCCCCC"
          bghover="#898989"/>
-  
+
   <style name="generic_button"
          style="generic_control"
          winfont ="Arial Bold 12"
@@ -20,164 +20,56 @@
          width="80"
          height="22"/>
 
-  <style name="generic_dropdown"
-         style="generic_button"
-         fgnormal="#EDECE8"
-         normalicon="added_track_format_dropdown_active"
-         activeicon="added_track_format_dropdown_active"
-         _prelighticon="added_track_format_dropdown_prelight"
-         inactiveicon="added_track_format_dropdown_inactive"
-         width="110"
-         height="21"/>
-
-  <style name="generic_dropdown_label"
-         style="generic_button"
-         fgnormal="#EDECE8"
-         horzalignment="center"
-         width="88"/>
-  
-  <EventBox bgnormal="#EDECE8">
-    <VBox borderwidth="10"
-          spacing="10">
-      <Label style="generic_control"
-             text="Export content of selected tracks as new file"/>
-      <Label style="generic_control"
-             text="Lossless Export:"
-             horzalignment="start"
-             vertalignment="bottom"
-             winfont ="Arial Bold 14"
-             macfont ="Helvetica Bold 14"/>
-      <HBox spacing="21">
-        <VBox>
+  <EventBox bgnormal="#EDECE8"
+            box.pack="end">
+    <VBox>
+      <VBox>
+        <HBox spacing="1">
+          <Button id="file_format_selector_button"
+                  style="generic_button"
+                  text="File Format"/>
+          <Button id="timespan_selector_button"
+                  style="generic_button"
+                  text="Time Span"/>
+          <Button id="channel_selector_button"
+                  style="generic_button"
+                  text="Channels"/>
+        </HBox>
+        <EventBox id="selectors_home"
+                  bgnormal="#EDECE8"
+                  width="652"
+                  height="232">
+          <VBox id="file_format_selector">
+            <HBox id="preset_selector_home" ui.orphan="true"/>
+            <HBox id="file_notebook_home"/>
+          </VBox>
+          <VBox id="timespan_selector_home"/>
+          <VBox id="channel_selector_home"/>
+        </EventBox>
+      </VBox>
+      <HBox id="warning_widget">
+        <Label id="warn_label"
+               style="generic_control"
+               usemarkup="true"
+               box.fill="true"
+               box.expand="true"
+               fgnormal="#E2974B"/>
+        <HBox id="list_files_widget">
+          <Button id="list_files_button"
+                  style="generic_button"
+                  box.pack="end"
+                  text="List Files"/>
           <Label style="generic_control"
-                 text="Format"
-                 horzalignment="start"/>
-          <Dropdown id="lossless_format_dropdown"
-                    style="generic_dropdown">
-            <HBox>
-              <Label style="generic_dropdown_label"/>
-            </HBox>
-            <DropdownMenu bgnormal="#454545">
-              <DropdownItem title="None"/>
-              <DropdownItem title="Wave"/>
-              <DropdownItem title="AIFF"/>
-              <DropdownItem title="AAC"/>
-              <DropdownItem title="CAF"/>
-              <DropdownItem title="FLAC"/>
-            </DropdownMenu>
-          </Dropdown>
-        </VBox>
-        <VBox>
-          <Label style="generic_control"
-                 text="Depth"
-                 horzalignment="start"/>
-          <Dropdown id="lossless_depth_dropdown"
-                    style="generic_dropdown">
-            <HBox>
-              <Label style="generic_dropdown_label"/>
-            </HBox>
-            <DropdownMenu bgnormal="#454545">
-              <DropdownItem title="None"/>
-              <DropdownItem title="16 bit"/>
-              <DropdownItem title="24 bit"/>
-            </DropdownMenu>
-          </Dropdown>
-        </VBox>
-        <VBox>
-          <Label style="generic_control"
-                 text="Sample Rate"
-                 horzalignment="start"/>
-          <Dropdown id="lossless_sample_rate_dropdown"
-                    style="generic_dropdown">
-            <HBox>
-              <Label style="generic_dropdown_label"/>
-            </HBox>
-            <DropdownMenu bgnormal="#454545">
-              <DropdownItem title="None"/>
-              <DropdownItem title="44.1 kHz"/>
-              <DropdownItem title="48 kHz"/>
-              <DropdownItem title="88.2 kHz"/>
-              <DropdownItem title="96 kHz"/>
-              <DropdownItem title="176.4 kHz"/>
-              <DropdownItem title="192 kHz"/>
-            </DropdownMenu>
-          </Dropdown>
-        </VBox>
-        <VBox>
-          <Label style="generic_control"
-                 text="Dither"
-                 horzalignment="start"/>
-          <Dropdown id="lossless_dither_dropdown"
-                    style="generic_dropdown">
-            <HBox>
-              <Label style="generic_dropdown_label"/>
-            </HBox>
-            <DropdownMenu bgnormal="#454545">
-              <DropdownItem title="None"/>
-              <DropdownItem title="Type1"/>
-              <DropdownItem title="Type2"/>
-              <DropdownItem title="Type3+Shaping"/>
-            </DropdownMenu>
-          </Dropdown>
-        </VBox>
-        <VBox>
-          <Label style="generic_control"
-                 text="Normalize"
-                 horzalignment="start"/>
-          <Iconbutton id="lossless_normalize_button"
-                      width="20"
-                      height="20"
-                      normalicon="waves_darker_check_box"
-                      activeicon="waves_darker_check_box_active"
-                      toggleable="true"/>
-        </VBox>
-      </HBox>
-      <Label style="generic_control"
-             text="Lossy Export:"
-             height="40"
-             horzalignment="start"
-             vertalignment="bottom"
-             winfont ="Arial Bold 14"
-             macfont ="Helvetica Bold 14"/>
-      <HBox spacing="21">
-        <VBox>
-          <Label style="generic_control"
-                 text="Format"
-                 horzalignment="start"/>
-          <Dropdown id="lossy_format_dropdown"
-                    style="generic_dropdown">
-            <HBox>
-              <Label style="generic_dropdown_label"/>
-            </HBox>
-            <DropdownMenu bgnormal="#454545">
-              <DropdownItem title="None"/>
-              <DropdownItem title="MP3"/>
-              <DropdownItem title="AAC"/>
-              <DropdownItem title="OGG Forbis"/>
-            </DropdownMenu>
-          </Dropdown>
-        </VBox>
-        <VBox>
-          <Label style="generic_control"
-                 text="Bit Rate"
-                 horzalignment="start"/>
-          <Dropdown id="lossy_bit_rate_dropdown"
-                    style="generic_dropdown">
-            <HBox>
-              <Label style="generic_dropdown_label"/>
-            </HBox>
-            <DropdownMenu bgnormal="#454545">
-              <DropdownItem title="None"/>
-              <DropdownItem title="96 kbps"/>
-              <DropdownItem title="128 kbps"/>
-              <DropdownItem title="160 kbps"/>
-              <DropdownItem title="192 kbps"/>
-              <DropdownItem title="256 kbps"/>
-              <DropdownItem title="320 kbps"/>
-            </DropdownMenu>
-          </Dropdown>
-        </VBox>
+                 text="Some already existing files will be overwritten."
+                 box.pack="end"
+                 fgnormal="#E2974B"/>
+        </HBox>
       </HBox>
+      <VBox id="export_progress_widget">
+        <ProgressBar id="export_progress_bar"
+                     height="21"
+                     bgnormal="#6B6B6B"/>
+      </VBox>
       <HBox spacing="10">
         <Button id="cancel_button"
                 style="generic_button"
@@ -186,16 +78,14 @@
         <Button id="stop_export_button"
                 style="generic_button"
                 box.pack="end"
+                visible="false"
+                noshowall="true"
                 text="Stop Export"/>
         <Button id="export_button"
                 style="generic_button"
                 box.pack="end"
                 text="Export"/>
       </HBox>
-      <ProgressBar id="export_progress_bar"
-                   height="21"
-                   bgnormal="#6B6B6B"/>
     </VBox>
   </EventBox>
-
 </Dialog>
\ No newline at end of file
diff --git a/gtk2_ardour/ui/waves_export_preset_selector.xml b/gtk2_ardour/ui/waves_export_preset_selector.xml
new file mode 100644
index 0000000000..4849a0341a
--- /dev/null
+++ b/gtk2_ardour/ui/waves_export_preset_selector.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<HBox CACHEIT="false">
+  <style name="generic_control"
+        winfont ="Arial Bold 12"
+        macfont ="Helvetica Bold 12"
+        fgnormal="#6F6F6F"
+        bgnormal="#6C6C6C"
+        fgactive="#BFBFBF"
+        bgactive="#454545"
+        fghover="#CCCCCC"
+        bghover="#898989"/>
+
+  <style name="generic_button"
+         style="generic_control"
+         winfont ="Arial Bold 12"
+         macfont ="Helvetica Bold 12"
+         bgnormal="#CACAC5"
+         fgactive="#EDECE8"
+         bgactive="#6D6E72"
+         fgdisabled="#8D8D8D"
+         width="65"
+         height="22"/>
+  <Label style="generic_control"
+         text="Preset"/>
+  <Button id="new_button"
+          style="generic_button"
+          box.pack="end"
+          state="disabled"
+          text="New"/>
+  <Button id="remove_button"
+          style="generic_button"
+          state="disabled"
+          box.pack="end"
+          text="Remove"/>
+  <Button id="save_button"
+          style="generic_button"
+          state="disabled"
+          box.pack="end"
+          text="Save"/>
+</HBox>
diff --git a/gtk2_ardour/ui/waves_export_timespan_selector.xml b/gtk2_ardour/ui/waves_export_timespan_selector.xml
new file mode 100644
index 0000000000..3f313e0105
--- /dev/null
+++ b/gtk2_ardour/ui/waves_export_timespan_selector.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<VBox CACHEIT="false">
+  <style name="generic_control"
+         winfont="Arial Bold 10"
+         macfont="Helvetica Bold 10"
+         fgnormal="#C1C1C1"
+         bgnormal="#6C6C6C"
+         fgactive="#BFBFBF"
+         bgactive="#454545"
+         fghover="#CCCCCC"
+         bghover="#898989"
+         fgdisabled ="#959595"/>
+  <style name="generic_button"
+         style="generic_control"
+         width="80"
+         height="20"/>
+  <style name="generic_dropdown"
+         style="generic_control"
+         bgdisabled="#373737"/>
+  <style name="generic_dropdown_menu"
+         bgnormal="#6C6C6C"/>
+  <HBox>
+    <Label style="generic_control"
+           text="Show Times as:"/>
+    <Dropdown id="time_format_dropdown"
+              style="generic_control"
+              width="126"
+              height="20"
+              normalicon="preference_device_dropdown"
+              activeicon="preference_device_dropdown_active"
+              inactiveicon="preference_device_dropdown_inactive">
+      <HBox>
+        <VBox width="10"/>
+        <Label style="generic_control"
+               horzalignment="start"
+               width="117"
+               height="20"/>
+      </HBox>
+      <DropdownMenu style="generic_dropdown_menu">
+        <Dropdownitem style="generic_control"
+                      title="Timecode"
+                      data="0"
+                      horzalignment="start"/>
+        <Dropdownitem style="generic_control"
+                      title="Minutes:Seconds"
+                      data="1"
+                      horzalignment="start"/>
+        <Dropdownitem style="generic_control"
+                      title="Bars:Beats"
+                      data="2"
+                      horzalignment="start"/>
+      </DropdownMenu>
+    </Dropdown>
+    <Button id="select_all_button"
+            style="generic_button"
+            text="Select All"/>
+    <Button id="deselect_all_button"
+            style="generic_button"
+            text="Deslect All"/>
+  </HBox>
+  <ScrolledWindow id="range_scroller"
+                  height="232">
+    <TreeView id="range_view"/>
+  </ScrolledWindow>
+</VBox>
diff --git a/gtk2_ardour/waves_export_dialog.cc b/gtk2_ardour/waves_export_dialog.cc
index b2d4d45a70..90e5aa2d6f 100644
--- a/gtk2_ardour/waves_export_dialog.cc
+++ b/gtk2_ardour/waves_export_dialog.cc
@@ -1,5 +1,7 @@
 /*
+    Copyright (C) 2008 Paul Davis
     Copyright (C) 2014 Waves Audio Ltd.
+    Author: Sakari Bergen
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,17 +19,480 @@
 
 */
 
-#include "waves_export_dialog.h"
 
-WavesExportDialog::WavesExportDialog (const std::string &title, ARDOUR::Session* session, ARDOUR::ExportProfileManager::ExportType type)
-	: WavesDialog ("waves_export_dialog.xml", true, false )
-	, _export_button (get_waves_button ("export_button"))
-	, _cancel_button (get_waves_button ("cancel_button"))
-	, _stop_export_button (get_waves_button ("stop_export_button"))
-	, _export_progress_bar (get_progressbar ("export_progress_bar"))
-	, _export_type (type)
-	, _previous_progress (0)
+#include <sigc++/signal.h>
+#include <gtkmm/messagedialog.h>
+
+#include "ardour/audioregion.h"
+#include "ardour/export_status.h"
+#include "ardour/export_handler.h"
+
+#include "waves_message_dialog.h"
+#include "waves_export_dialog.h"
+#include "gui_thread.h"
+
+#include "i18n.h"
+
+using namespace ARDOUR;
+using namespace PBD;
+using std::string;
+
+WavesExportDialog::WavesExportDialog (PublicEditor & editor, std::string title, ARDOUR::ExportProfileManager::ExportType type)
+  : WavesDialog ("waves_export_dialog.xml", true, false )
+  , type (type)
+  , editor (editor)
+  , _channel_selector_button (get_waves_button ("channel_selector_button"))
+  , _export_progress_bar (get_progressbar ("export_progress_bar"))
+  , _cancel_button (get_waves_button("cancel_button"))
+  , _export_button (get_waves_button("export_button"))
+  , _stop_export_button (get_waves_button("stop_export_button"))
+  , _export_progress_widget (get_widget ("export_progress_widget"))
+  , _warning_widget (get_widget ("warning_widget"))
+  , _warn_label (get_label ("warn_label"))
+  , _list_files_widget (get_widget ("list_files_widget"))
+  , _file_format_selector_button (get_waves_button ("file_format_selector_button"))
+  , _timespan_selector_button (get_waves_button ("timespan_selector_button"))
+  , _selectors_home (get_container ("selectors_home"))
+  , _file_format_selector (get_container ("file_format_selector"))
+  , _preset_selector_home (get_container ("preset_selector_home"))
+  , _file_notebook_home (get_container ("file_notebook_home"))
+  , _timespan_selector_home (get_container ("timespan_selector_home"))
+  , _channel_selector_home (get_container ("channel_selector_home"))
 {
-	set_title (title);
-	init (session);
+}
+
+WavesExportDialog::~WavesExportDialog ()
+{ }
+
+void
+WavesExportDialog::set_session (ARDOUR::Session* s)
+{
+	SessionHandlePtr::set_session (s);
+
+	if (!_session) {
+		return;
+	}
+
+	/* Init handler and profile manager */
+
+	handler = _session->get_export_handler ();
+	status = _session->get_export_status ();
+
+	profile_manager.reset (new ExportProfileManager (*_session, type));
+
+	/* Possibly init stuff in derived classes */
+
+	init ();
+
+	/* Rest of _session related initialization */
+
+	preset_selector->set_manager (profile_manager);
+	file_notebook->set_session_and_manager (_session, profile_manager);
+
+	/* Hand on selection range to profile manager  */
+
+	TimeSelection const & time (editor.get_selection().time);
+	if (!time.empty()) {
+		profile_manager->set_selection_range (time.front().start, time.front().end);
+	} else {
+		profile_manager->set_selection_range ();
+	}
+
+	/* Load states */
+
+	profile_manager->load_profile ();
+	sync_with_manager ();
+
+	/* Warnings */
+
+	preset_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &WavesExportDialog::sync_with_manager));
+	timespan_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &WavesExportDialog::update_warnings_and_example_filename));
+	channel_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &WavesExportDialog::update_warnings_and_example_filename));
+	file_notebook->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &WavesExportDialog::update_warnings_and_example_filename));
+
+	update_warnings_and_example_filename ();
+}
+
+void
+WavesExportDialog::init ()
+{
+	init_components ();
+	init_gui ();
+
+	/* warnings */
+	get_waves_button ("list_files_button").signal_clicked.connect (sigc::mem_fun (*this, &WavesExportDialog::show_conflicting_files));
+
+	/* Buttons */
+	_file_format_selector_button.signal_clicked.connect (sigc::mem_fun (*this, &WavesExportDialog::show_file_format_selector));
+	_timespan_selector_button.signal_clicked.connect (sigc::mem_fun (*this, &WavesExportDialog::show_timespan_selector));
+	_channel_selector_button.signal_clicked.connect (sigc::mem_fun (*this, &WavesExportDialog::show_channel_selector));
+
+	_cancel_button.signal_clicked.connect (sigc::mem_fun (*this, &WavesExportDialog::close_dialog));
+	_stop_export_button.signal_clicked.connect (sigc::mem_fun (*this, &WavesExportDialog::close_dialog));
+	_export_button.signal_clicked.connect (sigc::mem_fun (*this, &WavesExportDialog::do_export));
+
+	file_notebook->soundcloud_export_selector = soundcloud_selector;
+
+	/* Done! */
+
+	show_all_children ();
+	_export_progress_widget.hide_all();
+}
+
+void
+WavesExportDialog::init_gui ()
+{
+	_preset_selector_home.add (*preset_selector);
+	_file_notebook_home.add (*file_notebook);
+	_timespan_selector_home.add (*timespan_selector);
+	_channel_selector_home.add (*channel_selector);
+
+	show_file_format_selector (&_file_format_selector_button);
+}
+
+void
+WavesExportDialog::init_components ()
+{
+	preset_selector.reset (new WavesExportPresetSelector ());
+	timespan_selector.reset (new WavesExportTimespanSelectorMultiple (_session, profile_manager));
+	channel_selector.reset (new PortExportChannelSelector (_session, profile_manager));
+	soundcloud_selector.reset (new SoundcloudExportSelector ());
+	file_notebook.reset (new WavesExportFileNotebook ());
+}
+
+void
+WavesExportDialog::notify_errors (bool force)
+{
+	if (force || status->errors()) {
+		std::string txt = _("Export has been aborted due to an error!\nSee the Log for details.");
+		WavesMessageDialog msg ("", txt);
+		msg.run();
+	}
+}
+
+void
+WavesExportDialog::close_dialog (WavesButton*)
+{
+	if (status->running) {
+		status->abort();
+	}
+
+	response (Gtk::RESPONSE_CANCEL);
+}
+
+void
+WavesExportDialog::sync_with_manager ()
+{
+	timespan_selector->sync_with_manager();
+	channel_selector->sync_with_manager();
+	file_notebook->sync_with_manager ();
+
+	update_warnings_and_example_filename ();
+}
+
+void
+WavesExportDialog::show_selector (Gtk::Widget& widget)
+{
+	if (!widget.get_parent ()) {
+		_selectors_home.add (widget);
+		widget.show_all ();
+		std::cout << "WavesExportDialog::show_selector (Gtk::Widget& widget) -- ADDED" << std::endl;
+	} else {
+		std::cout << "WavesExportDialog::show_selector (Gtk::Widget& widget) -- DID NOT ADD" << std::endl;
+	}
+}
+
+void
+WavesExportDialog::hide_selector (Gtk::Widget& widget)
+{
+	if (widget.get_parent () == &_selectors_home) {
+		_selectors_home.remove (widget);
+		std::cout << "WavesExportDialog::hide_selector (Gtk::Widget& widget) -- REMOVED" << std::endl;
+	} else {
+		std::cout << "WavesExportDialog::hide_selector (Gtk::Widget& widget) -- DID NOT REMOVE" << std::endl;
+	}
+}
+
+void
+WavesExportDialog::show_file_format_selector (WavesButton*)
+{
+	_timespan_selector_button.set_active_state (Gtkmm2ext::Off);
+	_channel_selector_button.set_active_state (Gtkmm2ext::Off);
+	_file_format_selector_button.set_active_state (Gtkmm2ext::ExplicitActive);
+
+	hide_selector (_timespan_selector_home);
+	hide_selector (_channel_selector_home);
+	show_selector(_file_format_selector);
+}
+
+void
+WavesExportDialog::show_timespan_selector (WavesButton*)
+{
+	_file_format_selector_button.set_active_state (Gtkmm2ext::Off);
+	_channel_selector_button.set_active_state (Gtkmm2ext::Off);
+	_timespan_selector_button.set_active_state (Gtkmm2ext::ExplicitActive);
+
+	hide_selector(_file_format_selector);
+	hide_selector (_channel_selector_home);
+	show_selector (_timespan_selector_home);
+}
+
+void
+WavesExportDialog::show_channel_selector (WavesButton*)
+{
+	_file_format_selector_button.set_active_state (Gtkmm2ext::Off);
+	_timespan_selector_button.set_active_state (Gtkmm2ext::Off);
+	_channel_selector_button.set_active_state (Gtkmm2ext::ExplicitActive);
+
+	hide_selector(_file_format_selector);
+	hide_selector (_timespan_selector_home);
+	show_selector (_channel_selector_home);
+}
+
+void
+WavesExportDialog::update_warnings_and_example_filename ()
+{
+	/* Reset state */
+
+	warn_string = "";
+	_warn_label.set_text (warn_string);
+
+	_list_files_widget.hide ();
+	list_files_string = "";
+
+	_export_button.set_sensitive (true);
+
+	/* Add new warnings */
+
+	boost::shared_ptr<ExportProfileManager::Warnings> warnings = profile_manager->get_warnings();
+
+	for (std::list<string>::iterator it = warnings->errors.begin(); it != warnings->errors.end(); ++it) {
+		add_error (*it);
+	}
+
+	for (std::list<string>::iterator it = warnings->warnings.begin(); it != warnings->warnings.end(); ++it) {
+		add_warning (*it);
+	}
+
+	if (!warnings->conflicting_filenames.empty()) {
+		_list_files_widget.show ();
+		for (std::list<string>::iterator it = warnings->conflicting_filenames.begin(); it != warnings->conflicting_filenames.end(); ++it) {
+			string::size_type pos = it->find_last_of ("/");
+			list_files_string += it->substr (0, pos + 1) + "<b>" + it->substr (pos + 1) + "</b>\n";
+		}
+	}
+
+	/* Update example filename */
+
+	file_notebook->update_example_filenames();
+}
+
+void
+WavesExportDialog::show_conflicting_files (WavesButton*)
+{
+	ArdourDialog dialog (_("Files that will be overwritten"), true);
+
+	Gtk::Label label ("", Gtk::ALIGN_LEFT);
+	label.set_use_markup (true);
+	label.set_markup (list_files_string);
+
+	dialog.get_vbox()->pack_start (label);
+	dialog.add_button ("OK", 0);
+	dialog.show_all_children ();
+
+	dialog.run();
+}
+
+void
+WavesExportDialog::soundcloud_upload_progress(double total, double now, std::string title)
+{
+	soundcloud_selector->do_progress_callback(total, now, title);
+}
+
+void
+WavesExportDialog::do_export (WavesButton*)
+{
+	try {
+		profile_manager->prepare_for_export ();
+		handler->soundcloud_username     = soundcloud_selector->username ();
+		handler->soundcloud_password     = soundcloud_selector->password ();
+		handler->soundcloud_make_public  = soundcloud_selector->make_public ();
+		handler->soundcloud_open_page    = soundcloud_selector->open_page ();
+		handler->soundcloud_downloadable = soundcloud_selector->downloadable ();
+
+		handler->SoundcloudProgress.connect_same_thread(
+				*this, 
+				boost::bind(&WavesExportDialog::soundcloud_upload_progress, this, _1, _2, _3)
+				);
+#if 0
+                handler->SoundcloudProgress.connect(
+                        *this, invalidator (*this),
+                        boost::bind(&WavesExportDialog::soundcloud_upload_progress, this, _1, _2, _3),
+                        gui_context()
+                        );
+#endif
+                handler->do_export ();
+                show_progress ();
+        } catch(std::exception & e) {
+                error << string_compose (_("Export initialization failed: %1"), e.what()) << endmsg;
+                notify_errors(true);
+        }
+}
+
+void
+WavesExportDialog::show_progress ()
+{
+	status->running = true;
+
+	_cancel_button.hide ();
+	_export_button.hide ();
+	_stop_export_button.show ();
+
+	_export_progress_bar.set_fraction (0.0);
+	_warning_widget.hide_all();
+	_export_progress_widget.show_all ();
+	progress_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &WavesExportDialog::progress_timeout), 100);
+
+	gtk_main_iteration ();
+
+	while (status->running) {
+		if (gtk_events_pending()) {
+			gtk_main_iteration ();
+		} else {
+			Glib::usleep (10000);
+		}
+	}
+
+	bool aborted = status->aborted();
+	if (aborted) {
+		notify_errors ();
+	}
+
+	status->finish ();
+	if (!aborted) {
+		response (Gtk::RESPONSE_OK);
+	}
+}
+
+gint
+WavesExportDialog::progress_timeout ()
+{
+	std::string status_text;
+	float progress = 0.0;
+	if (status->normalizing) {
+		status_text = string_compose (_("Normalizing '%3' (timespan %1 of %2)"),
+		                              status->timespan, status->total_timespans, status->timespan_name);
+		progress = ((float) status->current_normalize_cycle) / status->total_normalize_cycles;
+	} else {
+		status_text = string_compose (_("Exporting '%3' (timespan %1 of %2)"),
+		                              status->timespan, status->total_timespans, status->timespan_name);
+		progress = ((float) status->processed_frames_current_timespan) / status->total_frames_current_timespan;
+	}
+	_export_progress_bar.set_text (status_text);
+
+	if (progress < previous_progress) {
+		// Work around gtk bug
+		_export_progress_bar.hide();
+		_export_progress_bar.show();
+	}
+	previous_progress = progress;
+
+	_export_progress_bar.set_fraction (progress);
+	return TRUE;
+}
+
+void
+WavesExportDialog::add_error (string const & text)
+{
+	_export_button.set_sensitive (false);
+
+	if (warn_string.empty()) {
+		warn_string = _("Error: ") + text;
+	} else {
+		warn_string = _("Error: ") + text + "\n" + warn_string;
+	}
+
+	_warn_label.set_text (warn_string);
+}
+
+void
+WavesExportDialog::add_warning (string const & text)
+{
+	if (!warn_string.empty()) {
+		warn_string += "\n";
+	}
+	warn_string += _("\nWarning: ") + text;
+	_warn_label.set_text (warn_string);
+}
+
+/*** Dialog specializations ***/
+
+WavesExportRangeDialog::WavesExportRangeDialog (PublicEditor & editor, string range_id) :
+  WavesExportDialog (editor, _("Export Range"), ExportProfileManager::RangeExport),
+  range_id (range_id)
+{}
+
+void
+WavesExportRangeDialog::init_components ()
+{
+	preset_selector.reset (new WavesExportPresetSelector ());
+	timespan_selector.reset (new WavesExportTimespanSelectorSingle (_session, profile_manager, range_id));
+	channel_selector.reset (new PortExportChannelSelector (_session, profile_manager));
+	soundcloud_selector.reset (new SoundcloudExportSelector ());
+	file_notebook.reset (new WavesExportFileNotebook ());
+}
+
+WavesExportSelectionDialog::WavesExportSelectionDialog (PublicEditor & editor) :
+  WavesExportDialog (editor, _("Export Selection"), ExportProfileManager::SelectionExport)
+{}
+
+void
+WavesExportSelectionDialog::init_components ()
+{
+	preset_selector.reset (new WavesExportPresetSelector ());
+	timespan_selector.reset (new WavesExportTimespanSelectorSingle (_session, profile_manager, X_("selection")));
+	channel_selector.reset (new PortExportChannelSelector (_session, profile_manager));
+	soundcloud_selector.reset (new SoundcloudExportSelector ());
+	file_notebook.reset (new WavesExportFileNotebook ());
+}
+
+WavesExportRegionDialog::WavesExportRegionDialog (PublicEditor & editor, ARDOUR::AudioRegion const & region, ARDOUR::AudioTrack & track) :
+  WavesExportDialog (editor, _("Export Region"), ExportProfileManager::RegionExport),
+  region (region),
+  track (track)
+{}
+
+void
+WavesExportRegionDialog::init_gui ()
+{
+	WavesExportDialog::init_gui ();
+	_channel_selector_button.set_text ("Source"); //export_notebook.set_tab_label_text(*export_notebook.get_nth_page(2), _("Source"));
+}
+
+void
+WavesExportRegionDialog::init_components ()
+{
+	string loc_id = profile_manager->set_single_range (region.position(), region.position() + region.length(), region.name());
+
+	preset_selector.reset (new WavesExportPresetSelector ());
+	timespan_selector.reset (new WavesExportTimespanSelectorSingle (_session, profile_manager, loc_id));
+	channel_selector.reset (new RegionExportChannelSelector (_session, profile_manager, region, track));
+	soundcloud_selector.reset (new SoundcloudExportSelector ());
+	file_notebook.reset (new WavesExportFileNotebook ());
+}
+
+WavesStemExportDialog::WavesStemExportDialog (PublicEditor & editor)
+  : WavesExportDialog(editor, _("Stem Export"), ExportProfileManager::StemExport)
+{
+
+}
+
+void
+WavesStemExportDialog::init_components ()
+{
+	preset_selector.reset (new WavesExportPresetSelector ());
+	timespan_selector.reset (new WavesExportTimespanSelectorMultiple (_session, profile_manager));
+	channel_selector.reset (new TrackExportChannelSelector (_session, profile_manager));
+	soundcloud_selector.reset (new SoundcloudExportSelector ());
+	file_notebook.reset (new WavesExportFileNotebook ());
 }
diff --git a/gtk2_ardour/waves_export_dialog.h b/gtk2_ardour/waves_export_dialog.h
index 31f8ad8d01..e3b8778a79 100644
--- a/gtk2_ardour/waves_export_dialog.h
+++ b/gtk2_ardour/waves_export_dialog.h
@@ -1,5 +1,7 @@
 /*
-    Copyright (C) 2014 Waves Audio Ltd.
+    Copyright (C) 2008 Paul Davis
+    Copyright (C) 2015 Waves Audio Ltd.
+    Author: Sakari Bergen
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,23 +22,173 @@
 #ifndef __waves_export_dialog_h__
 #define __waves_export_dialog_h__
 
+#include <boost/scoped_ptr.hpp>
+#include <string>
+
 #include "ardour/export_profile_manager.h"
 
+#include "public_editor.h"
+#include "waves_export_timespan_selector.h"
+#include "export_channel_selector.h"
+#include "waves_export_file_notebook.h"
+#include "waves_export_preset_selector.h"
 #include "waves_dialog.h"
+#include "soundcloud_export_selector.h"
 
-class WavesExportDialog : public WavesDialog
+#include <gtkmm.h>
+
+namespace ARDOUR {
+	class ExportStatus;
+	class ExportHandler;
+}
+
+class ExportChannelSelector;
+
+class WavesExportDialog : public WavesDialog, public PBD::ScopedConnectionList 
 {
-public:
-	WavesExportDialog(const std::string &title, ARDOUR::Session* session, ARDOUR::ExportProfileManager::ExportType type);
 
-protected:
-	WavesButton& _export_button;
+  public:
+
+	WavesExportDialog (PublicEditor & editor, std::string title, ARDOUR::ExportProfileManager::ExportType type);
+	~WavesExportDialog ();
+
+	void set_session (ARDOUR::Session* s);
+
+	/* Responses */
+
+	enum Responses {
+		RESPONSE_RT,
+		RESPONSE_FAST,
+		RESPONSE_CANCEL
+	};
+
+  protected:
+
+	typedef boost::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
+	typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
+
+	ARDOUR::ExportProfileManager::ExportType type;
+	HandlerPtr      handler;
+	ManagerPtr      profile_manager;
+
+	// initializes GUI layout
+	virtual void init_gui ();
+
+	// Must initialize all the shared_ptrs below
+	virtual void init_components ();
+
+	boost::scoped_ptr<WavesExportPresetSelector>   preset_selector;
+	boost::scoped_ptr<WavesExportTimespanSelector> timespan_selector;
+	boost::scoped_ptr<ExportChannelSelector>  channel_selector;
+	boost::scoped_ptr<WavesExportFileNotebook>     file_notebook;
+
+	boost::shared_ptr<SoundcloudExportSelector> soundcloud_selector;
+
+	/*** GUI components ***/
+    WavesButton& _channel_selector_button;
+
+  private:
+
+	void init ();
+	void notify_errors (bool force = false);
+	void close_dialog (WavesButton*);
+	void show_file_format_selector (WavesButton*);
+	void show_selector (Gtk::Widget&);
+	void hide_selector (Gtk::Widget&);
+	void show_timespan_selector (WavesButton*);
+	void show_channel_selector (WavesButton*);
+
+	void sync_with_manager ();
+	void update_warnings_and_example_filename ();
+	void show_conflicting_files (WavesButton*);
+
+	void do_export (WavesButton*);
+
+	void show_progress ();
+	gint progress_timeout ();
+
+
+	typedef boost::shared_ptr<ARDOUR::ExportStatus> StatusPtr;
+
+	PublicEditor &  editor;
+	StatusPtr       status;
+
+	/* Warning area */
+
+	std::string       warn_string;
+	std::string       list_files_string;
+
+	void add_error (std::string const & text);
+	void add_warning (std::string const & text);
+
+	/* Progress bar */
+
+	Gtk::ProgressBar&       _export_progress_bar;
+	sigc::connection        progress_connection;
+
+	float previous_progress; // Needed for gtk bug workaround
+
+	void soundcloud_upload_progress(double total, double now, std::string title);
+
+	/* Buttons */
+
 	WavesButton& _cancel_button;
+	WavesButton& _export_button;
 	WavesButton& _stop_export_button;
-	Gtk::ProgressBar &_export_progress_bar;
-   
-private:
-	#include "waves_export_dialog.logic.h"
+	Gtk::Widget& _export_progress_widget;
+	Gtk::Widget& _warning_widget;
+	Gtk::Label&  _warn_label;
+	Gtk::Widget& _list_files_widget;
+    WavesButton& _file_format_selector_button;
+    WavesButton& _timespan_selector_button;
+	Gtk::Container& _selectors_home;
+	Gtk::Container& _file_format_selector;
+	Gtk::Container& _preset_selector_home;
+	Gtk::Container& _file_notebook_home;
+	Gtk::Container& _timespan_selector_home;
+	Gtk::Container& _channel_selector_home;
+};
+
+class WavesExportRangeDialog : public WavesExportDialog
+{
+  public:
+	WavesExportRangeDialog (PublicEditor & editor, std::string range_id);
+
+  private:
+	void init_components ();
+
+	std::string range_id;
+};
+
+class WavesExportSelectionDialog : public WavesExportDialog
+{
+  public:
+	WavesExportSelectionDialog (PublicEditor & editor);
+
+  private:
+	void init_components ();
+};
+
+class WavesExportRegionDialog : public WavesExportDialog
+{
+  public:
+	WavesExportRegionDialog (PublicEditor & editor, ARDOUR::AudioRegion const & region, ARDOUR::AudioTrack & track);
+
+  private:
+	void init_gui ();
+	void init_components ();
+
+	ARDOUR::AudioRegion const & region;
+	ARDOUR::AudioTrack & track;
+};
+
+class WavesStemExportDialog : public WavesExportDialog
+{
+  public:
+	WavesStemExportDialog (PublicEditor & editor);
+
+  private:
+	void init_components ();
 };
 
 #endif /* __waves_export_dialog_h__ */
diff --git a/gtk2_ardour/waves_export_dialog.logic.cc b/gtk2_ardour/waves_export_dialog.logic.cc
deleted file mode 100644
index 22b622824f..0000000000
--- a/gtk2_ardour/waves_export_dialog.logic.cc
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-    Copyright (C) 2014 Waves Audio Ltd.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include "ardour/audioregion.h"
-#include "ardour/export_status.h"
-#include "ardour/export_handler.h"
-#include "waves_export_dialog.h"
-#include "public_editor.h"
-#include "ardour_ui.h"
-#include "time_selection.h"
-#include "i18n.h"
-
-void
-WavesExportDialog::init (ARDOUR::Session* session)
-{
-    _export_button.signal_clicked.connect (sigc::mem_fun (*this, &WavesExportDialog::_on_export_button_clicked));
-    _cancel_button.signal_clicked.connect (sigc::mem_fun (*this, &WavesExportDialog::_on_cancel_button_clicked));
-
-	SessionHandlePtr::set_session (session);
-	if (!_session) {
-		return;
-	}
-	/* Init handler and profile manager */
-	_export_handler = _session->get_export_handler ();
-	_export_status = _session->get_export_status ();
-
-	_profile_manager.reset (new ARDOUR::ExportProfileManager (*_session, _export_type));
-
-	TimeSelection const & time (ARDOUR_UI::instance()->the_editor ().get_selection().time);
-	if (!time.empty()) {
-		_profile_manager->set_selection_range (time.front().start, time.front().end);
-	} else {
-		_profile_manager->set_selection_range ();
-	}
-
-	/* Load states */
-    
-	_profile_manager->load_profile ();
-
-}
-
-void
-WavesExportDialog::_show_progress ()
-{
-	_export_status->running = true;
-
-	_cancel_button.hide ();
-	_stop_export_button.show ();
-
-	_export_progress_bar.set_fraction (0.0);
-	_export_progress_bar.show ();
-	_progress_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &WavesExportDialog::_on_progress_timeout), 100);
-
-	gtk_main_iteration ();
-
-	while (_export_status->running) {
-		if (gtk_events_pending()) {
-			gtk_main_iteration ();
-		} else {
-			Glib::usleep (10000);
-		}
-	}
-
-	if (_export_status->aborted()) {
-		_notify_errors ();
-	}
-
-	_export_status->finish ();
-}
-
-void
-WavesExportDialog::_notify_errors (bool force)
-{
-	if (force || _export_status->errors()) {
-		std::string txt = _("Export has been aborted due to an error!\nSee the Log for details.");
-		WavesMessageDialog msg ("", txt);
-		msg.run();
-	}
-}
-
-void
-WavesExportDialog::_on_export_button_clicked (WavesButton*)
-{
-	_export_error.clear ();
-	_previous_progress = 0;
-	try {
-		_profile_manager->prepare_for_export ();
-		_export_handler->soundcloud_make_public  = false;
-		_export_handler->soundcloud_open_page    = false;
-		_export_handler->soundcloud_downloadable = false;
-
-        _export_handler->do_export ();
-        _show_progress ();
-    } catch(std::exception & e) {
-        _export_error << string_compose (_("Export initialization failed: %1"), e.what()) << endmsg;
-        _notify_errors(true);
-    }
-}
-
-void
-WavesExportDialog::_on_cancel_button_clicked (WavesButton*)
-{
-	if (_export_status->running) {
-		_export_status->abort();
-	}
-
-	hide ();
-	set_modal (false);
-	response (Gtk::RESPONSE_CANCEL);
-}
-
-gint
-WavesExportDialog::_on_progress_timeout ()
-{
-	std::string status_text;
-	float progress = 0.0;
-
-	if (_export_status->normalizing) {
-		status_text = string_compose (_("Normalizing '%3' (timespan %1 of %2)"),
-		                              _export_status->timespan, _export_status->total_timespans, _export_status->timespan_name);
-		progress = ((float) _export_status->current_normalize_cycle) / _export_status->total_normalize_cycles;
-	} else {
-		status_text = string_compose (_("Exporting '%3' (timespan %1 of %2)"),
-		                              _export_status->timespan, _export_status->total_timespans, _export_status->timespan_name);
-		progress = ((float) _export_status->processed_frames_current_timespan) / _export_status->total_frames_current_timespan;
-	}
-
-	_export_progress_bar.set_text (status_text);
-
-	if (progress < _previous_progress) {
-		// Work around gtk bug
-		_export_progress_bar.hide();
-		_export_progress_bar.show();
-	}
-
-	_previous_progress = progress;
-
-	_export_progress_bar.set_fraction (progress);
-	return TRUE;
-}
diff --git a/gtk2_ardour/waves_export_dialog.logic.h b/gtk2_ardour/waves_export_dialog.logic.h
deleted file mode 100644
index 83f7ef5431..0000000000
--- a/gtk2_ardour/waves_export_dialog.logic.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-    Copyright (C) 2014 Waves Audio Ltd.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-//class WavesExportDialog : public WavesDialog
-//{
-protected:
-
-	typedef boost::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
-	HandlerPtr _export_handler;
-
-	typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
-	ManagerPtr _profile_manager;
-
-	typedef boost::shared_ptr<ARDOUR::ExportStatus> StatusPtr;
-	StatusPtr _export_status;
-
-	ARDOUR::ExportProfileManager::ExportType _export_type;
-	sigc::connection _progress_connection;
-	std::stringstream _export_error;
-	float _previous_progress; // Needed for gtk bug workaround.
-
-
-	void init (ARDOUR::Session* session);
-	void _show_progress ();
-	void _notify_errors (bool force = false);
-	void _on_export_button_clicked (WavesButton*);
-	void _on_cancel_button_clicked (WavesButton*);
-	gint _on_progress_timeout ();
-
-
-//};
diff --git a/gtk2_ardour/waves_export_file_notebook.cc b/gtk2_ardour/waves_export_file_notebook.cc
new file mode 100644
index 0000000000..ac72895c4e
--- /dev/null
+++ b/gtk2_ardour/waves_export_file_notebook.cc
@@ -0,0 +1,321 @@
+/*
+    Copyright (C) 2008 Paul Davis
+    Copyright (C) 2014 Waves Audio Ltd.
+    Author: Sakari Bergen
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "waves_export_file_notebook.h"
+
+#include "ardour/export_format_specification.h"
+
+#include "gui_thread.h"
+#include "utils.h"
+#include "i18n.h"
+
+using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
+using namespace PBD;
+
+WavesExportFileNotebook::WavesExportFileNotebook () :
+  page_counter (1)
+{
+	/* Last page */
+
+	new_file_button.set_image (*Gtk::manage (new Gtk::Image (::get_icon("add"))));
+	new_file_button.set_label (_("Add another format"));
+	new_file_button.set_alignment (0, 0.5);
+	new_file_button.set_relief (Gtk::RELIEF_NONE);
+
+	new_file_hbox.pack_start (new_file_button, true, true);
+	append_page (new_file_dummy, new_file_hbox);
+	set_tab_label_packing (new_file_dummy, true, true, Gtk::PACK_START);
+	new_file_hbox.show_all_children ();
+
+	page_change_connection = signal_switch_page().connect (sigc::mem_fun (*this, &WavesExportFileNotebook::handle_page_change));
+	new_file_button.signal_clicked().connect (sigc::mem_fun (*this, &WavesExportFileNotebook::add_new_file_page));
+}
+
+void
+WavesExportFileNotebook::set_session_and_manager (ARDOUR::Session * s, boost::shared_ptr<ARDOUR::ExportProfileManager> manager)
+{
+	SessionHandlePtr::set_session (s);
+	profile_manager = manager;
+
+	sync_with_manager ();
+}
+
+void
+WavesExportFileNotebook::sync_with_manager ()
+{
+	/* Clear pages from notebook
+	   The page switch handling has to be disabled during removing all pages due to a gtk bug
+	 */
+
+	page_change_connection.block();
+	while (get_n_pages() > 1) {
+		remove_page (0);
+	}
+	page_change_connection.block(false);
+
+	page_counter = 1;
+	last_visible_page = 0;
+
+	/* File notebook */
+
+	ExportProfileManager::FormatStateList const & formats = profile_manager->get_formats ();
+	ExportProfileManager::FormatStateList::const_iterator format_it;
+	ExportProfileManager::FilenameStateList const & filenames = profile_manager->get_filenames ();
+	ExportProfileManager::FilenameStateList::const_iterator filename_it;
+	for (format_it = formats.begin(), filename_it = filenames.begin();
+	     format_it != formats.end() && filename_it != filenames.end();
+	     ++format_it, ++filename_it) {
+		add_file_page (*format_it, *filename_it);
+	}
+
+	set_current_page (0);
+	update_soundcloud_upload ();
+	CriticalSelectionChanged ();
+}
+
+void
+WavesExportFileNotebook::update_soundcloud_upload ()
+{
+	int i;
+	bool show_credentials_entry = false;
+	ExportProfileManager::FormatStateList const & formats = profile_manager->get_formats ();
+	ExportProfileManager::FormatStateList::const_iterator format_it;
+
+	for (i = 0, format_it = formats.begin(); format_it != formats.end(); ++i, ++format_it) {
+		FilePage * page;
+		if ((page = dynamic_cast<FilePage *> (get_nth_page (i)))) {
+			bool this_soundcloud_upload = page->get_soundcloud_upload ();
+			(*format_it)->format->set_soundcloud_upload (this_soundcloud_upload);
+			if (this_soundcloud_upload) {
+				show_credentials_entry  = true;
+			}
+		}
+	}
+
+	soundcloud_export_selector->set_visible (show_credentials_entry);
+
+}
+
+void
+WavesExportFileNotebook::update_example_filenames ()
+{
+	int i = 0;
+	FilePage * page;
+	while ((page = dynamic_cast<FilePage *> (get_nth_page (i++)))) {
+		page->update_example_filename();
+	}
+}
+
+void
+WavesExportFileNotebook::add_new_file_page ()
+{
+	FilePage * page;
+	if ((page = dynamic_cast<FilePage *> (get_nth_page (get_current_page())))) {
+		add_file_page (profile_manager->duplicate_format_state (page->get_format_state()),
+		               profile_manager->duplicate_filename_state (page->get_filename_state()));
+	}
+}
+
+void
+WavesExportFileNotebook::add_file_page (ARDOUR::ExportProfileManager::FormatStatePtr format_state, ARDOUR::ExportProfileManager::FilenameStatePtr filename_state)
+{
+	FilePage * page = Gtk::manage (new FilePage (_session, profile_manager, this, page_counter, format_state, filename_state));
+	page->CriticalSelectionChanged.connect (CriticalSelectionChanged.make_slot());
+	insert_page (*page, page->get_tab_widget(), get_n_pages() - 1);
+
+	update_remove_file_page_sensitivity ();
+	show_all_children();
+	++page_counter;
+
+	CriticalSelectionChanged ();
+}
+
+void
+WavesExportFileNotebook::remove_file_page (FilePage * page)
+{
+	profile_manager->remove_format_state (page->get_format_state());
+	profile_manager->remove_filename_state (page->get_filename_state());
+
+	remove_page (*page);
+	update_remove_file_page_sensitivity ();
+
+	CriticalSelectionChanged ();
+}
+
+void
+WavesExportFileNotebook::update_remove_file_page_sensitivity ()
+{
+	FilePage * page;
+	if ((page = dynamic_cast<FilePage *> (get_nth_page (0)))) {
+		if (get_n_pages() > 2) {
+			page->set_remove_sensitive (true);
+		} else {
+			page->set_remove_sensitive (false);
+		}
+	}
+}
+
+void
+WavesExportFileNotebook::handle_page_change (GtkNotebookPage*, uint32_t page)
+{
+	if (page + 1 == (uint32_t) get_n_pages()) {
+		set_current_page (last_visible_page);
+	} else {
+		last_visible_page = page;
+	}
+}
+
+WavesExportFileNotebook::FilePage::FilePage (Session * s, ManagerPtr profile_manager, WavesExportFileNotebook * parent, uint32_t number,
+                                        ExportProfileManager::FormatStatePtr format_state,
+                                        ExportProfileManager::FilenameStatePtr filename_state) :
+  format_state (format_state),
+  filename_state (filename_state),
+  profile_manager (profile_manager),
+
+  format_label (_("Format"), Gtk::ALIGN_LEFT),
+  filename_label (_("Location"), Gtk::ALIGN_LEFT),
+  soundcloud_upload_button (_("Upload to Soundcloud")),
+  tab_number (number)
+{
+	set_border_width (12);
+
+	pack_start (format_label, false, false, 0);
+	pack_start (format_align, false, false, 0);
+	pack_start (filename_label, false, false, 0);
+	pack_start (filename_align, false, false, 0);
+//	pack_start (soundcloud_upload_button, false, false, 0);
+
+	format_align.add (format_selector);
+	format_align.set_padding (6, 12, 18, 0);
+
+	filename_align.add (filename_selector);
+	filename_align.set_padding (0, 12, 18, 0);
+
+	Pango::AttrList bold;
+	Pango::Attribute b = Pango::Attribute::create_attr_weight (Pango::WEIGHT_BOLD);
+	bold.insert (b);
+
+	format_label.set_attributes (bold);
+	filename_label.set_attributes (bold);
+	tab_label.set_attributes (bold);
+
+	/* Set states */
+	format_selector.set_state (format_state, s);
+ 	filename_selector.set_state (filename_state, s);
+
+	/* Signals */
+
+	tab_close_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*parent, &WavesExportFileNotebook::remove_file_page), this));
+
+	profile_manager->FormatListChanged.connect (format_connection, invalidator (*this), boost::bind (&ExportFormatSelector::update_format_list, &format_selector), gui_context());
+
+	format_selector.FormatEdited.connect (sigc::mem_fun (*this, &WavesExportFileNotebook::FilePage::save_format_to_manager));
+	format_selector.FormatRemoved.connect (sigc::mem_fun (*profile_manager, &ExportProfileManager::remove_format_profile));
+	format_selector.NewFormat.connect (sigc::mem_fun (*profile_manager, &ExportProfileManager::get_new_format));
+
+	format_selector.CriticalSelectionChanged.connect (
+		sigc::mem_fun (*this, &WavesExportFileNotebook::FilePage::critical_selection_changed));
+	filename_selector.CriticalSelectionChanged.connect (
+		sigc::mem_fun (*this, &WavesExportFileNotebook::FilePage::critical_selection_changed));
+
+//	soundcloud_upload_button.signal_toggled().connect (sigc::mem_fun (*parent, &WavesExportFileNotebook::update_soundcloud_upload));
+	/* Tab widget */
+
+	tab_close_button.add (*Gtk::manage (new Gtk::Image (::get_icon("close"))));
+	tab_close_alignment.add (tab_close_button);
+	tab_close_alignment.set (0.5, 0.5, 0, 0);
+
+	tab_widget.pack_start (tab_label, false, false, 3);
+	tab_widget.pack_end (tab_close_alignment, false, false, 0);
+	tab_widget.show_all_children ();
+	update_tab_label ();
+	update_example_filename();
+
+	/* Done */
+
+	show_all_children ();
+}
+
+WavesExportFileNotebook::FilePage::~FilePage ()
+{
+}
+
+void
+WavesExportFileNotebook::FilePage::set_remove_sensitive (bool value)
+{
+	tab_close_button.set_sensitive (value);
+}
+
+std::string
+WavesExportFileNotebook::FilePage::get_format_name () const
+{
+	if (format_state && format_state->format) {
+		return format_state->format->name();
+	}
+	return _("No format!");
+}
+
+bool
+WavesExportFileNotebook::FilePage::get_soundcloud_upload () const
+{
+	return 0;
+	return soundcloud_upload_button.get_active ();
+}
+
+void
+WavesExportFileNotebook::FilePage::save_format_to_manager (FormatPtr format)
+{
+	profile_manager->save_format_to_disk (format);
+}
+
+void
+WavesExportFileNotebook::FilePage::update_tab_label ()
+{
+	tab_label.set_text (string_compose (_("Format %1: %2"), tab_number, get_format_name()));
+}
+
+void
+WavesExportFileNotebook::FilePage::update_example_filename()
+{
+	if (profile_manager) {
+
+		std::string example;
+		if (format_state->format) {
+			example = profile_manager->get_sample_filename_for_format (
+				filename_state->filename, format_state->format);
+		}
+		
+		if (example != "") {
+			filename_selector.set_example_filename(Glib::path_get_basename (example));
+		} else {
+			filename_selector.set_example_filename("");
+		}
+	}
+}
+
+void
+WavesExportFileNotebook::FilePage::critical_selection_changed ()
+{
+	update_tab_label();
+	update_example_filename();
+	CriticalSelectionChanged();
+}
diff --git a/gtk2_ardour/waves_export_file_notebook.h b/gtk2_ardour/waves_export_file_notebook.h
new file mode 100644
index 0000000000..3ae1258a99
--- /dev/null
+++ b/gtk2_ardour/waves_export_file_notebook.h
@@ -0,0 +1,123 @@
+/*
+    Copyright (C) 2008 Paul Davis
+    Copyright (C) 2014 Waves Audio Ltd.
+    Author: Sakari Bergen
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __waves_export_file_notebook_h__
+#define __waves_export_file_notebook_h__
+
+#include <sigc++/signal.h>
+#include <gtkmm.h>
+
+#include "ardour/export_profile_manager.h"
+#include "ardour/session_handle.h"
+
+#include "export_format_selector.h"
+#include "export_filename_selector.h"
+#include "soundcloud_export_selector.h"
+
+class WavesExportFileNotebook : public Gtk::Notebook, public ARDOUR::SessionHandlePtr
+{
+  public:
+
+	WavesExportFileNotebook ();
+
+	void set_session_and_manager (ARDOUR::Session * s, boost::shared_ptr<ARDOUR::ExportProfileManager> manager);
+	void sync_with_manager ();
+	void update_example_filenames();
+
+	boost::shared_ptr<SoundcloudExportSelector> soundcloud_export_selector;
+
+	sigc::signal<void> CriticalSelectionChanged;
+
+  private:
+
+	typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
+	typedef boost::shared_ptr<ARDOUR::ExportFormatSpecification> FormatPtr;
+	typedef boost::shared_ptr<ARDOUR::ExportFilename> FilenamePtr;
+	class FilePage;
+
+	ManagerPtr        profile_manager;
+
+	void add_new_file_page ();
+	void add_file_page (ARDOUR::ExportProfileManager::FormatStatePtr format_state, ARDOUR::ExportProfileManager::FilenameStatePtr filename_state);
+	void remove_file_page (FilePage * page);
+	void update_remove_file_page_sensitivity ();
+	void update_soundcloud_upload ();
+
+	sigc::connection page_change_connection;
+	void handle_page_change (GtkNotebookPage*, uint32_t page);
+
+	Gtk::HBox    new_file_hbox;
+	Gtk::Button  new_file_button;
+	Gtk::VBox    new_file_dummy;
+
+	uint32_t     last_visible_page;
+	uint32_t     page_counter;
+
+	class FilePage : public Gtk::VBox {
+	  public:
+		FilePage (ARDOUR::Session * s, ManagerPtr profile_manager, WavesExportFileNotebook * parent, uint32_t number,
+		          ARDOUR::ExportProfileManager::FormatStatePtr format_state,
+		          ARDOUR::ExportProfileManager::FilenameStatePtr filename_state);
+
+		virtual ~FilePage ();
+
+		Gtk::Widget & get_tab_widget () { return tab_widget; }
+		void set_remove_sensitive (bool value);
+		std::string get_format_name () const;
+		bool get_soundcloud_upload () const;
+
+		void update_example_filename();
+
+		ARDOUR::ExportProfileManager::FormatStatePtr   get_format_state () const { return format_state; }
+		ARDOUR::ExportProfileManager::FilenameStatePtr get_filename_state () const { return filename_state; }
+
+		sigc::signal<void> CriticalSelectionChanged;
+
+	  private:
+		void save_format_to_manager (FormatPtr format);
+		void update_tab_label ();
+		void critical_selection_changed ();
+
+		ARDOUR::ExportProfileManager::FormatStatePtr   format_state;
+		ARDOUR::ExportProfileManager::FilenameStatePtr filename_state;
+		ManagerPtr                                     profile_manager;
+
+		/* GUI components */
+
+		Gtk::Label              format_label;
+		Gtk::Alignment          format_align;
+		ExportFormatSelector    format_selector;
+		PBD::ScopedConnection   format_connection;
+
+		Gtk::Label              filename_label;
+		Gtk::Alignment          filename_align;
+		ExportFilenameSelector  filename_selector;
+
+		Gtk::CheckButton	soundcloud_upload_button;
+		Gtk::HBox               tab_widget;
+		Gtk::Label              tab_label;
+		Gtk::Alignment          tab_close_alignment;
+		Gtk::Button             tab_close_button;
+		uint32_t                tab_number;
+	};
+};
+
+#endif //__waves_export_file_notebook_h__
diff --git a/gtk2_ardour/waves_export_preset_selector.cc b/gtk2_ardour/waves_export_preset_selector.cc
new file mode 100644
index 0000000000..02e8384e90
--- /dev/null
+++ b/gtk2_ardour/waves_export_preset_selector.cc
@@ -0,0 +1,162 @@
+/*
+    Copyright (C) 2008 Paul Davis
+	Copyright (C) 2015 Waves Audio Ltd.
+    Author: Sakari Bergen
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "waves_export_preset_selector.h"
+
+#include "ardour/export_preset.h"
+
+#include "i18n.h"
+
+WavesExportPresetSelector::WavesExportPresetSelector ()
+  : Gtk::HBox ()
+  , WavesUI ("waves_export_preset_selector.xml", *this)
+  , _save_button (get_waves_button ("save_button"))
+  , _remove_button (get_waves_button ("remove_button"))
+  , _new_button (get_waves_button ("new_button"))
+{
+	list = Gtk::ListStore::create (cols);
+	list->set_sort_column (cols.label, Gtk::SORT_ASCENDING);
+	entry.set_model (list);
+	entry.set_text_column (cols.label);
+
+	pack_start (entry, true, true, 6);
+
+	select_connection = entry.signal_changed().connect (sigc::mem_fun (*this, &WavesExportPresetSelector::update_selection));
+	_save_button.signal_clicked.connect (sigc::mem_fun (*this, &WavesExportPresetSelector::save_current));
+	_new_button.signal_clicked.connect (sigc::mem_fun (*this, &WavesExportPresetSelector::create_new));
+	_remove_button.signal_clicked.connect (sigc::mem_fun (*this, &WavesExportPresetSelector::remove_current));
+
+	show_all_children ();
+}
+
+void
+WavesExportPresetSelector::set_manager (boost::shared_ptr<ARDOUR::ExportProfileManager> manager)
+{
+	profile_manager = manager;
+	sync_with_manager ();
+}
+
+void
+WavesExportPresetSelector::sync_with_manager ()
+{
+	list->clear();
+
+	PresetList const & presets = profile_manager->get_presets();
+	Gtk::ListStore::iterator tree_it;
+
+	for (PresetList::const_iterator it = presets.begin(); it != presets.end(); ++it) {
+		tree_it = list->append();
+		tree_it->set_value (cols.preset, *it);
+		tree_it->set_value (cols.label, std::string ((*it)->name()));
+
+		if (*it == current) {
+			select_connection.block (true);
+			entry.set_active (tree_it);
+			select_connection.block (false);
+		}
+	}
+}
+
+void
+WavesExportPresetSelector::update_selection ()
+{
+	Gtk::ListStore::iterator it = entry.get_active ();
+	std::string text = entry.get_entry()->get_text();
+	bool preset_name_exists = false;
+
+	for (PresetList::const_iterator it = profile_manager->get_presets().begin(); it != profile_manager->get_presets().end(); ++it) {
+		if (!(*it)->name().compare (text)) {
+			preset_name_exists = true;
+		}
+	}
+
+	if (list->iter_is_valid (it)) {
+
+		previous = current = it->get_value (cols.preset);
+		if (!profile_manager->load_preset (current)) {
+			Gtk::MessageDialog dialog (_("The selected preset did not load successfully!\nPerhaps it references a format that has been removed?"),
+			                           false, Gtk::MESSAGE_WARNING);
+			dialog.run ();
+		}
+		sync_with_manager ();
+		CriticalSelectionChanged();
+
+		/* Make an edit, so that signal changed will be emitted on re-selection */
+
+		select_connection.block (true);
+		entry.get_entry()->set_text ("");
+		entry.get_entry()->set_text (text);
+		select_connection.block (false);
+
+	} else { // Text has been edited, this should not make any changes in the profile manager
+		if (previous && !text.compare (previous->name())) {
+			current = previous;
+		} else {
+			current.reset ();
+		}
+	}
+
+    _save_button.set_sensitive (current);
+    _remove_button.set_sensitive (current);
+	_new_button.set_sensitive (!current && !text.empty() && !preset_name_exists);
+}
+
+void
+WavesExportPresetSelector::create_new (WavesButton*)
+{
+	if (!profile_manager) { return; }
+
+	previous = current = profile_manager->new_preset (entry.get_entry()->get_text());
+	sync_with_manager ();
+	update_selection (); // Update preset widget states
+}
+
+void
+WavesExportPresetSelector::save_current (WavesButton*)
+{
+	if (!profile_manager) { return; }
+
+	previous = current = profile_manager->save_preset (entry.get_entry()->get_text());
+	sync_with_manager ();
+	update_selection (); // Update preset widget states
+}
+
+void
+WavesExportPresetSelector::remove_current (WavesButton*)
+{
+	if (!profile_manager) { return; }
+
+	Gtk::MessageDialog dialog (_("Do you really want to remove this preset?"),
+			false,
+			Gtk::MESSAGE_QUESTION,
+			Gtk::BUTTONS_YES_NO);
+
+	if (Gtk::RESPONSE_YES != dialog.run ()) {
+		/* User has selected "no" or closed the dialog, better
+		 * abort
+		 */
+		return;
+	}
+
+	profile_manager->remove_preset();
+	entry.get_entry()->set_text ("");
+	sync_with_manager ();
+}
diff --git a/gtk2_ardour/waves_export_preset_selector.h b/gtk2_ardour/waves_export_preset_selector.h
new file mode 100644
index 0000000000..539212be85
--- /dev/null
+++ b/gtk2_ardour/waves_export_preset_selector.h
@@ -0,0 +1,78 @@
+/*
+    Copyright (C) 2008 Paul Davis
+	Copyright (C) 2015 Waves Audio Ltd.
+    Author: Sakari Bergen
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __waves_export_preset_selector_h__
+#define __waves_export_preset_selector_h__
+
+#include <sigc++/signal.h>
+#include <gtkmm.h>
+
+#include "ardour/export_profile_manager.h"
+#include "waves_ui.h"
+
+class WavesExportPresetSelector : public Gtk::HBox, public WavesUI
+{
+
+  public:
+
+	WavesExportPresetSelector ();
+
+	void set_manager (boost::shared_ptr<ARDOUR::ExportProfileManager> manager);
+
+	sigc::signal<void> CriticalSelectionChanged;
+
+  private:
+
+	typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
+	typedef ARDOUR::ExportPresetPtr PresetPtr;
+	typedef ARDOUR::ExportProfileManager::PresetList PresetList;
+
+	ManagerPtr       profile_manager;
+	sigc::connection select_connection;
+
+	void sync_with_manager ();
+	void update_selection ();
+	void create_new (WavesButton*);
+	void save_current (WavesButton*);
+	void remove_current (WavesButton*);
+
+	struct PresetCols : public Gtk::TreeModelColumnRecord
+	{
+	  public:
+		Gtk::TreeModelColumn<PresetPtr>      preset;
+		Gtk::TreeModelColumn<std::string>  label;
+
+		PresetCols () { add (preset); add (label); }
+	};
+
+	PresetCols                   cols;
+	Glib::RefPtr<Gtk::ListStore> list;
+	PresetPtr                    current;
+	PresetPtr                    previous;
+
+	Gtk::ComboBoxEntry  entry;
+
+	WavesButton& _save_button;
+	WavesButton& _remove_button;
+	WavesButton& _new_button;
+};
+
+#endif // __waves_export_preset_selector_h__
diff --git a/gtk2_ardour/waves_export_timespan_selector.cc b/gtk2_ardour/waves_export_timespan_selector.cc
new file mode 100644
index 0000000000..2a06d37e24
--- /dev/null
+++ b/gtk2_ardour/waves_export_timespan_selector.cc
@@ -0,0 +1,488 @@
+/*
+    Copyright (C) 2008 Paul Davis
+	Copyright (C) 2015 Waves Audio Ltd.
+    Author: Sakari Bergen
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "waves_export_timespan_selector.h"
+
+#include "ardour_ui.h"
+
+#include "ardour/location.h"
+#include "ardour/types.h"
+#include "ardour/session.h"
+#include "ardour/export_handler.h"
+#include "ardour/export_timespan.h"
+
+#include "pbd/enumwriter.h"
+#include "pbd/convert.h"
+
+#include <sstream>
+#include <iomanip>
+
+#include "i18n.h"
+
+using namespace Glib;
+using namespace ARDOUR;
+using namespace PBD;
+using std::string;
+
+WavesExportTimespanSelector::WavesExportTimespanSelector (ARDOUR::Session * session, ProfileManagerPtr manager)
+  : Gtk::VBox ()
+  , WavesUI ("waves_export_timespan_selector.xml", *this)
+  , manager (manager)
+  , _time_format_dropdown (get_waves_dropdown ("time_format_dropdown"))
+  , _range_view (get_tree_view ("range_view"))
+  , _range_scroller (get_scrolled_window ("range_scroller"))
+  , _select_all_button (get_waves_button("select_all_button"))
+  , _deselect_all_button (get_waves_button("deselect_all_button"))
+{
+	set_session (session);
+
+	_select_all_button.signal_clicked.connect (sigc::mem_fun (*this, &WavesExportTimespanSelector::on_selection_all_buttons));
+	_deselect_all_button.signal_clicked.connect (sigc::mem_fun (*this, &WavesExportTimespanSelector::on_selection_all_buttons));
+	
+	/*** Combo boxes ***/
+	_time_format_dropdown.selected_item_changed.connect (sigc::mem_fun(*this, &WavesExportTimespanSelector::on_time_format_changed));
+
+	/* Range view */
+	range_list = Gtk::ListStore::create (range_cols);
+	// order by location start times
+	range_list->set_sort_column(range_cols.location, Gtk::SORT_ASCENDING);
+	range_list->set_sort_func(range_cols.location, sigc::mem_fun(*this, &WavesExportTimespanSelector::location_sorter));
+	_range_view.set_model (range_list);
+	_range_view.set_headers_visible (true);
+}
+
+WavesExportTimespanSelector::~WavesExportTimespanSelector ()
+{
+
+}
+
+int
+WavesExportTimespanSelector::location_sorter(Gtk::TreeModel::iterator a, Gtk::TreeModel::iterator b)
+{
+	Location *l1 = (*a)[range_cols.location];
+	Location *l2 = (*b)[range_cols.location];
+	const Location *ls = _session->locations()->session_range_location();
+
+	// always sort session range first
+	if (l1 == ls)
+		return -1;
+	if (l2 == ls)
+		return +1;
+
+	return l1->start() - l2->start();
+}
+
+void
+WavesExportTimespanSelector::add_range_to_selection (ARDOUR::Location const * loc)
+{
+	ExportTimespanPtr span = _session->get_export_handler()->add_timespan();
+
+	std::string id;
+	if (loc == state->selection_range.get()) {
+		id = "selection";
+	} else {
+		id = loc->id().to_s();
+	}
+
+	span->set_range (loc->start(), loc->end());
+	span->set_name (loc->name());
+	span->set_range_id (id);
+	state->timespans->push_back (span);
+}
+
+void
+WavesExportTimespanSelector::set_time_format_from_state ()
+{
+	int itemdata = -1;
+	switch (state->time_format) {
+	case ExportProfileManager::Timecode:
+		itemdata = Timecode;
+		break;
+	case ExportProfileManager::MinSec:
+		itemdata = MinSec;
+		break;
+	case ExportProfileManager::BBT:
+		itemdata = BBT; 
+		break;
+	}
+	
+	unsigned int size = _time_format_dropdown.get_menu ().items ().size();
+	for (unsigned int i = 0; i < size; i++) {
+		if (_time_format_dropdown.get_item_associated_data (i) == (void*)itemdata) {
+			_time_format_dropdown.set_current_item (i);
+			break;
+		}
+	}
+}
+
+void
+WavesExportTimespanSelector::sync_with_manager ()
+{
+	state = manager->get_timespans().front();
+	fill_range_list ();
+	CriticalSelectionChanged();
+}
+
+void
+WavesExportTimespanSelector::on_time_format_changed (WavesDropdown*, int format_id)
+{
+	switch (format_id) {
+	case Timecode:
+		state->time_format = ExportProfileManager::Timecode;
+		break;
+	case MinSec:
+		state->time_format = ExportProfileManager::MinSec;
+		break;
+	case BBT:
+		state->time_format = ExportProfileManager::BBT;
+		break;
+	}
+
+	for (Gtk::ListStore::Children::iterator it = range_list->children().begin(); it != range_list->children().end(); ++it) {
+		Location * location = it->get_value (range_cols.location);
+		it->set_value (range_cols.label, construct_label (location));
+		it->set_value (range_cols.length, construct_length (location));
+	}
+}
+
+std::string
+WavesExportTimespanSelector::construct_label (ARDOUR::Location const * location) const
+{
+	std::string label;
+	std::string start;
+	std::string end;
+
+	framepos_t start_frame = location->start();
+	framepos_t end_frame = location->end();
+
+	switch (state->time_format) {
+	  case AudioClock::BBT:
+		start = bbt_str (start_frame);
+		end = bbt_str (end_frame);
+		break;
+
+	  case AudioClock::Timecode:
+		start = timecode_str (start_frame);
+		end = timecode_str (end_frame);
+		break;
+
+	  case AudioClock::MinSec:
+		start = ms_str (start_frame);
+		end = ms_str (end_frame);
+		break;
+
+	  case AudioClock::Frames:
+		start = to_string (start_frame, std::dec);
+		end = to_string (end_frame, std::dec);
+		break;
+	}
+
+	// label += _("from ");
+
+	// label += "<span color=\"#7fff7f\">";
+	label += start;
+// 	label += "</span>";
+
+	label += _(" to ");
+
+// 	label += "<span color=\"#7fff7f\">";
+	label += end;
+// 	label += "</span>";
+
+	return label;
+}
+
+std::string
+WavesExportTimespanSelector::construct_length (ARDOUR::Location const * location) const
+{
+	if (location->length() == 0) {
+		return "";
+	}
+
+	std::stringstream s;
+
+	switch (state->time_format) {
+	case AudioClock::BBT:
+		s << bbt_str (location->length ());
+		break;
+
+	case AudioClock::Timecode:
+	{
+		Timecode::Time tc;
+		_session->timecode_duration (location->length(), tc);
+		tc.print (s);
+		break;
+	}
+
+	case AudioClock::MinSec:
+		s << ms_str (location->length ());
+		break;
+
+	case AudioClock::Frames:
+		s << location->length ();
+		break;
+	}
+
+	return s.str ();
+}
+
+
+std::string
+WavesExportTimespanSelector::bbt_str (framepos_t frames) const
+{
+	if (!_session) {
+		return "Error!";
+	}
+
+	std::ostringstream oss;
+	Timecode::BBT_Time time;
+	_session->bbt_time (frames, time);
+
+	print_padded (oss, time);
+	return oss.str ();
+}
+
+std::string
+WavesExportTimespanSelector::timecode_str (framecnt_t frames) const
+{
+	if (!_session) {
+		return "Error!";
+	}
+
+	std::ostringstream oss;
+	Timecode::Time time;
+
+	_session->timecode_time (frames, time);
+
+	oss << std::setfill('0') << std::right <<
+	  std::setw(2) <<
+	  time.hours << ":" <<
+	  std::setw(2) <<
+	  time.minutes << ":" <<
+	  std::setw(2) <<
+	  time.seconds << ":" <<
+	  std::setw(2) <<
+	  time.frames;
+
+	return oss.str();
+}
+
+std::string
+WavesExportTimespanSelector::ms_str (framecnt_t frames) const
+{
+	if (!_session) {
+		return "Error!";
+	}
+
+	std::ostringstream oss;
+	framecnt_t left;
+	int hrs;
+	int mins;
+	int secs;
+	int sec_promilles;
+
+	left = frames;
+	hrs = (int) floor (left / (_session->frame_rate() * 60.0f * 60.0f));
+	left -= (framecnt_t) floor (hrs * _session->frame_rate() * 60.0f * 60.0f);
+	mins = (int) floor (left / (_session->frame_rate() * 60.0f));
+	left -= (framecnt_t) floor (mins * _session->frame_rate() * 60.0f);
+	secs = (int) floor (left / (float) _session->frame_rate());
+	left -= (framecnt_t) floor ((double)(secs * _session->frame_rate()));
+	sec_promilles = (int) (left * 1000 / (float) _session->frame_rate() + 0.5);
+
+	oss << std::setfill('0') << std::right <<
+	  std::setw(2) <<
+	  hrs << ":" <<
+	  std::setw(2) <<
+	  mins << ":" <<
+	  std::setw(2) <<
+	  secs << "." <<
+	  std::setw(3) <<
+	  sec_promilles;
+
+	return oss.str();
+}
+
+void
+WavesExportTimespanSelector::update_range_name (std::string const & path, std::string const & new_text)
+{
+	Gtk::TreeStore::iterator it = range_list->get_iter (path);
+	it->get_value (range_cols.location)->set_name (new_text);
+
+	CriticalSelectionChanged();
+}
+
+void
+WavesExportTimespanSelector::on_selection_all_buttons (WavesButton* button)
+{
+	bool selected = (button == &_select_all_button);
+	for (Gtk::ListStore::Children::iterator it = range_list->children().begin(); it != range_list->children().end(); ++it) {
+		it->set_value (range_cols.selected, selected);
+	}
+}
+
+/*** WavesExportTimespanSelectorSingle ***/
+
+WavesExportTimespanSelectorSingle::WavesExportTimespanSelectorSingle (ARDOUR::Session * session, ProfileManagerPtr manager, std::string range_id) :
+	WavesExportTimespanSelector (session, manager),
+	range_id (range_id)
+{
+	_range_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER);
+	_range_view.append_column_editable (_("Range"), range_cols.name);
+
+	if (Gtk::CellRendererText * renderer = dynamic_cast<Gtk::CellRendererText *> (_range_view.get_column_cell_renderer (0))) {
+		renderer->signal_edited().connect (sigc::mem_fun (*this, &WavesExportTimespanSelectorSingle::update_range_name));
+	}
+
+	Gtk::CellRendererText * label_render = Gtk::manage (new Gtk::CellRendererText());
+	Gtk::TreeView::Column * label_col = Gtk::manage (new Gtk::TreeView::Column (_("Time Span"), *label_render));
+	label_col->add_attribute (label_render->property_markup(), range_cols.label);
+	_range_view.append_column (*label_col);
+
+	_range_view.append_column (_("Length"), range_cols.length);
+}
+
+void
+WavesExportTimespanSelectorSingle::fill_range_list ()
+{
+	if (!state) { return; }
+
+	std::string id;
+	if (!range_id.compare (X_("selection"))) {
+		id = state->selection_range->id().to_s();
+	} else {
+		id = range_id;
+	}
+
+	range_list->clear();
+	state->timespans->clear();
+
+	Gtk::TreeModel::iterator iter;
+	Gtk::TreeModel::Row row;
+	for (LocationList::const_iterator it = state->ranges->begin(); it != state->ranges->end(); ++it) {
+
+		if (!(*it)->id().to_s().compare (id)) {
+			iter = range_list->append();
+			row = *iter;
+
+			row[range_cols.location] = *it;
+			row[range_cols.selected] = true;
+			row[range_cols.name] = (*it)->name();
+			row[range_cols.label] = construct_label (*it);
+			row[range_cols.length] = construct_length (*it);
+
+			add_range_to_selection (*it);
+
+			break;
+		}
+	}
+
+	set_time_format_from_state();
+}
+
+/*** WavesExportTimespanSelectorMultiple ***/
+
+WavesExportTimespanSelectorMultiple::WavesExportTimespanSelectorMultiple (ARDOUR::Session * session, ProfileManagerPtr manager) :
+  WavesExportTimespanSelector (session, manager)
+{
+	_range_scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+	_range_view.append_column_editable ("", range_cols.selected);
+	_range_view.append_column_editable (_("Range"), range_cols.name);
+
+	if (Gtk::CellRendererToggle * renderer = dynamic_cast<Gtk::CellRendererToggle *> (_range_view.get_column_cell_renderer (0))) {
+		renderer->signal_toggled().connect (sigc::hide (sigc::mem_fun (*this, &WavesExportTimespanSelectorMultiple::update_selection)));
+	}
+
+	if (Gtk::CellRendererText * renderer = dynamic_cast<Gtk::CellRendererText *> (_range_view.get_column_cell_renderer (1))) {
+		renderer->signal_edited().connect (sigc::mem_fun (*this, &WavesExportTimespanSelectorMultiple::update_range_name));
+	}
+
+	Gtk::CellRendererText * label_render = Gtk::manage (new Gtk::CellRendererText());
+	Gtk::TreeView::Column * label_col = Gtk::manage (new Gtk::TreeView::Column (_("Time Span"), *label_render));
+	label_col->add_attribute (label_render->property_markup(), range_cols.label);
+	_range_view.append_column (*label_col);
+
+	_range_view.append_column (_("Length"), range_cols.length);
+}
+
+void
+WavesExportTimespanSelectorMultiple::fill_range_list ()
+{
+	if (!state) { return; }
+
+	range_list->clear();
+
+	Gtk::TreeModel::iterator iter;
+	Gtk::TreeModel::Row row;
+	for (LocationList::const_iterator it = state->ranges->begin(); it != state->ranges->end(); ++it) {
+
+		iter = range_list->append();
+		row = *iter;
+
+		row[range_cols.location] = *it;
+		row[range_cols.selected] = false;
+		row[range_cols.name] = (*it)->name();
+		row[range_cols.label] = construct_label (*it);
+		row[range_cols.length] = construct_length (*it);
+	}
+
+	set_selection_from_state ();
+}
+
+void
+WavesExportTimespanSelectorMultiple::set_selection_from_state ()
+{
+	Gtk::TreeModel::Children::iterator tree_it;
+
+	for (TimespanList::iterator it = state->timespans->begin(); it != state->timespans->end(); ++it) {
+		string id = (*it)->range_id();
+		for (tree_it = range_list->children().begin(); tree_it != range_list->children().end(); ++tree_it) {
+			Location * loc = tree_it->get_value (range_cols.location);
+
+			if ((id == "selection" && loc == state->selection_range.get()) ||
+			    (id == loc->id().to_s())) {
+				tree_it->set_value (range_cols.selected, true);
+			}
+		}
+	}
+
+	set_time_format_from_state();
+}
+
+void
+WavesExportTimespanSelectorMultiple::update_selection ()
+{
+	update_timespans ();
+	CriticalSelectionChanged ();
+}
+
+void
+WavesExportTimespanSelectorMultiple::update_timespans ()
+{
+	state->timespans->clear();
+
+	for (Gtk::TreeStore::Children::iterator it = range_list->children().begin(); it != range_list->children().end(); ++it) {
+		if (it->get_value (range_cols.selected)) {
+			add_range_to_selection (it->get_value (range_cols.location));
+		}
+	}
+}
+
diff --git a/gtk2_ardour/waves_export_timespan_selector.h b/gtk2_ardour/waves_export_timespan_selector.h
new file mode 100644
index 0000000000..d9016b34ea
--- /dev/null
+++ b/gtk2_ardour/waves_export_timespan_selector.h
@@ -0,0 +1,161 @@
+/*
+    Copyright (C) 2008 Paul Davis
+	Copyright (C) 2015 Waves Audio Ltd.
+    Author: Sakari Bergen
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __waves_export_timespan_selector_h__
+#define __waves_export_timespan_selector_h__
+
+#include "audio_clock.h"
+
+#include <list>
+
+#ifdef interface
+#undef interface
+#endif
+
+#include <gtkmm.h>
+#include <boost/shared_ptr.hpp>
+
+
+#include "ardour/types.h"
+#include "ardour/session_handle.h"
+#include "ardour/export_profile_manager.h"
+#include "waves_ui.h"
+
+namespace ARDOUR {
+	class Location;
+	class ExportTimespan;
+	class ExportHandler;
+}
+
+using ARDOUR::CDMarkerFormat;
+using ARDOUR::framecnt_t;
+
+/// Timespan Selector base
+class WavesExportTimespanSelector : public Gtk::VBox, public WavesUI, public ARDOUR::SessionHandlePtr
+{
+  protected:
+	typedef std::list<ARDOUR::Location *> LocationList;
+	typedef boost::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
+	typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ProfileManagerPtr;
+
+	typedef std::list<ARDOUR::ExportTimespanPtr> TimespanList;
+	typedef boost::shared_ptr<TimespanList> TimespanListPtr;
+	typedef ARDOUR::ExportProfileManager::TimespanStatePtr TimespanStatePtr;
+
+  public:
+
+	WavesExportTimespanSelector (ARDOUR::Session * session, ProfileManagerPtr manager);
+
+	virtual ~WavesExportTimespanSelector ();
+
+	void sync_with_manager ();
+
+	sigc::signal<void> CriticalSelectionChanged;
+
+	enum TimeFormatId {
+		Timecode=0,
+		MinSec=1,
+		BBT=2
+	};
+
+  protected:
+
+
+
+	ProfileManagerPtr manager;
+	TimespanStatePtr  state;
+
+	virtual void fill_range_list () = 0;
+
+	void add_range_to_selection (ARDOUR::Location const * loc);
+	void set_time_format_from_state ();
+
+	std::string construct_label (ARDOUR::Location const * location) const;
+	std::string construct_length (ARDOUR::Location const * location) const;
+	std::string bbt_str (framepos_t frames) const;
+	std::string timecode_str (framecnt_t frames) const;
+	std::string ms_str (framecnt_t frames) const;
+
+	void update_range_name (std::string const & path, std::string const & new_text);
+
+	void on_selection_all_buttons (WavesButton*);
+	int location_sorter(Gtk::TreeModel::iterator a, Gtk::TreeModel::iterator b);
+
+	/* Time format */
+
+//	typedef ARDOUR::ExportProfileManager::TimeFormat TimeFormat;
+
+	/* View */
+
+	struct RangeCols : public Gtk::TreeModelColumnRecord
+	{
+	  public:
+		Gtk::TreeModelColumn<ARDOUR::Location *>  location;
+		Gtk::TreeModelColumn<std::string>       label;
+		Gtk::TreeModelColumn<bool>              selected;
+		Gtk::TreeModelColumn<std::string>       name;
+		Gtk::TreeModelColumn<std::string>       length;
+
+		RangeCols () { add (location); add(label); add(selected); add(name); add(length); }
+	};
+	RangeCols                    range_cols;
+
+	Glib::RefPtr<Gtk::ListStore> range_list;
+	Gtk::ScrolledWindow& _range_scroller;
+	Gtk::TreeView&  _range_view;
+
+  private:
+	WavesDropdown& _time_format_dropdown;
+	WavesButton& _select_all_button;
+	WavesButton& _deselect_all_button;
+  	void on_time_format_changed (WavesDropdown*, int);
+};
+
+/// Allows selecting multiple timespans
+class WavesExportTimespanSelectorMultiple : public WavesExportTimespanSelector
+{
+  public:
+	WavesExportTimespanSelectorMultiple (ARDOUR::Session * session, ProfileManagerPtr manager);
+
+  private:
+
+	virtual void fill_range_list ();
+
+	void set_selection_from_state ();
+	void update_selection ();
+	void update_timespans ();
+};
+
+/// Displays one timespan
+class WavesExportTimespanSelectorSingle : public WavesExportTimespanSelector
+{
+  public:
+	WavesExportTimespanSelectorSingle (ARDOUR::Session * session, ProfileManagerPtr manager, std::string range_id);
+
+  private:
+
+	virtual void fill_range_list ();
+
+	std::string range_id;
+
+};
+
+#endif // __waves_export_timespan_selector_h__
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index d6ae86dbdf..18494e602c 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -29,9 +29,11 @@ path_prefix = 'gtk2_ardour/'
 gtk2_ardour_sources = [
         'mixer_bridge_view.cc',
         'waves_export_dialog.cc',
-        'waves_export_dialog.logic.cc',
         'waves_track_color_dialog.cc',
         'waves_track_color_dialog.logic.cc',
+		'waves_export_file_notebook.cc',
+		'waves_export_preset_selector.cc',
+		'waves_export_timespan_selector.cc',
 		'marker_inspector_dialog.cc',
 		'marker_inspector_dialog.logic.cc',
 		'route_inspector.cc',